paulsp 02/01/09 03:36:32
Modified: webapp/WEB-INF/templates/vm/controllers/html
multicolumn-customize.vm
webapp/WEB-INF/templates/vm/portlets/html
customizer-portlet.vm
src/java/org/apache/jetspeed/modules/localization
JetspeedLocalization_en.properties
Log:
In multicolumn-customizer.vm
o Localize
o Only show arrows that are applicable, i.e. do not show
"Move Up" on the top portlet
o Center buttons
In portlets-customizer.vm
o Localize
o Center buttons
o Display message when their no parameters to customize
In JetspeedLocalization_en.properties
o Added localization parameters.
Revision Changes Path
1.7 +28 -14
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- multicolumn-customize.vm 16 Nov 2001 22:51:01 -0000 1.6
+++ multicolumn-customize.vm 9 Jan 2002 11:36:32 -0000 1.7
@@ -1,3 +1,4 @@
+<br>
<table border="0" cellpadding="2" cellspacing="0" width="100%">
<tr>
#set ($col = 0)
@@ -26,11 +27,27 @@
<table width="100%" cellspacing="0" cellpadding="0" #if(
${skin.TitleStyleClass}) class="$!{skin.TitleStyleClass}" #end
#if(${skin.TitleBackgroundColor}) style="background-color:
${skin.TitleBackgroundColor}" #end>
<tr bgcolor="$!{skin.TitleBackgroundColor}">
<td align="right" valign="top" #if(${skin.TitleBackgroundColor})
style="background-color: ${skin.TitleBackgroundColor}" #end >
- <input type="image" src="images/close.gif" alt="Close" border="0"
name="eventSubmit_doDelete" />
- <input type="image" src="images/left.gif" alt="Move left"
border="0" name="eventSubmit_doLeft" />
- <input type="image" src="images/up.gif" alt="Move up" border="0"
name="eventSubmit_doUp" />
- <input type="image" src="images/down.gif" alt="Move down"
border="0" name="eventSubmit_doDown" />
- <input type="image" src="images/right.gif" alt="Move right"
border="0" name="eventSubmit_doRight" />
+ <input type="image" src="images/close.gif"
alt="$l10n.CUSTOMIZER_REMOVE" border="0" name="eventSubmit_doDelete">
+ #if ($col == 0)
+ <img src="images/blank.gif" width="14">
+ #else
+ <input type="image" src="images/left.gif"
alt="$l10n.CUSTOMIZER_MOVELEFT" border="0" name="eventSubmit_doLeft">
+ #end
+ #if ($row == 0)
+ <img src="images/blank.gif" width="14">
+ #else
+ <input type="image" src="images/up.gif"
alt="$l10n.CUSTOMIZER_MOVEUP" border="0" name="eventSubmit_doUp">
+ #end
+ #if ($row == ($column.size() - 1))
+ <img src="images/blank.gif" width="14">
+ #else
+ <input type="image" src="images/down.gif"
alt="$l10n.CUSTOMIZER_MOVEDOWN" border="0" name="eventSubmit_doDown">
+ #end
+ #if ($col == ($sizes.size() - 1))
+ <img src="images/blank.gif" width="14">
+ #else
+ <input type="image" src="images/right.gif"
alt="$l10n.CUSTOMIZER_MOVERIGHT" border="0" name="eventSubmit_doRight">
+ #end
</td>
</tr>
#if ($titles.get($portlet.Parent))
@@ -59,15 +76,12 @@
</td>
#end
#end
-</tr>
+ </tr>
</table>
+<br>
<form action="$jlink" method="post">
-#if ($action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-<tr>
- <td align="right" width="100%">
- <input type="submit" name="eventSubmit_doSave" value="Save & Apply" />
- </td>
-</tr>
-</table>
+ #if ($action) <input type="hidden" name="$jlink.ActionKey" value="$action" > #end
+ <center>
+ <input type="submit" name="eventSubmit_doSave"
value="$l10n.CUSTOMIZER_SAVEAPPLY" >
+ </center>
</form>
1.3 +39 -35
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm
Index: customizer-portlet.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- customizer-portlet.vm 6 Dec 2001 06:03:40 -0000 1.2
+++ customizer-portlet.vm 9 Jan 2002 11:36:32 -0000 1.3
@@ -1,41 +1,45 @@
+<br>
#set ($config = $portlet.PortletConfig)
<form action="$jlink" method="post">
#if ($action)
- <input name="$jlink.ActionKey" type="hidden" value="$action" />
+ <input name="$jlink.ActionKey" type="hidden" value="$action">
#end
-<table width="100%" cellpadding="1" cellspacing="0">
-#foreach ( $param in $parameters )
- <tr>
- <td align="left" nowrap><b>#if ($param.Title) $param.Title #else $param.Name
#end</b></td>
- <td>
-#if ($param.Type == "boolean")
- <select name="$param.Name">
- <option #if ($config.getInitParameter($param.Name) == "false") SELECTED
#end>false
- <option #if ($config.getInitParameter($param.Name) == "true") SELECTED
#end>true
- </select>
-#else
- <input type="text" name="$param.Name" value="$!param.Value" />
+#if ($parameters.size() == 0)
+ <br>
+ <center>$l10n.CUSTOMIZER_NOPARAMETERS</center>
+ <br>
#end
- </td>
- </tr>
- <tr>
- <td colspan="2">
-#if ($param.Description)
- $param.Description
-#end
- <hr />
- </td>
- </tr>
-#end
- <tr>
- <td align="right">
-#if ($parameters.size() > 0)
- <input type="submit" name="eventSubmit_doUpdate" value="Update"
class="BUTON"/>
-#end
- </td>
- <td align="left">
- <input type="submit" name="eventSubmit_doCancel" value="Cancel"
class="BUTON"/>
- </td>
- </tr>
-</table>
+ <table width="100%" cellpadding="1" cellspacing="0">
+ #foreach ( $param in $parameters )
+ <tr>
+ <td align="left" nowrap><b>#if ($param.Title) $param.Title #else $param.Name
#end</b></td>
+ <td>
+ #if ($param.Type == "boolean")
+ <select name="$param.Name">
+ <option #if ($config.getInitParameter($param.Name) == "false") SELECTED
#end>false
+ <option #if ($config.getInitParameter($param.Name) == "true") SELECTED
#end>true
+ </select>
+ #else
+ <input type="text" name="$param.Name" value="$!param.Value" >
+ #end
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ #if ($param.Description)
+ $param.Description
+ #end
+ <hr/>
+ </td>
+ </tr>
+ #end
+ </table>
+<br>
+ <center>
+ #if ($parameters.size() > 0)
+ <input type="submit" name="eventSubmit_doUpdate"
value="$l10n.CUSTOMIZER_UPDATE">
+
+ #end
+ <input type="submit" name="eventSubmit_doCancel"
value="$l10n.CUSTOMIZER_CANCEL">
+ </center>
</form>
1.10 +6 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties
Index: JetspeedLocalization_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JetspeedLocalization_en.properties 28 Dec 2001 15:47:07 -0000 1.9
+++ JetspeedLocalization_en.properties 9 Jan 2002 11:36:32 -0000 1.10
@@ -125,6 +125,7 @@
CUSTOMIZER_ADDPORTLET=Add Portlet
CUSTOMIZER_APPLY=Apply
CUSTOMIZER_CANCEL=Cancel
+CUSTOMIZER_CLOSE=Close
CUSTOMIZER_CUSTOMIZABLEPANE=Pane, click for customization
CUSTOMIZER_DESCRIPTION=Description
CUSTOMIZER_NODESCRIPTION=Description not available
@@ -137,17 +138,21 @@
CUSTOMIZER_MOVEDOWN=Move Down
CUSTOMIZER_MOVELEFT=Move Left
CUSTOMIZER_MOVERIGHT=Move Right
-CUSTOMIZER_MOVEUP=Move UP
+CUSTOMIZER_MOVEUP=Move Up
CUSTOMIZER_NAME=Name
CUSTOMIZER_NEXTBTN=Next >>
CUSTOMIZER_NEWPANENAME=Type the name of the pane to add
CUSTOMIZER_NOTHINGDEFINED=No Portlets or Panes Defined
+CUSTOMIZER_NOPARAMETERS=No customizeable parameters
CUSTOMIZER_PANE=Pane
CUSTOMIZER_PORTLET=Portlet
CUSTOMIZER_PREVIOUSBTN=<< Previous
+CUSTOMIZER_REMOVE=Remove
+CUSTOMIZER_SAVE=Save
CUSTOMIZER_SAVEAPPLY=Save and Apply
CUSTOMIZER_SELECTE=Select
CUSTOMIZER_SELECTEDPANE=Selected Pane
CUSTOMIZER_SKIN=Skin
CUSTOMIZER_TITLE=Title
CUSTOMIZER_TYPE=Type
+CUSTOMIZER_UPDATE=Update
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
