roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1608140 - in /roller/trunk/app/src/main/webapp: WEB-INF/jsps/core/MainMenuSidebar.jsp WEB-INF/jsps/tiles/bannerStatus.jsp themes/sotto/
Date Sat, 05 Jul 2014 23:01:52 GMT
Author: gmazza
Date: Sat Jul  5 23:01:51 2014
New Revision: 1608140

URL: http://svn.apache.org/r1608140
Log:
Decided to restore Sotto at least until other themes get better firmed up, clicking no user
name at top of window now takes you back to the main menu instead of the seldom-used edit
user profile page.

Added:
    roller/trunk/app/src/main/webapp/themes/sotto/
      - copied from r1608030, roller/trunk/app/src/main/webapp/themes/sotto/
Modified:
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp?rev=1608140&r1=1608139&r2=1608140&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp Sat Jul  5 23:01:51
2014
@@ -26,19 +26,19 @@
                 
                 <hr size="1" noshade="noshade" />
                 
-                <s:if test="getBooleanProp('groupblogging.enabled') || (existingPermissions.isEmpty
&& pendingPermissions.isEmpty)">
-                    <h3><a href="<s:url action="createWeblog" />"><s:text
name="yourWebsites.createWeblog" /></a></h3>
-                    <p><s:text name="yourWebsites.createWeblog.desc" /></p>
-                </s:if>
-                
                 <h3><a href="<s:url action="profile"/>"><s:text name="yourWebsites.editProfile"
/></a></h3>
                 <p><s:text name="yourWebsites.editProfile.desc" /></p>
-                
+
                 <s:if test="getBooleanProp('webservices.enableAtomPub') && getProp('webservices.atomPubAuth')
== 'oauth'">
                     <h3><a href="<s:url action="oauthKeys" />"><s:text
name="yourWebsites.oauthKeys" /></a></h3>
                     <p><s:text name="yourWebsites.oauthKeys.desc" /></p>
                 </s:if>
 
+                <s:if test="getBooleanProp('groupblogging.enabled') || (existingPermissions.isEmpty
&& pendingPermissions.isEmpty)">
+                    <h3><a href="<s:url action="createWeblog" />"><s:text
name="yourWebsites.createWeblog" /></a></h3>
+                    <p><s:text name="yourWebsites.createWeblog.desc" /></p>
+                </s:if>
+
                 <s:if test="userIsAdmin">               
                     <h3><a href="<s:url action="globalConfig" namespace="/roller-ui/admin"
/>"><s:text name="yourWebsites.globalAdmin" /></a></h3>          
                     <p><s:text name="yourWebsites.globalAdmin.desc" /></p>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp?rev=1608140&r1=1608139&r2=1608140&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp Sat Jul  5 23:01:51
2014
@@ -25,7 +25,7 @@
                 
                 <s:if test="authenticatedUser != null">
                     <s:text name="mainPage.loggedInAs" />
-                    <a href="<s:url action="profile" namespace="/roller-ui" />"><s:property
value="authenticatedUser.userName"/></a>
+                    <a href="<s:url action="menu" namespace="/roller-ui" />"><s:property
value="authenticatedUser.userName"/></a>
                 </s:if>
                 
                 



Mime
View raw message