Author: agilliland
Date: Mon May 7 13:45:32 2007
New Revision: 535985
URL: http://svn.apache.org/viewvc?view=rev&rev=535985
Log:
fixing linking to properly use namespaces.
Modified:
roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp
roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp
roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp
Modified: roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp?view=diff&rev=535985&r1=535984&r2=535985
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp Mon May 7 13:45:32
2007
@@ -134,8 +134,7 @@
<br />
<s:if test="#perms.permissionMask == 3">
- <s:url action="websiteSettings" id="manageWeblog">
- <s:param name="method" value="edit" />
+ <s:url action="weblogConfig"
namespace="/roller-ui/authoring" id="manageWeblog">
<s:param name="weblog"
value="#perms.website.handle" />
</s:url>
<img src='<s:url value="/images/cog.png"/>' />
Modified: roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp?view=diff&rev=535985&r1=535984&r2=535985
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp Mon May 7
13:45:32 2007
@@ -27,7 +27,7 @@
<hr size="1" noshade="noshade" />
<s:if test="groupBloggingEnabled ||
(existingPermissions.isEmpty && pendingPermissions.isEmpty)">
- <h3><a href="<s:url action="createWeblog"/>"><s:text
name="yourWebsites.createWeblog" /></a></h3>
+ <h3><a href="<s:url action="createWeblog" />"><s:text
name="yourWebsites.createWeblog" /></a></h3>
<p><s:text name="yourWebsites.createWeblog.desc" /></p>
</s:if>
@@ -35,11 +35,11 @@
<p><s:text name="yourWebsites.editProfile.desc" /></p>
<s:if test="userAdmin">
- <h3><a href="<s:url action="rollerConfig"/>"><s:text
name="yourWebsites.globalAdmin" /></a></h3>
+ <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>
<s:if test="planetAggregated">
- <h3><a href="<s:url action="planetConfig"/>"><s:text
name="yourWebsites.planetAdmin" /></a></h3>
+ <h3><a href="<s:url action="planetConfig"
namespace="/roller-ui/admin" />"><s:text name="yourWebsites.planetAdmin"
/></a></h3>
<p><s:text name="yourWebsites.planetAdmin.desc" /></p>
</s:if>
</s:if>
Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp?view=diff&rev=535985&r1=535984&r2=535985
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp Mon May 7
13:45:32 2007
@@ -25,7 +25,7 @@
<s:if test="authenticatedUser != null">
<s:text name="mainPage.loggedInAs" />
- <a href="<s:url action="profile"/>"><s:property
value="authenticatedUser.userName"/></a>
+ <a href="<s:url action="profile" namespace="/roller-ui"
/>"><s:property value="authenticatedUser.userName"/></a>
</s:if>
@@ -43,16 +43,16 @@
<a href="<s:url value="/"/>"><s:property
value="getProp('site.shortName')"/></a>
- | <a href="<s:url action="menu"/>"><s:text
name="mainPage.mainMenu" /></a>
+ | <a href="<s:url action="menu" namespace="/roller-ui"
/>"><s:text name="mainPage.mainMenu" /></a>
<s:if test="authenticatedUser != null">
- | <a href="<s:url action="logout"/>"><s:text
name="navigationBar.logout"/></a>
+ | <a href="<s:url action="logout" namespace="/roller-ui"
/>"><s:text name="navigationBar.logout"/></a>
</s:if>
<s:else>
- | <a href="<s:url action="login-redirect"/>"><s:text
name="navigationBar.login"/></a>
+ | <a href="<s:url action="login-redirect"
namespace="/roller-ui" />"><s:text name="navigationBar.login"/></a>
<s:if test="getBooleanProp('users.registration.enabled')">
- | <a href="<s:url action="register"/>"><s:text
name="navigationBar.register"/></a>
+ | <a href="<s:url action="register"
namespace="/roller-ui" />"><s:text name="navigationBar.register"/></a>
</s:if>
<s:elseif test="getProp('users.registration.url') != null">
| <a href="<s:property
value="getProp('users.registration.url')"/>"><s:text
name="navigationBar.register"/></a>
