roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r438520 - in /incubator/roller/branches/roller_3.0: src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java web/WEB-INF/classes/ApplicationResources.properties web/WEB-INF/jsps/authoring/edit-website.jsp
Date Wed, 30 Aug 2006 15:28:58 GMT
Author: snoopdave
Date: Wed Aug 30 08:28:57 2006
New Revision: 438520

URL: http://svn.apache.org/viewvc?rev=438520&view=rev
Log:
Allow Global Admins to set additional page models via weblog settings

Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java?rev=438520&r1=438519&r2=438520&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
Wed Aug 30 08:28:57 2006
@@ -375,6 +375,10 @@
             }
             return list;
         }
+        
+        public boolean isGlobalAdminUser() throws RollerException {
+            return getRollerSession().isGlobalAdminUser();
+        }
     }
 }
 

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties?rev=438520&r1=438519&r2=438520&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
Wed Aug 30 08:28:57 2006
@@ -1673,6 +1673,12 @@
 websiteSettings.button.update=Update Weblog Settings
 websiteSettings.button.rebuildIndex=Rebuild Search Index
 
+# --- Global admin settings
+
+websiteSettings.adminSettings=Global Admin only settings
+websiteSettings.pageModels=Comma-separated list of custom page model classes \
+to be loaded for this weblog
+
 # --- Remove weblog
 
 websiteSettings.button.remove=Remove Weblog

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp?rev=438520&r1=438519&r2=438520&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp Wed Aug
30 08:28:57 2006
@@ -266,6 +266,23 @@
         <td class="description"><%-- <fmt:message key="websiteSettings.tip."
/> --%></td>
     </tr>
 
+    <%-- ***** Global admin only settings ***** --%>
+    <c:choose>
+        <c:when test="${model.globalAdminUser}">
+            <tr>
+                <td colspan="3"><h2><fmt:message key="websiteSettings.adminSettings"
/></h2></td>
+            </tr>
+            <tr>
+                <td class="label"><fmt:message key="websiteSettings.pageModels"
/></td>
+                <td class="field"><html:textarea property="pageModels" rows="7"
cols="40"/></td>
+                <td class="description"><%-- <fmt:message key="websiteSettings.tip."
/> --%></td>
+            </tr>
+        </c:when>
+        <c:otherwise>
+            <html:hidden property="pageModels" />
+        </c:otherwise>
+    </c:choose>
+
 </table>
 
 <br />



Mime
View raw message