morciuch 2003/05/27 16:58:42
Modified: docs/site changes.html
src/java/org/apache/jetspeed/modules/actions/controllers
VelocityControllerAction.java
src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
webapp/WEB-INF/templates/vm/controllers/html
card-customize.vm column-customize.vm
flow-customize.vm multicolumn-customize.vm
row-customize.vm
webapp/WEB-INF/templates/vm/portlets/html
customizer-portletset-addset.vm
customizer-portletset-general.vm
xdocs changes.xml
Log:
Fixed various inconsistencies in portlet set customizer (see Bugzilla issue# 7667):
1. Edit Properties now has Cancel button.
2. Edit Properties does not persist changes after Apply button is clicked.
3. Edit Properties is not disabled for the top level portlet set.
4. Edit Properties now lists both Title and Description from Meta Info.
5. Add Pane now has Cancel button.
6. Save button label is now context sensitive: "Save and Apply" vs. "Apply" (this is
now consistent across various controllers).
Revision Changes Path
1.146 +3 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- changes.html 23 May 2003 17:03:16 -0000 1.145
+++ changes.html 27 May 2003 23:58:41 -0000 1.146
@@ -135,6 +135,9 @@
</li>
-->
<li>
+ Fix - Bug # 7667 - 2003/05/27 - Fixing various inconsistencies in the portlet
set customizer (MO)
+</li>
+<li>
Add - Bug # 19124 - 2003/05/22 - Admin browsers UI clean up and paging issues
fixes, by Jeremy Ford (MO)
</li>
<li>
1.6 +23 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/VelocityControllerAction.java
Index: VelocityControllerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/VelocityControllerAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VelocityControllerAction.java 4 Mar 2003 00:04:53 -0000 1.5
+++ VelocityControllerAction.java 27 May 2003 23:58:41 -0000 1.6
@@ -54,18 +54,21 @@
package org.apache.jetspeed.modules.actions.controllers;
+// Jetspeed stuff
import org.apache.jetspeed.portal.PortletController;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
+import org.apache.jetspeed.services.rundata.JetspeedRunData;
+import org.apache.jetspeed.services.statemanager.SessionState;
// Turbine stuff
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.modules.actions.VelocityAction;
+import org.apache.turbine.services.localization.Localization;
// Velocity Stuff
import org.apache.velocity.context.Context;
-
/**
* An abstract action class to build VelocityPortlet actions.
*
@@ -179,6 +182,25 @@
setTemplate(rundata, template);
context.put( "action", controller.getConfig().getInitParameter("action"));
+
+ // We want the save button to say different things based on whether we're
about to save to persistent storage
+ // (Save and Apply) or just go the next screen (Apply).
+ JetspeedRunData jdata = (JetspeedRunData) rundata;
+
+ // get the customization state for this page
+ SessionState customizationState = jdata.getPageSessionState();
+
+ String saveLabel = null;
+ if (((String)
customizationState.getAttribute("customize-paneName")).equalsIgnoreCase("*"))
+ {
+ saveLabel = Localization.getString("CUSTOMIZER_SAVEAPPLY");
+ }
+ else
+ {
+ saveLabel = Localization.getString("CUSTOMIZER_APPLY");
+ }
+ context.put("saveLabel", saveLabel);
+
}
/**
1.42 +2 -9
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
Index: CustomizeSetAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- CustomizeSetAction.java 17 Apr 2003 20:41:55 -0000 1.41
+++ CustomizeSetAction.java 27 May 2003 23:58:41 -0000 1.42
@@ -249,14 +249,7 @@
{
context.put("currentSkin",
set.getPortletConfig().getPortletSkin().getName());
}
- if (customizedPaneName.equalsIgnoreCase("*"))
- {
- context.put("allowproperties", "false");
- }
- else
- {
- context.put("allowproperties", "true");
- }
+ context.put("allowproperties", "true");
}
1.14 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm
Index: card-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- card-customize.vm 25 Mar 2003 18:39:56 -0000 1.13
+++ card-customize.vm 27 May 2003 23:58:41 -0000 1.14
@@ -105,7 +105,7 @@
<tr>
#if ($controller.Portlets.allowCustomize($data))
<td>
- <input type="submit" name="eventSubmit_doApply"
value="$l10n.CUSTOMIZER_APPLY">
+ <input type="submit" name="eventSubmit_doApply" value="$saveLabel">
</td>
#end
<td>
1.12 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm
Index: column-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- column-customize.vm 25 Mar 2003 18:39:56 -0000 1.11
+++ column-customize.vm 27 May 2003 23:58:41 -0000 1.12
@@ -106,7 +106,7 @@
<tr>
#if ($controller.Portlets.allowCustomize($data))
<td>
- <input type="submit" name="eventSubmit_doApply"
value="$l10n.CUSTOMIZER_APPLY">
+ <input type="submit" name="eventSubmit_doApply" value="$saveLabel">
</td>
#end
<td>
1.6 +1 -1
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm
Index: flow-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- flow-customize.vm 25 Mar 2003 18:39:56 -0000 1.5
+++ flow-customize.vm 27 May 2003 23:58:42 -0000 1.6
@@ -104,7 +104,7 @@
<table cellspacing="2">
<tr>
<td>
- <input type="submit" name="eventSubmit_doApply"
value="$l10n.CUSTOMIZER_APPLY">
+ <input type="submit" name="eventSubmit_doApply" value="$saveLabel">
</td>
<td>
<input type="submit" name="eventSubmit_doCancel"
value="$l10n.CUSTOMIZER_CANCEL">
1.21 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm
Index: multicolumn-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- multicolumn-customize.vm 13 May 2003 16:19:08 -0000 1.20
+++ multicolumn-customize.vm 27 May 2003 23:58:42 -0000 1.21
@@ -174,7 +174,7 @@
<tr>
#if ($controller.Portlets.allowCustomize($data))
<td>
- <input type="submit" name="eventSubmit_doSave"
value="$l10n.CUSTOMIZER_SAVEAPPLY" >
+ <input type="submit" name="eventSubmit_doSave" value="$saveLabel" >
</td>
#end
<td>
1.11 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm
Index: row-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- row-customize.vm 25 Mar 2003 18:39:56 -0000 1.10
+++ row-customize.vm 27 May 2003 23:58:42 -0000 1.11
@@ -106,7 +106,7 @@
<tr>
#if ($controller.Portlets.allowCustomize($data))
<td>
- <input type="submit" name="eventSubmit_doApply"
value="$l10n.CUSTOMIZER_APPLY">
+ <input type="submit" name="eventSubmit_doApply" value="$saveLabel">
</td>
#end
<td>
1.7 +2 -1
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-addset.vm
Index: customizer-portletset-addset.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-addset.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- customizer-portletset-addset.vm 23 Jul 2002 00:03:56 -0000 1.6
+++ customizer-portletset-addset.vm 27 May 2003 23:58:42 -0000 1.7
@@ -22,7 +22,8 @@
</tr>
<tr width="100%">
<td align="center" colspan="3">
- <input type="submit" name="eventSubmit_doAddset"
value="$l10n.CUSTOMIZER_APPLY">
+ <input type="submit" name="eventSubmit_doAddset"
value="$l10n.CUSTOMIZER_APPLY">
+ <input type="submit" name="eventSubmit_doCancel"
value="$l10n.CUSTOMIZER_CANCEL">
</td>
</tr>
</table>
1.7 +14 -3
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-general.vm
Index: customizer-portletset-general.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-general.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- customizer-portletset-general.vm 23 Jul 2002 00:03:56 -0000 1.6
+++ customizer-portletset-general.vm 27 May 2003 23:58:42 -0000 1.7
@@ -10,21 +10,32 @@
<table cellspacing="2" cellpadding="0">
<tr>
<td>
- Set a title for this pane :
+ $l10n.CUSTOMIZER_TITLE :
</td>
<td>
<input type="text" name="title" value="$!set.Title" >
</td>
</tr>
+ <tr>
+ <td>
+ $l10n.CUSTOMIZER_DESCRIPTION :
+ </td>
+ <td>
+ <input type="text" name="description" value="$!set.Description" SIZE="64" >
+ </td>
+ </tr>
</table>
<center>
<table cellspacing="2">
<tr>
<td>
- <input type="submit" name="eventSubmit_doSave"
value="$l10n.CUSTOMIZER_APPLY">
+ <input type="submit" name="eventSubmit_doMetainfo"
value="$l10n.CUSTOMIZER_APPLY">
+ </td>
+ <td>
+ <input type="reset" value="$l10n.USERFORM_RESET">
</td>
<td>
- <input type="reset" value="$l10n.CUSTOMIZER_CANCEL">
+ <input type="submit" name="eventSubmit_doCancel"
value="$l10n.CUSTOMIZER_CANCEL">
</td>
</tr>
</table>
1.165 +4 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- changes.xml 23 May 2003 17:03:17 -0000 1.164
+++ changes.xml 27 May 2003 23:58:42 -0000 1.165
@@ -24,6 +24,9 @@
</li>
-->
<li>
+ Fix - Bug # 7667 - 2003/05/27 - Fixing various inconsistencies in the portlet
set customizer (MO)
+</li>
+<li>
Add - Bug # 19124 - 2003/05/22 - Admin browsers UI clean up and paging issues
fixes, by Jeremy Ford (MO)
</li>
<li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
