You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/04 03:17:28 UTC
svn commit: r544028 - in /roller/trunk/apps/weblogger:
src/java/org/apache/roller/weblogger/planet/ui/ web/WEB-INF/jsps/admin/
Author: agilliland
Date: Sun Jun 3 18:17:27 2007
New Revision: 544028
URL: http://svn.apache.org/viewvc?view=rev&rev=544028
Log:
some finishing touches tidying up weblogger planet actions.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java?view=diff&rev=544028&r1=544027&r2=544028
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java Sun Jun 3 18:17:27 2007
@@ -20,12 +20,16 @@
import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PropertiesManager;
+import org.apache.roller.planet.config.PlanetRuntimeConfig;
+import org.apache.roller.planet.config.runtime.ConfigDef;
+import org.apache.roller.planet.config.runtime.RuntimeConfigDefs;
import org.apache.roller.planet.pojos.PropertyData;
import org.apache.struts2.interceptor.ParameterAware;
@@ -45,11 +49,14 @@
// runtime properties data
private Map properties = Collections.EMPTY_MAP;
+ // the runtime config def used to populate the display
+ private ConfigDef globalConfigDef = null;
+
public PlanetConfig() {
this.actionName = "planetConfig";
this.desiredMenu = "admin";
- this.pageTitle = "";
+ this.pageTitle = "planetConfig.title";
}
@@ -73,6 +80,15 @@
} catch (RollerException ex) {
log.error("Error loading planet properties");
}
+
+ // set config def used to draw the view
+ RuntimeConfigDefs defs = PlanetRuntimeConfig.getRuntimeConfigDefs();
+ List<ConfigDef> configDefs = defs.getConfigDefs();
+ for(ConfigDef configDef : configDefs) {
+ if("global-properties".equals(configDef.getName())) {
+ setGlobalConfigDef(configDef);
+ }
+ }
}
@@ -152,6 +168,14 @@
public void setProperties(Map properties) {
this.properties = properties;
+ }
+
+ public ConfigDef getGlobalConfigDef() {
+ return globalConfigDef;
+ }
+
+ public void setGlobalConfigDef(ConfigDef globalConfigDef) {
+ this.globalConfigDef = globalConfigDef;
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java?view=diff&rev=544028&r1=544027&r2=544028
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java Sun Jun 3 18:17:27 2007
@@ -164,6 +164,8 @@
if(getBean().getHandle() != null && "all".equals(getBean().getHandle())) {
addError("planetGroups.error.nameReserved");
}
+
+ // make sure duplicate group handles are prevented
}
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp?view=diff&rev=544028&r1=544027&r2=544028
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp Sun Jun 3 18:17:27 2007
@@ -18,82 +18,85 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x" %>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<%-- Start by parsing our config defs using the jstl xml toolkit --%>
-<%-- Then we'll progress through the config defs and print out the form --%>
-<x:parse var="configDefs">
- <%= org.apache.roller.planet.config.PlanetRuntimeConfig.getRuntimeConfigDefsAsString() %>
-</x:parse>
-
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. The ASF licenses this file to You
+ under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. For additional information regarding
+ copyright in this work, please see the NOTICE file in the top level
+ directory of this distribution.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<p class="subtitle"><s:text name="planetConfig.subtitle" /></a>
<p><s:text name="planetConfig.prompt" /></a>
-<s:form action="planetConfig">
-
-<input type="hidden" name="method" value="update">
+<s:form action="planetConfig!save">
<table class="formtableNoDesc">
- <x:forEach select="$configDefs//config-def[@name='global-properties']/display-group">
- <c:set var="displayGroupKey"><x:out select="@key"/></c:set>
+ <s:iterator id="dg" value="globalConfigDef.displayGroups">
<tr>
- <td colspan="3"><h2><s:text name="${displayGroupKey}" /></h2></td>
+ <td colspan="3"><h2><s:text name="%{#dg.key}" /></h2></td>
</tr>
- <x:forEach select="property-def">
- <c:set var="propLabelKey"><x:out select="@key"/></c:set>
- <c:set var="name"><x:out select="@name"/></c:set>
-
+ <s:iterator id="pd" value="#dg.propertyDefs">
+
<tr>
- <td class="label"><s:text name="${propLabelKey}" /></td>
+ <td class="label"><s:text name="%{#pd.key}" /></td>
- <%-- choose the right html input element for the display --%>
- <x:choose>
-
<%-- "string" type means use a simple textbox --%>
- <x:when select="type='string'">
- <td class="field"><input type="text" name='<c:out value="${name}"/>' value='<c:out value="${PlanetProps[name].value}"/>' size="35" /></td>
- </x:when>
+ <s:if test="#pd.type == 'string'">
+ <td class="field"><input type="text" name='<s:property value="#pd.name"/>' value='<s:property value="properties[#pd.name].value"/>' size="35" /></td>
+ </s:if>
<%-- "text" type means use a full textarea --%>
- <x:when select="type='text'">
+ <s:elseif test="#pd.type == 'text'">
<td class="field">
- <textarea name='<c:out value="${name}"/>' rows="<x:out select="rows"/>" cols="<x:out select="cols"/>"><c:out value="${PlanetProps[name].value}"/></textarea>
+ <textarea name='<s:property value="#pd.name"/>' rows="<s:property value="#pd.rows"/>" cols="<s:property value="#pd.cols"/>"><s:property value="properties[#pd.name].value"/></textarea>
</td>
- </x:when>
+ </s:elseif>
<%-- "boolean" type means use a checkbox --%>
- <x:when select="type='boolean'">
- <c:choose>
- <c:when test="${PlanetProps[name].value eq 'true'}">
- <td class="field"><input type="checkbox" name='<c:out value="${name}"/>' CHECKED></td>
- </c:when>
- <c:otherwise>
- <td class="field"><input type="checkbox" name='<c:out value="${name}"/>'></td>
- </c:otherwise>
- </c:choose>
- </x:when>
+ <s:elseif test="#pd.type == 'boolean'">
+ <s:if test="properties[#pd.name].value == 'true'">
+ <td class="field"><input type="checkbox" name='<s:property value="#pd.name"/>' CHECKED></td>
+ </s:if>
+ <s:else>
+ <td class="field"><input type="checkbox" name='<s:property value="#pd.name"/>'></td>
+ </s:else>
+ </s:elseif>
<%-- if it's something we don't understand then use textbox --%>
- <x:otherwise>
- <td class="field"><input type="text" name='<c:out value="${name}"/>' size="50" /></td>
- </x:otherwise>
- </x:choose>
+ <s:else>
+ <td class="field"><input type="text" name='<s:property value="#pd.name"/>' size="50" /></td>
+ </s:else>
<td class="description"><%-- <s:text name="" /> --%></td>
</tr>
- </x:forEach>
+ </s:iterator>
<tr>
<td colspan="2"> </td>
</tr>
- </x:forEach>
+ </s:iterator>
</table>
- <s:submit cssClass="buttonBox" key="configForm.save" />
+ <div class="control">
+ <input class="buttonBox" type="submit" value="<s:text name="configForm.save"/>"/>
+ </div>
</s:form>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp?view=diff&rev=544028&r1=544027&r2=544028
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp Sun Jun 3 18:17:27 2007
@@ -55,9 +55,12 @@
<s:if test="group != null" >
+ <s:url id="deleteUrl" action="planetGroups!delete">
+ <s:param name="bean.id" value="%{bean.id}" />
+ </s:url>
<input type="button"
value='<s:text name="planetGroups.button.delete" />'
- onclick="window.location('')" />
+ onclick="window.location='<s:url value="%{deleteUrl}"/>'" />
</s:if>
</div>
@@ -93,11 +96,11 @@
</s:else>
<td class="rollertable">
- <s:property value="group.title" />
+ <s:property value="#group.title" />
</td>
<td class="rollertable">
- <s:property value="group.handle" />
+ <s:property value="#group.handle" />
</td>
<td class="rollertable">
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp?view=diff&rev=544028&r1=544027&r2=544028
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp Sun Jun 3 18:17:27 2007
@@ -72,13 +72,16 @@
<input type="button"
value='<s:text name="planetSubscriptions.button.cancel" />'
- onclick="window.location('')"/>
+ onclick="window.location='<s:url action="planetSubscriptions" />'"/>
- <s:if test="subscription != null" >
+ <s:if test="bean.id != null" >
+ <s:url id="deleteUrl" action="planetSubscriptions!delete">
+ <s:param name="bean.id" value="%{bean.id}" />
+ </s:url>
<input type="button"
value='<s:text name="planetSubscriptions.button.delete" />'
- onclick="window.location('')" />
+ onclick="window.location='<s:url value="%{deleteUrl}" />'" />
</s:if>
</div>
@@ -125,7 +128,7 @@
</td>
<td class="rollertable">
- <s:url id="subUrl" action="planetSubscritions">
+ <s:url id="subUrl" action="planetSubscriptions">
<s:param name="bean.id" value="#sub.id" />
<s:param name="groupHandle" value="%{groupHandle}" />
</s:url>