You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/10/20 00:32:21 UTC
svn commit: r465911 - in /incubator/roller/trunk/sandbox/planetroller:
nbproject/ src/org/apache/roller/planet/ui/forms/
src/org/apache/roller/planet/ui/utils/ templates/ web/WEB-INF/
web/WEB-INF/classes/ web/images/ web/planet-ui/
Author: snoopdave
Date: Thu Oct 19 15:32:17 2006
New Revision: 465911
URL: http://svn.apache.org/viewvc?view=rev&rev=465911
Log:
More refinements to Planet codebase
Added:
incubator/roller/trunk/sandbox/planetroller/web/images/page_white_world.png (with props)
incubator/roller/trunk/sandbox/planetroller/web/images/world_link.png (with props)
Modified:
incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml
incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java
incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java
incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/LoadableFormFilter.java
incubator/roller/trunk/sandbox/planetroller/templates/control.vm
incubator/roller/trunk/sandbox/planetroller/templates/opml.vm
incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml
incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml
incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp
incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp
incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp
incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp
Modified: incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml Thu Oct 19 15:32:17 2006
@@ -8,15 +8,15 @@
<properties/>
<folders>
<source-folder>
- <label>web</label>
- <type>doc_root</type>
- <location>web</location>
- </source-folder>
- <source-folder>
<label>src</label>
<type>java</type>
<location>src</location>
</source-folder>
+ <source-folder>
+ <label>web</label>
+ <type>doc_root</type>
+ <location>web</location>
+ </source-folder>
</folders>
<ide-actions>
<action name="build">
@@ -55,7 +55,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
<compilation-unit>
<package-root>src</package-root>
- <classpath mode="compile">lib/asm-attrs.jar:lib/asm.jar:lib/cglib-2.1.3.jar:lib/commons-fileupload.jar:lib/commons-validator.jar:lib/dom4j-1.6.1.jar:lib/ehcache-1.1.jar:lib/hibernate3.jar:lib/jaxen-full.jar:lib/jdbc2_0-stdext.jar:lib/jdom.jar:lib/jta.jar:lib/log4j-1.2.11.jar:lib/roller-business.jar:lib/rome-0.8.jar:lib/rome-fetcher-0.8.jar:lib/saxpath.jar:lib/velocity-1.4.jar:lib/velocity-dep-1.4.jar:lib/commons-logging.jar:lib/commons-lang-2.0.jar:lib/roller-web.jar</classpath>
+ <classpath mode="compile">lib/asm-attrs.jar:lib/asm.jar:lib/cglib-2.1.3.jar:lib/commons-fileupload.jar:lib/commons-validator.jar:lib/dom4j-1.6.1.jar:lib/ehcache-1.1.jar:lib/hibernate3.jar:lib/jaxen-full.jar:lib/jdbc2_0-stdext.jar:lib/jdom.jar:lib/jta.jar:lib/log4j-1.2.11.jar:lib/roller-business.jar:lib/rome-0.8.jar:lib/rome-fetcher-0.8.jar:lib/saxpath.jar:lib/velocity-1.4.jar:lib/velocity-dep-1.4.jar:lib/commons-logging.jar:lib/commons-lang-2.0.jar:lib/roller-web.jar:web/WEB-INF/lib/commons-beanutils-1.7.0.jar:web/WEB-INF/lib/commons-codec-1.3.jar:web/WEB-INF/lib/commons-collections-3.1.jar:web/WEB-INF/lib/commons-digester-1.6.jar:web/WEB-INF/lib/commons-el-1.0.jar:web/WEB-INF/lib/commons-lang-2.1.jar:web/WEB-INF/lib/commons-logging-1.0.4.jar:web/WEB-INF/lib/jstl.jar:web/WEB-INF/lib/myfaces-api-1.1.4.jar:web/WEB-INF/lib/myfaces-impl-1.1.4.jar:web/WEB-INF/lib/standard.jar:web/WEB-INF/lib/tomahawk-1.1.3.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar</c
lasspath>
<source-level>1.4</source-level>
</compilation-unit>
</java-data>
Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java Thu Oct 19 15:32:17 2006
@@ -39,6 +39,8 @@
private static Log log = LogFactory.getLog(GroupsListForm.class);
private PlanetGroupData group = new PlanetGroupData();
+ public GroupForm() {}
+
public String load(HttpServletRequest request) throws Exception {
log.info("Loading Group...");
String groupid = request.getParameter("groupid");
@@ -67,7 +69,7 @@
planet.getPlanetManager().saveGroup(group);
}
planet.flush();
- return "editGroups";
+ return "editGroup";
}
public String removeSubscription() throws Exception {
@@ -88,13 +90,9 @@
}
return "editGroup";
}
-
- public PlanetGroupData getGroup() {
+
+ public PlanetGroupData getGroup() throws Exception {
return group;
- }
-
- public void setGroup(PlanetGroupData group) {
- this.group = group;
}
public List getSubscriptions() throws Exception {
Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupsListForm.java Thu Oct 19 15:32:17 2006
@@ -19,7 +19,7 @@
import java.util.List;
import java.util.Map;
-import javax.faces.context.FacesContext;
+import javax.faces.context.FacesContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
@@ -36,7 +36,7 @@
public String deleteGroup() {
log.info("Delete Group...");
Planet planet = PlanetFactory.getPlanet();
- FacesContext fctx = FacesContext.getCurrentInstance();
+ FacesContext fctx = FacesContext.getCurrentInstance();
Map params = fctx.getExternalContext().getRequestParameterMap();
String groupid = (String)params.get("groupid");
try {
@@ -51,5 +51,9 @@
public List getGroups() throws Exception {
return PlanetFactory.getPlanet().getPlanetManager().getGroups();
+ }
+
+ public String getSiteURL() throws Exception {
+ return PlanetFactory.getPlanet().getPlanetManager().getConfiguration().getSiteURL();
}
}
Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java Thu Oct 19 15:32:17 2006
@@ -28,6 +28,7 @@
import org.apache.commons.lang.StringUtils;
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.PlanetManager;
import org.apache.roller.planet.pojos.PlanetGroupData;
@@ -43,6 +44,7 @@
private static Log log = LogFactory.getLog(GroupsListForm.class);
private PlanetSubscriptionData subscription = new PlanetSubscriptionData();
private String groupid = null;
+ private String subid = null;
public SubscriptionForm() {}
@@ -85,14 +87,18 @@
return "editSubscription";
}
- public PlanetSubscriptionData getSubscription() {
+ public PlanetSubscriptionData getSubscription() throws Exception {
+ if (subscription == null && subid != null) {
+ PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
+ subscription = pmgr.getSubscriptionById(groupid);
+ }
return subscription;
}
public void setSubscription(PlanetSubscriptionData subscription) {
this.subscription = subscription;
}
-
+
public String getGroupid() {
return groupid;
}
Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/LoadableFormFilter.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/LoadableFormFilter.java?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/LoadableFormFilter.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/LoadableFormFilter.java Thu Oct 19 15:32:17 2006
@@ -90,7 +90,7 @@
if (form != null) try { // to call form class load() method
log.debug("Loading form: " + formName);
form.load(request);
- request.setAttribute(formName, form);
+ request.getSession().setAttribute(formName, form);
} catch (Exception e) {
// error during form load indicates real problem
throw new ServletException("ERROR loading form " + formName, e);
Modified: incubator/roller/trunk/sandbox/planetroller/templates/control.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/templates/control.vm?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/templates/control.vm (original)
+++ incubator/roller/trunk/sandbox/planetroller/templates/control.vm Thu Oct 19 15:32:17 2006
@@ -1,13 +1,17 @@
#set ($groupHandles = $planet.groupHandles)
#set ($outputPath = $generator.getOutputPath())
+
#foreach ($groupHandle in $groupHandles)
- #set ($groupPath = $strings.concat([$outputPath, "/", $groupHandle]))
- $generator.setOutputPath($groupPath);
+
+ $generator.setOutputPath($strings.concat([$outputPath, "/", $groupHandle]));
+
#set ($outputFile = $strings.concat(["index", ".html"]))
$generator.parse("html.vm", $outputFile, "groupHandle", $groupHandle)
+
#set ($outputFile = $strings.concat(["index", ".rss"]))
$generator.parse("rss.vm", $outputFile, "groupHandle", $groupHandle)
+
#set ($outputFile = $strings.concat(["index", ".opml"]))
$generator.parse("opml.vm", $outputFile, "groupHandle", $groupHandle)
-#end
-?
\ No newline at end of file
+
+#end
\ No newline at end of file
Modified: incubator/roller/trunk/sandbox/planetroller/templates/opml.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/templates/opml.vm?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/templates/opml.vm (original)
+++ incubator/roller/trunk/sandbox/planetroller/templates/opml.vm Thu Oct 19 15:32:17 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding='utf-8'?>
-#set($group = $planet.getGroup($groupHandle))
-<opml version="1.1">
+#set($group = $planet.getGroup($groupHandle))<opml version="1.1">
<head>
<title>$group.description</title>
<dateCreated>$utils.formatRfc822Date($date)</dateCreated>
@@ -9,10 +8,12 @@
<ownerEmail>$planet.configuration.adminEmail</ownerEmail>
</head>
<body>
+<outline>
#foreach($sub in $group.subscriptions)
<outline text="$utils.escapeXML($sub.title)"
xmlUrl="$utils.escapeXML($sub.feedURL)"
htmlUrl="$utils.escapeXML($sub.siteURL)" />
#end
+</outline>
</body>
</opml>
Modified: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties Thu Oct 19 15:32:17 2006
@@ -30,6 +30,7 @@
configProxyHost=Proxy host
configProxyPort=Proxy port
configDefaultGroup=Default group
+configSiteURL=Site URL
# error.jsp
@@ -74,6 +75,7 @@
groupsHandle=Handle
groupsTitle=Tile
groupsConfirmGroupRemove=Are you sure you want to remove group:
+groupsGroupURL=Group URL
# login.jsp
@@ -86,7 +88,7 @@
# main.jsp
mainTitle=Welcome to Planet Roller
-mainConsoleLink=Use the Planet Roller admin console to configure a default group...
+mainConsoleLink=Click here to use the Planet Roller admin console...
# subscriptionForm.jsp
@@ -97,5 +99,5 @@
subscriptionName=Handle
subscriptionFeedURL=Feed URL
subscriptionSiteURL=Site URL
-
+subscriptionReturnToGroup=Return to group
Modified: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml Thu Oct 19 15:32:17 2006
@@ -4,27 +4,27 @@
<managed-bean>
<managed-bean-name>configForm</managed-bean-name>
<managed-bean-class>org.apache.roller.planet.ui.forms.ConfigForm</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
<managed-bean-name>groupsList</managed-bean-name>
<managed-bean-class>org.apache.roller.planet.ui.forms.GroupsListForm</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
<managed-bean-name>groupForm</managed-bean-name>
<managed-bean-class>org.apache.roller.planet.ui.forms.GroupForm</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
<managed-bean-name>subscriptionForm</managed-bean-name>
<managed-bean-class>org.apache.roller.planet.ui.forms.SubscriptionForm</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
<managed-bean-name>error</managed-bean-name>
<managed-bean-class>org.apache.roller.planet.ui.utils.ErrorBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<navigation-rule>
<from-view-id>/*</from-view-id>
Modified: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml Thu Oct 19 15:32:17 2006
@@ -47,8 +47,9 @@
</servlet-mapping>
<welcome-file-list>
- <welcome-file>/index.jsp</welcome-file>
- </welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
<error-page>
<error-code>500</error-code>
Added: incubator/roller/trunk/sandbox/planetroller/web/images/page_white_world.png
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/images/page_white_world.png?view=auto&rev=465911
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/trunk/sandbox/planetroller/web/images/page_white_world.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/trunk/sandbox/planetroller/web/images/world_link.png
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/images/world_link.png?view=auto&rev=465911
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/trunk/sandbox/planetroller/web/images/world_link.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp Thu Oct 19 15:32:17 2006
@@ -49,11 +49,20 @@
<h:outputText value="#{msgs.configDescription}" />
<h:panelGroup>
- <h:inputText id="description" value="#{configForm.planetConfig.description}" required="false" size="60">
+ <h:inputText id="description" value="#{configForm.planetConfig.description}"
+ required="false" size="60">
</h:inputText>
<h:message for="description" styleClass="fieldError" />
</h:panelGroup>
+ <h:outputText value="#{msgs.configSiteURL}" />
+ <h:panelGroup>
+ <h:inputText id="siteURL" value="#{configForm.planetConfig.siteURL}"
+ required="true" size="60" validator="#{subscriptionForm.checkURL}">
+ </h:inputText>
+ <h:message for="siteURL" styleClass="fieldError" />
+ </h:panelGroup>
+
<h:outputText value="#{msgs.configAdminName}" />
<h:panelGroup>
<h:inputText id="adminName" value="#{configForm.planetConfig.adminName}" required="true" size="20">
Modified: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp Thu Oct 19 15:32:17 2006
@@ -94,7 +94,7 @@
</f:facet>
<h:outputLink value="#{sub.siteURL}" target="_blank"
title="#{sub.siteURL}" >
- <h:graphicImage style="" value="../images/feed_link.png" />
+ <h:graphicImage style="" value="../images/world_link.png" />
<h:outputText value="link" />
</h:outputLink>
</h:column>
Modified: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp Thu Oct 19 15:32:17 2006
@@ -37,9 +37,9 @@
<h2><h:outputText value="#{msgs.groupsListTitle}" /></h2>
<p><h:outputText value="#{msgs.groupsHelp}" /></p>
-<h:form>
+<h:form id="groupsForm">
<h:dataTable value="#{groupsList.groups}" var="group"
- styleClass="data" rowClasses="oddRow,evenRow" columnClasses="narrowColumn,,narrowColumn">
+ styleClass="data" rowClasses="oddRow,evenRow" columnClasses="narrowColumn,,narrowColumn,narrowColumn">
<h:column>
<f:facet name="header">
@@ -59,6 +59,16 @@
<h:column>
<f:facet name="header">
+ <h:outputText value="#{msgs.groupsGroupURL}" />
+ </f:facet>
+ <h:outputLink value="#{groupsList.siteURL}/#{group.handle}" target="_blank">
+ <h:graphicImage style="" value="../images/page_white_world.png" />
+ <h:outputText value="link" />
+ </h:outputLink>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
<h:outputText value="#{msgs.appAction}" />
</f:facet>
<h:outputLink value="javascript:deleteGroup('#{group.id}','#{group.handle}')">
@@ -75,8 +85,8 @@
<h:outputText value="#{msgs.groupsAddGroup}" />
</h:commandLink>
-<%-- Kludgey way to get a confirm delete popup --%>
-<t:commandLink id="deleteGroupLink" forceId="true" action="#{groupsForm.deleteGroup}" >
+<%-- Kludgey way to get a confirm delete popup --%>
+<t:commandLink id="deleteGroupLink" forceId="true" action="#{groupsList.deleteGroup}" >
<f:param name="groupid" value="" />
</t:commandLink>
<script type="text/javascript">
Modified: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp?view=diff&rev=465911&r1=465910&r2=465911
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp Thu Oct 19 15:32:17 2006
@@ -33,21 +33,20 @@
<div id="wrapper">
<%@include file="/planet-ui/menu.jsp" %>
-<h:form>
+<h:form id="subscriptionForm">
<h2><h:outputText value="#{msgs.subscriptionPageTitle}" /></h2>
<p><h:outputText value="#{msgs.subscriptionHelp}" /></p>
-<%--
<c:if test="${subscriptionForm.groupid != null}">
<p><h:outputLink value="./groupForm.faces?groupid=#{subscriptionForm.groupid}">
- <h:outputText value="Return to group" />
+ <h:outputText value="#{msgs.subscriptionReturnToGroup}" />
</h:outputLink></p>
</c:if>
---%>
<h:inputHidden value="#{subscriptionForm.subscription.id}" />
<h:inputHidden value="#{subscriptionForm.groupid}" />
+
<h:panelGrid columns="2" columnClasses="labelColumn,valueColumn">
<h:outputText value="#{msgs.subscriptionTitle}" />