Author: snoopdave
Date: Tue Aug 7 12:15:30 2007
New Revision: 563627
URL: http://svn.apache.org/viewvc?view=rev&rev=563627
Log:
Fix for http://opensource.atlassian.com/projects/roller/browse/ROL-1497
Give installation pages their own tile so they can set appropriate page title.
Added:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/tiles-installpage.jsp
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?view=diff&rev=563627&r1=563626&r2=563627
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
Tue Aug 7 12:15:30 2007
@@ -67,11 +67,11 @@
public String execute() {
- if(WebloggerFactory.isBootstrapped()) {
+ if (WebloggerFactory.isBootstrapped()) {
return SUCCESS;
}
- if(WebloggerStartup.getDatabaseProviderException() != null) {
+ if (WebloggerStartup.getDatabaseProviderException() != null) {
StartupException se =
WebloggerStartup.getDatabaseProviderException();
if (se.getRootCause() != null) {
rootCauseException = se.getRootCause();
@@ -81,18 +81,21 @@
messages = se.getStartupLog();
log.debug("Forwarding to database error page");
+ setPageTitle("installer.error.connection.pageTitle");
return DATABASE_ERROR;
}
if (WebloggerStartup.isDatabaseCreationRequired()) {
log.debug("Forwarding to database table creation page");
+ setPageTitle("installer.database.creation.pageTitle");
return CREATE_DATABASE;
}
if (WebloggerStartup.isDatabaseUpgradeRequired()) {
log.debug("Forwarding to database table upgrade page");
+ setPageTitle("installer.database.upgrade.pageTitle");
return UPGRADE_DATABASE;
}
-
+ setPageTitle("installer.error.unknown.pageTitle");
return BOOTSTRAP;
}
@@ -112,6 +115,7 @@
messages = se.getStartupLog();
}
+ setPageTitle("installer.database.creation.pageTitle");
return CREATE_DATABASE;
}
@@ -131,6 +135,7 @@
messages = se.getStartupLog();
}
+ setPageTitle("installer.database.upgrade.pageTitle");
return UPGRADE_DATABASE;
}
@@ -181,6 +186,7 @@
rootCauseException = ex;
}
+ setPageTitle("installer.error.unknown.pageTitle");
return BOOTSTRAP;
}
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=563627&r1=563626&r2=563627
==============================================================================
---
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
Tue Aug 7 12:15:30 2007
@@ -738,6 +738,7 @@
installer.bannerTitleRight=Auto-Installer
# database error
+installer.error.connection.pageTitle=Database connection error
installer.cannotConnectToDatabase=Cannot connect to database
installer.whatHappened=What happened?
installer.whatHappenedDatabaseConnectionError=\
@@ -753,6 +754,7 @@
To help you debug the problem, here is the stack trace for that exception:
# unknown error
+installer.error.unknown.pageTitle=Unknown error
installer.unknownError=An unknown error has occurred
installer.whatHappenedUnknown=An unknown and unexpected error occured when \
Roller tried to check database status or bootstrap itself. Roller can''t \
@@ -760,9 +762,10 @@
and diagnose the problem yourself. Follow the instructons on the Roller wiki \
and seek help from the <a href=\
"http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists";> \
-Roller user mailing list.
+Roller user mailing list</a>.
# create tables
+installer.database.creation.pageTitle=Database table creation
installer.noDatabaseTablesFound=No database tables found
installer.noDatabaseTablesExplanation=\
Roller is able to connect to your database of type [{0}], but found no tables.
@@ -782,6 +785,7 @@
issued during the creation process:
# upgrade tables
+installer.database.upgrade.pageTitle=Database table upgrade
installer.databaseUpgradeNeeded=Database tables need to be upgraded
installer.databaseUpgradeNeededExplanation=\
Roller is able to connect to your database of type [{0}] and found tables, \
Added: roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/tiles-installpage.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/tiles-installpage.jsp?view=auto&rev=563627
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/tiles-installpage.jsp
(added)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/tiles-installpage.jsp
Tue Aug 7 12:15:30 2007
@@ -0,0 +1,59 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. The ASF licenses this file to You
+ under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. For additional information regarding
+ copyright in this work, please see the NOTICE file in the top level
+ directory of this distribution.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+ <head>
+ <title><s:property value="pageTitle" /></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <tiles:insertAttribute name="head" />
+ </head>
+ <body>
+
+ <div id="banner">
+ <tiles:insertAttribute name="banner" />
+ </div>
+
+ <div id="wrapper">
+ <div id="leftcontent_wrap">
+ <div id="leftcontent">
+ </div>
+ </div>
+
+ <div id="centercontent_wrap">
+ <div id="centercontent">
+ <tiles:insertAttribute name="messages" />
+ <tiles:insertAttribute name="content" />
+ </div>
+ </div>
+
+ <div id="rightcontent_wrap">
+ <div id="rightcontent">
+ </div>
+ </div>
+ </div>
+
+ <div id="footer">
+ <tiles:insertAttribute name="footer" />
+ </div>
+
+ <div id="datetagdiv"
+
style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
+ </div>
+ </body>
+</html>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml?view=diff&rev=563627&r1=563626&r2=563627
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml Tue Aug 7 12:15:30 2007
@@ -52,6 +52,14 @@
<put-attribute name="footer"
value="/WEB-INF/jsps/tiles/footer.jsp" />
</definition>
+ <definition name=".tiles-installpage"
template="/WEB-INF/jsps/tiles/tiles-installpage.jsp">
+ <put-attribute name="banner"
value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <put-attribute name="head"
value="/WEB-INF/jsps/tiles/head.jsp" />
+ <put-attribute name="messages"
value="/WEB-INF/jsps/tiles/messages.jsp" />
+ <put-attribute name="content" value="${content}" />
+ <put-attribute name="footer"
value="/WEB-INF/jsps/tiles/footer.jsp" />
+ </definition>
+
<definition name=".tiles-errorpage"
template="/WEB-INF/jsps/tiles/tiles-errorpage.jsp">
<put-attribute name="banner"
value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="head"
value="/WEB-INF/jsps/tiles/head.jsp" />
@@ -104,25 +112,25 @@
<put-attribute name="content" value="/WEB-INF/jsps/core/Setup.jsp" />
</definition>
- <definition name=".CreateDatabase" extends=".tiles-errorpage" >
+ <definition name=".CreateDatabase" extends=".tiles-installpage" >
<put-attribute name="content"
value="/WEB-INF/jsps/core/CreateDatabase.jsp" />
<put-attribute name="footer" value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="banner"
value="/WEB-INF/jsps/tiles/bannerInstallation.jsp" />
</definition>
- <definition name=".UpgradeDatabase" extends=".tiles-errorpage" >
+ <definition name=".UpgradeDatabase" extends=".tiles-installpage" >
<put-attribute name="content"
value="/WEB-INF/jsps/core/UpgradeDatabase.jsp" />
<put-attribute name="footer" value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="banner"
value="/WEB-INF/jsps/tiles/bannerInstallation.jsp" />
</definition>
- <definition name=".DatabaseError" extends=".tiles-errorpage" >
+ <definition name=".DatabaseError" extends=".tiles-installpage" >
<put-attribute name="content"
value="/WEB-INF/jsps/core/DatabaseError.jsp" />
<put-attribute name="footer" value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="banner"
value="/WEB-INF/jsps/tiles/bannerInstallation.jsp" />
</definition>
- <definition name=".Bootstrap" extends=".tiles-errorpage" >
+ <definition name=".Bootstrap" extends=".tiles-installpage" >
<put-attribute name="content"
value="/WEB-INF/jsps/core/UnknownError.jsp" />
<put-attribute name="footer" value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="banner"
value="/WEB-INF/jsps/tiles/bannerInstallation.jsp" />
