Commit by: bcm Modified files: server/docs/TODO.txt 1.26 1.27 server/webapps/console/etc/MessageResources.properties 1.6 1.7 server/webapps/console/etc/applicationContext-webui-security.xml 1.4 1.5 server/webapps/console/web/index.jsp 1.2 1.3 server/webapps/console/web/WEB-INF/struts-config.xml 1.7 1.8 server/webapps/console/web/WEB-INF/tiles-config.xml 1.3 1.4 server/webapps/console/web/WEB-INF/urlrewrite.xml 1.3 1.4 server/webapps/console/web/WEB-INF/jsp/home.jsp None 1.1 server/webapps/console/web/WEB-INF/jsp/layout.jsp 1.5 1.6 server/webapps/console/web/WEB-INF/jsp/welcome.jsp 1.1 None
Log message: rename welcome page - it's really the user's home page. add home link to main nav bar. fix up message keys to be more consistent. ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.26&r2=text&tr2=1.27 http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/MessageResources.properties.diff?r1=text&tr1=1.6&r2=text&tr2=1.7 http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/applicationContext-webui-security.xml.diff?r1=text&tr1=1.4&r2=text&tr2=1.5 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/index.jsp.diff?r1=text&tr1=1.2&r2=text&tr2=1.3 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/struts-config.xml.diff?r1=text&tr1=1.7&r2=text&tr2=1.8 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tiles-config.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/urlrewrite.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/home.jsp?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/layout.jsp.diff?r1=text&tr1=1.5&r2=text&tr2=1.6 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/welcome.jsp.diff?r1=text&tr1=1.1&r2=text&tr2=None Index: server/webapps/console/web/WEB-INF/urlrewrite.xml diff -u server/webapps/console/web/WEB-INF/urlrewrite.xml:1.3 server/webapps/console/web/WEB-INF/urlrewrite.xml:1.4 --- server/webapps/console/web/WEB-INF/urlrewrite.xml:1.3 Thu Mar 24 12:32:03 2005 +++ server/webapps/console/web/WEB-INF/urlrewrite.xml Thu Mar 24 12:44:15 2005 @@ -9,7 +9,7 @@ <to>/error.do</to> </rule> - <!-- session/welcome rules --> + <!-- session/home rules --> <rule> <from>^/login$</from> <to>/login.do</to> @@ -19,8 +19,8 @@ <to>/login.do?login_failed=1</to> </rule> <rule> - <from>^/welcome$</from> - <to>/welcome.do</to> + <from>^/home$</from> + <to>/home.do</to> </rule> <rule> <from>^/logout$</from> Index: server/webapps/console/etc/MessageResources.properties diff -u server/webapps/console/etc/MessageResources.properties:1.6 server/webapps/console/etc/MessageResources.properties:1.7 --- server/webapps/console/etc/MessageResources.properties:1.6 Thu Mar 24 12:32:02 2005 +++ server/webapps/console/etc/MessageResources.properties Thu Mar 24 12:44:14 2005 @@ -1,7 +1,9 @@ -Layout.Header.TopTitle=Cosmo sharing server -Layout.Header.LogOut=Log out -Layout.ConsoleNav.Header=Admin console: +Layout.Title=Cosmo sharing server +Layout.Nav.Main.Home=Home +Layout.Nav.Main.LogOut=Log out +Layout.Nav.Console.Label=Admin console: +Layout.Nav.Console.Users=Users Button.Go=Go Button.Cancel=Cancel @@ -31,7 +33,7 @@ Error.NotFound.ResourceNotFound=The resource you were looking for was not found. It may have been previously removed from the server. # -# Session/welcome messages +# Session/home messages # Login.HeadTitle=Cosmo | Log in @@ -40,9 +42,9 @@ Login.Password=Password: Login.Button.Ok=Log in to Cosmo -Welcome.HeadTitle=Cosmo sharing server -Welcome.WelcomeMsg=Welcome to the Cosmo sharing server installed at <strong>{0}</strong>! -Welcome.LoggedInAs=You are logged in as <strong>{0}</strong>. +Home.HeadTitle=Cosmo | Home +Home.HomeMsg=Home to the Cosmo sharing server installed at <strong>{0}</strong>! +Home.LoggedInAs=You are logged in as <strong>{0}</strong>. # # User messages Index: server/webapps/console/web/WEB-INF/tiles-config.xml diff -u server/webapps/console/web/WEB-INF/tiles-config.xml:1.3 server/webapps/console/web/WEB-INF/tiles-config.xml:1.4 --- server/webapps/console/web/WEB-INF/tiles-config.xml:1.3 Thu Mar 24 12:32:03 2005 +++ server/webapps/console/web/WEB-INF/tiles-config.xml Thu Mar 24 12:44:15 2005 @@ -34,7 +34,7 @@ <put name="nav" value=""/> </definition> - <!-- session/welcome defs --> + <!-- session/home defs --> <definition name="login" extends="layout.standard"> <put name="body" value="/WEB-INF/jsp/login.jsp"/> @@ -42,9 +42,9 @@ <put name="showNav" value="false"/> </definition> - <definition name="welcome" extends="layout.standard"> - <put name="body" value="/WEB-INF/jsp/welcome.jsp"/> - <put name="prefix" value="Welcome."/> + <definition name="home" extends="layout.standard"> + <put name="body" value="/WEB-INF/jsp/home.jsp"/> + <put name="prefix" value="Home."/> </definition> <!-- user defs --> Index: server/docs/TODO.txt diff -u server/docs/TODO.txt:1.26 server/docs/TODO.txt:1.27 --- server/docs/TODO.txt:1.26 Thu Mar 24 12:32:02 2005 +++ server/docs/TODO.txt Thu Mar 24 12:44:13 2005 @@ -8,7 +8,6 @@ webui: - * add home link to header * see if we can't get Struts to work with "/user/bcm/update" rather than "/user/update.do" with "username=bcm" in content body * use a session attribute rather than a request parameter to denote a Index: server/webapps/console/etc/applicationContext-webui-security.xml diff -u server/webapps/console/etc/applicationContext-webui-security.xml:1.4 server/webapps/console/etc/applicationContext-webui-security.xml:1.5 --- server/webapps/console/etc/applicationContext-webui-security.xml:1.4 Thu Mar 24 12:32:02 2005 +++ server/webapps/console/etc/applicationContext-webui-security.xml Thu Mar 24 12:44:14 2005 @@ -89,7 +89,7 @@ CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON PATTERN_TYPE_APACHE_ANT /index.jsp=ROLE_ROOT,ROLE_USER - /welcome=ROLE_ROOT,ROLE_USER + /home=ROLE_ROOT,ROLE_USER /logout=ROLE_ROOT,ROLE_USER /users=ROLE_ROOT /user/**=ROLE_ROOT Index: server/webapps/console/web/index.jsp diff -u server/webapps/console/web/index.jsp:1.2 server/webapps/console/web/index.jsp:1.3 --- server/webapps/console/web/index.jsp:1.2 Wed Mar 23 14:03:35 2005 +++ server/webapps/console/web/index.jsp Thu Mar 24 12:44:14 2005 @@ -1 +1 @@ -<jsp:forward page="/welcome.do"/> +<jsp:forward page="/home.do"/> Index: server/webapps/console/web/WEB-INF/struts-config.xml diff -u server/webapps/console/web/WEB-INF/struts-config.xml:1.7 server/webapps/console/web/WEB-INF/struts-config.xml:1.8 --- server/webapps/console/web/WEB-INF/struts-config.xml:1.7 Thu Mar 24 12:32:03 2005 +++ server/webapps/console/web/WEB-INF/struts-config.xml Thu Mar 24 12:44:14 2005 @@ -37,17 +37,17 @@ redirect="false"/> </action> - <!-- session/welcome actions --> + <!-- session/home actions --> <action path="/login" forward="login"/> - <action path="/welcome" - forward="welcome"/> + <action path="/home" + forward="home"/> <action path="/logout" type="org.osaf.struts.OSAFLogoutAction"> - <forward name="ok" path="/welcome" redirect="true"/> + <forward name="ok" path="/home" redirect="true"/> </action> <!-- user actions --> Index: server/webapps/console/web/WEB-INF/jsp/layout.jsp diff -u server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.5 server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.6 --- server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.5 Thu Mar 24 12:32:04 2005 +++ server/webapps/console/web/WEB-INF/jsp/layout.jsp Thu Mar 24 12:44:15 2005 @@ -26,16 +26,20 @@ <tr> <td align="left" valign="middle"> <div class="lg"> - <b><fmt:message key="Layout.Header.TopTitle"/></b> + <b><fmt:message key="Layout.Title"/></b> </div> </td> <c:if test="${showNav}"> <td align="right" valign="middle"> + <!-- main navbar --> <div class="md"> + <c:choose><c:when test="${fn:endsWith(body, '/home.jsp')}"><b><fmt:message key="Layout.Nav.Main.Home"/></b></c:when><c:otherwise><html:link page="/home"><fmt:message key="Layout.Nav.Main.Home"/></html:link></c:otherwise></c:choose> + | <html:link page="/logout"> - <fmt:message key="Layout.Header.LogOut"/> + <fmt:message key="Layout.Nav.Main.LogOut"/> </html:link> </div> + <!-- end main navbar --> </td> </c:if> </tr> @@ -44,11 +48,11 @@ <c:choose> <c:when test="${showNav}"> <authz:authorize ifAllGranted="ROLE_ROOT"> - <!-- admin console toolbar --> + <!-- admin console navbar --> <div class="md"> - <fmt:message key="Layout.ConsoleNav.Header"/> - <c:choose><c:when test="${fn:endsWith(body, '/user/list.jsp')}"><b><fmt:message key="User.List.Title"/></b></c:when><c:otherwise><html:link page="/users"><fmt:message key="User.List.Title"/></html:link></c:otherwise></c:choose> - <!-- end admin console toolbar --> + <fmt:message key="Layout.Nav.Console.Label"/> + <c:choose><c:when test="${fn:endsWith(body, '/user/list.jsp')}"><b><fmt:message key="Layout.Nav.Console.Users"/></b></c:when><c:otherwise><html:link page="/users"><fmt:message key="Layout.Nav.Console.Users"/></html:link></c:otherwise></c:choose> + <!-- end admin console navbar --> </div> <hr noshade="noshade"/> </authz:authorize> _______________________________________________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
