raphael 01/07/23 14:45:54
Modified: webapp/WEB-INF/templates/vm/controllers/html
card-customize.vm column-customize.vm
multicolumn.vm row-customize.vm
webapp/WEB-INF/templates/vm/portlets/html
customizer-portletset-layout.vm
customizer-portletset.vm
Log:
- fix some customizer template issues
- update the row and column customizer templates
Revision Changes Path
1.4 +6 -1
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- card-customize.vm 2001/07/22 20:32:47 1.3
+++ card-customize.vm 2001/07/23 21:45:53 1.4
@@ -2,8 +2,13 @@
#foreach ($entry in $portlets)
#set ($position = $velocityCount - 1)
<tr>
+#if ($entry.Parent)
+ #set ($title = $titles.get($entry.Parent) )
+#else
+ #set ($title = $entry.Metainfo.Title)
+#end
<td valign="top" width="60%">
- <b>$!entry.Metainfo.Title</b>
+ <b>#if ($title) $title #else #if ($entry.Parent) $entry.Parent #else Pane
$!entry.Name #end #end</b>
</td>
<td valign="top" align="center" width="40%">
<form action="$jlink" method="post">
1.2 +37 -23
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- column-customize.vm 2001/06/25 11:32:38 1.1
+++ column-customize.vm 2001/07/23 21:45:53 1.2
@@ -1,26 +1,40 @@
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-<tr>
- <td colspan="2">
- <h2>Customizing $set.Name</h2>
- </td>
-</tr>
-<tr>
- <th>Title</th>
- <th>Actions</th>
-</tr>
-#foreach ( $portlet in $portlets )
-<tr>
- <td>$portlet.Title</td>
- <td align="center">
- <form action="$jlink" method="post">
+<table width="100%" cellspacing="1" cellpadding="0">
+#foreach ($entry in $portlets)
+#set ($position = $velocityCount - 1)
+ <tr>
+#if ($entry.Parent)
+ #set ($title = $titles.get($entry.Parent) )
+#else
+ #set ($title = $entry.Metainfo.Title)
+#end
+ <td valign="top" width="60%">
+ <b>#if ($title) $title #else #if ($entry.Parent) $entry.Parent #else Pane
$!entry.Name #end #end</b>
+ </td>
+ <td valign="top" align="center" width="40%">
+ <form action="$jlink" method="post">
#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
- <input type="hidden" name="paneid" value="$portlets.Name" />
- <input type="hidden" name="position" value="$position" />
- <input type="submit" name="eventSubmit_doDelete" value="Delete" />
- <input type="submit" name="eventSubmit_doDown" value="<--" />
- <input type="submit" name="eventSubmit_doUp" value="-->" />
- </form>
- </td>
-</tr>
+ <input type="hidden" name="position" value="$position" />
+ <input type="image" border="0" alt="Delete" src="images/close.gif"
name="eventSubmit_doDelete" />
+#if ($velocityCount < $portlets.size())
+ <input type="image" border="0" alt="Move down" src="images/down.gif"
name="eventSubmit_doUp" />
+#else
+ <img src="images/dot.gif" width=14" height="14" border="0" />
+#end
+#if ($position > 0)
+ <input type="image" border="0" src="images/up.gif" alt="Move up"
name="eventSubmit_doDown" />
+#else
+ <img src="images/dot.gif" width=14" height="14" border="0" />
#end
+ </form>
+ </td>
+ </tr>
+#end
+ <tr height="50">
+ <td colspan="2" align="right" valign="middle" height="50">
+ <form action="$jlink" method="post">
+#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
+ <input type="submit" name="eventSubmit_doApply" value="Done" />
+ </form>
+ </td>
+ </tr>
</table>
1.2 +2 -1
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn.vm
Index: multicolumn.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multicolumn.vm 2001/07/08 21:01:52 1.1
+++ multicolumn.vm 2001/07/23 21:45:53 1.2
@@ -2,7 +2,8 @@
<tr>
#foreach ( $column in $portlets )
#if ($!sizes.size() >= $velocityCount)
- #set ($width = $!sizes.elementAt($velocityCount-1))
+ #set ($idx = $velocityCount - 1 )
+ #set ($width = $!sizes.elementAt($idx))
#end
<td width="$!width" valign="top">
<table width="100%" cellspacing="2" cellpadding="0" border="0">
1.2 +37 -17
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- row-customize.vm 2001/06/25 11:32:40 1.1
+++ row-customize.vm 2001/07/23 21:45:53 1.2
@@ -1,20 +1,40 @@
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-<tr>
- <td>
- <h2>Customizing $entries.Name</h2>
- </td>
-#foreach ( $set in $entries.Portlets )
- <td>
- Position: $!set.Layout.Position ($velocityCount)
- <br>Title: $!set.Metainfo.Title
- </td>
+<table width="100%" cellspacing="1" cellpadding="0">
+#foreach ($entry in $portlets)
+#set ($position = $velocityCount - 1)
+ <tr>
+#if ($entry.Parent)
+ #set ($title = $titles.get($entry.Parent) )
+#else
+ #set ($title = $entry.Metainfo.Title)
#end
-#foreach ( $entry in $entries.Entry )
- <td>
- Position: $!entry.Layout.Position ($velocityCount)
- <br>Parent: $!entry.Parent
- <br>Title: $!entry.Metainfo.Title
- </td>
+ <td valign="top" width="60%">
+ <b>#if ($title) $title #else #if ($entry.Parent) $entry.Parent #else Pane
$!entry.Name #end #end</b>
+ </td>
+ <td valign="top" align="center" width="40%">
+ <form action="$jlink" method="post">
+#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
+ <input type="hidden" name="position" value="$position" />
+ <input type="image" border="0" alt="Delete" src="images/close.gif"
name="eventSubmit_doDelete" />
+#if ($velocityCount < $portlets.size())
+ <input type="image" border="0" alt="Move down" src="images/down.gif"
name="eventSubmit_doUp" />
+#else
+ <img src="images/dot.gif" width=14" height="14" border="0" />
#end
-</tr>
+#if ($position > 0)
+ <input type="image" border="0" src="images/up.gif" alt="Move up"
name="eventSubmit_doDown" />
+#else
+ <img src="images/dot.gif" width=14" height="14" border="0" />
+#end
+ </form>
+ </td>
+ </tr>
+#end
+ <tr height="50">
+ <td colspan="2" align="right" valign="middle" height="50">
+ <form action="$jlink" method="post">
+#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
+ <input type="submit" name="eventSubmit_doApply" value="Done" />
+ </form>
+ </td>
+ </tr>
</table>
1.2 +3 -3
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm
Index: customizer-portletset-layout.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- customizer-portletset-layout.vm 2001/07/22 20:33:26 1.1
+++ customizer-portletset-layout.vm 2001/07/23 21:45:54 1.2
@@ -8,7 +8,7 @@
Layout :
<select name="controller" onChange="document.controllers.submit()">
#foreach ($controller in $controllers)
- <option #if ($controller.Name == $currentController) SELECTED #end>
+ <option value="$controller.Name" #if ($controller.Name ==
$currentController) SELECTED #end>
#if ($controller.Title) $controller.Title #else $controller.Name #end
#end
</select>
@@ -25,7 +25,7 @@
Decoration :
<select name="control" onChange="document.controls.submit()">
#foreach ($control in $controls)
- <option #if ($control.Name == $currentControl) SELECTED #end>
+ <option value="$control.Name" #if ($control.Name == $currentControl)
SELECTED #end>
#if ($control.Title) $control.Title #else $control.Name #end
#end
</select>
@@ -42,7 +42,7 @@
Colors :
<select name="skin" onChange="document.skins.submit()">
#foreach ($skin in $skins)
- <option #if ($skin.Name == $currentSkin) SELECTED #end>
+ <option value="$skin.Name" #if ($skin.Name == $currentSkin) SELECTED #end>
#if ($skin.Title) $skin.Title #else $skin.Name #end
#end
</select>
1.5 +1 -1
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm
Index: customizer-portletset.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- customizer-portletset.vm 2001/07/22 20:32:47 1.4
+++ customizer-portletset.vm 2001/07/23 21:45:54 1.5
@@ -11,7 +11,7 @@
<a href="$jlink.addPathInfo("mode","addset")">Add pane</a>
|
#end
- <a href="$jlink.addPathInfo("mode","addset")">Properties</a>
+ <a href="$jlink.addPathInfo("mode","general")">Properties</a>
</td>
</tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
