raphael 01/07/11 02:36:28
Modified: src/java/org/apache/jetspeed/modules/actions/controllers
MultiColumnControllerAction.java
src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java VelocityPortletAction.java
Log:
- improve portlet set customizer appearance
- fix some customizer state issues
Revision Changes Path
1.2 +2 -0
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
Index: MultiColumnControllerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiColumnControllerAction.java 2001/07/08 20:54:36 1.1
+++ MultiColumnControllerAction.java 2001/07/11 09:36:26 1.2
@@ -117,6 +117,7 @@
// not an integer or null, default to standarrd value
colNum = 3;
}
+ context.put("colNum",String.valueOf(colNum));
//retrieve the size for each of the columns
String sizes = controller.getConfig().getInitParameter("sizes");
@@ -253,6 +254,7 @@
// not an integer or null, default to standarrd value
colNum = 3;
}
+ context.put("colNum",String.valueOf(colNum));
//retrieve the size for each of the columns
String sizes = controller.getConfig().getInitParameter("sizes");
1.5 +2 -0
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CustomizeSetAction.java 2001/07/08 20:54:37 1.4
+++ CustomizeSetAction.java 2001/07/11 09:36:27 1.5
@@ -116,7 +116,9 @@
context.put("skins",Registry.get(Registry.SKIN).toArray());
context.put("currentController", set.getController().getConfig().getName());
context.put("currentSkin",
set.getPortletConfig().getPortletSkin().getName());
+ context.put("skin", set.getPortletConfig().getPortletSkin());
context.put("set", set);
+ context.put("action","portlets.CustomizeSetAction");
if (!(set.getController() instanceof PortletSetController))
{
1.7 +0 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/VelocityPortletAction.java
Index: VelocityPortletAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/VelocityPortletAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VelocityPortletAction.java 2001/07/05 17:29:21 1.6
+++ VelocityPortletAction.java 2001/07/11 09:36:27 1.7
@@ -91,8 +91,6 @@
protected void perform( RunData rundata )
throws Exception
{
- // first try to see if there are some events registered for this
- // action...
Context context = getContext(rundata);
if ((context!=null)&&(rundata.getParameters().getString("action")!=null))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
