Author: snoopdave
Date: Mon Feb 11 14:01:30 2008
New Revision: 620629
URL: http://svn.apache.org/viewvc?rev=620629&view=rev
Log:
Merging fix for disable custom themes from trunk
Modified:
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/core/MainMenu.jsp
Modified:
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml?rev=620629&r1=620628&r2=620629&view=diff
==============================================================================
---
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
(original)
+++
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
Mon Feb 11 14:01:30 2008
@@ -65,7 +65,7 @@
</menu>
- <menu name="tabbedmenu.design" perms="admin" roles="editor">
+ <menu name="tabbedmenu.design" perms="admin" roles="editor"
enabledProperty="themes.customtheme.allowed">
<menu-item action="themeEdit"
name="tabbedmenu.website.themes"
Modified:
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/core/MainMenu.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/core/MainMenu.jsp?rev=620629&r1=620628&r2=620629&view=diff
==============================================================================
---
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/core/MainMenu.jsp
(original)
+++
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/core/MainMenu.jsp
Mon Feb 11 14:01:30 2008
@@ -129,13 +129,17 @@
<%-- Only adming get access to theme and config
settings --%>
<s:if test="#perms.permissionMask == 3">
- <s:url action="themeEdit"
namespace="/roller-ui/authoring" id="weblogTheme">
- <s:param name="weblog"
value="#perms.website.handle" />
- </s:url>
- <img src='<s:url
value="/roller-ui/images/layout.png"/>' />
- <a href='<s:property value="weblogTheme" />'>
- <s:text name="yourWebsites.theme" /></a>
- <br />
+
+ <%-- And only show theme option if custom themes
are enabled --%>
+ <s:if test="getProp('themes.customtheme.allowed')">
+ <s:url action="themeEdit"
namespace="/roller-ui/authoring" id="weblogTheme">
+ <s:param name="weblog"
value="#perms.website.handle" />
+ </s:url>
+ <img src='<s:url
value="/roller-ui/images/layout.png"/>' />
+ <a href='<s:property value="weblogTheme" />'>
+ <s:text name="yourWebsites.theme" /></a>
+ <br />
+ </s:if>
<s:url action="weblogConfig"
namespace="/roller-ui/authoring" id="manageWeblog">
<s:param name="weblog"
value="#perms.website.handle" />
