raphael 01/07/11 02:36:06
Modified: webapp/WEB-INF/templates/vm/controllers/html
multicolumn-customize.vm
webapp/WEB-INF/templates/vm/portlets/html
customizer-portletset.vm
Log:
- improve portlet set customizer appearance
- fix some customizer state issues
Revision Changes Path
1.2 +17 -15
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multicolumn-customize.vm 2001/07/08 21:01:52 1.1
+++ multicolumn-customize.vm 2001/07/11 09:36:04 1.2
@@ -1,10 +1,10 @@
<table border="0" cellpadding="2" cellspacing="0" width="100%">
<tr>
#set ($col = 0)
-#set ($width = 100 / $portlets.length )
+#set ($width = 100 / $colNum )
#foreach ( $column in $portlets )
#set ($row = 0)
- <td valign="top" width="$width%">
+ <td valign="top" width="${width}%">
<table width="100%" cellspacing="2" cellpadding="0" border="0">
#foreach ( $portlet in $column )
<tr>
@@ -13,26 +13,28 @@
#if ($action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
<input type="hidden" name="col" value="$col" />
<input type="hidden" name="row" value="$row" />
- <table border="1" width="95%">
- <tr>
- <td>
- <input type="submit" name="eventSubmit_doDelete" value="x" />
+ <table width="95%" cellpadding="1" cellspacing="0"
bgcolor="$!{skin.TitleBackgroundColor}">
+ <tr><td width="100%">
+ <table width="100%" cellspacing="0" cellpadding="0"
bgcolor="$!{skin.TitleBackgroundColor}">
+ <tr bgcolor="$!{skin.TitleBackgroundColor}">
+ <td bgcolor="$!{skin.TitleBackgroundColor}" valign="top" >
+ <input type="image" src="images/close.gif" border="0"
name="eventSubmit_doDelete" />
+ <input type="image" src="images/left.gif" border="0"
name="eventSubmit_doLeft" />
+ <input type="image" src="images/up.gif" border="0"
name="eventSubmit_doUp" />
+ <input type="image" src="images/down.gif" border="0"
name="eventSubmit_doDown" />
+ <input type="image" src="images/right.gif" border="0"
name="eventSubmit_doRight" />
</td>
- <td align="right">
- <input type="submit" name="eventSubmit_doLeft" value="<" />
- <input type="submit" name="eventSubmit_doUp" value="^" />
- <input type="submit" name="eventSubmit_doDown" value="v" />
- <input type="submit" name="eventSubmit_doRight" value=">" />
- </td>
</tr>
#set ($title = $titles.get($portlet.Parent) )
- <tr>
- <td valign="middle" align="center" colspan="2">
- <a
href="$jlink.setAction("actions.Customize").setPortlet($!portlet.Parent)">
+ <tr height="50">
+ <td height="50" valign="middle" bgcolor="$!{skin.BackgroundColor}"
align="center">
+ <a
href="$jlink.setAction("controls.Customize").setPortlet($!portlet.Parent)">
<b>#if ($title) $title #else $portlet.Parent #end</b>
</a>
</td>
</tr>
+ </table>
+ </td></tr>
</table>
</form>
</td>
1.3 +33 -13
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- customizer-portletset.vm 2001/07/08 21:01:55 1.2
+++ customizer-portletset.vm 2001/07/11 09:36:05 1.3
@@ -21,27 +21,43 @@
$!set.Controller.getContent($data)
#end
#if ( $tab == "add" )
+#set ($start = $data.Parameters.getInt("start",0))
+#set ($size = 15)
#if ($browser)
<form action="$jlink" method="post">
#if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action" /> #end
-<table width="100%" cellspacing="1" cellpadding="0">
+<table width="80%" cellspacing="1" cellpadding="0" align="center">
<tr>
- <td></td>
- <td align="left"><b>Title</b></td>
- <td align="left"><b>Description</b></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}" align="left"><font
color="$!{skin.TitleColor}">Select ?</font></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}" align="left"><font
color="$!{skin.TitleColor}"><b>Title</b></font></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}" align="left"><font
color="$!{skin.TitleColor}"><b>Description</b></font></td>
</tr>
#foreach ($portlet in $browser)
+#if ( ($velocityCount > $start) && ( $velocityCount <= $start + $size ))
<tr>
- <td><input type="radio" name="pname" value="$portlet.Name" /></td>
- <td valign="top" align="left">$!portlet.Title</td>
- <td valign="top" align="left">$!portlet.Description</td>
- </tr>
+ <td><input type="checkbox" name="pname" value="$portlet.Name" /></td>
+ <td valign="top" align="left">
+#if ($portlet.Title) $portlet.Title #else $portlet.Name #end
+ </td>
+ <td valign="top" align="left">
+#if ($portlet.Description) $portlet.Description #else Unavailable #end
+ </td>
+ </tr>
+#end
#end
</table>
-<table width="100%" cellspacing="1" cellpadding="0">
+<table width="80%" align="center" cellspacing="1" cellpadding="0">
<tr>
+ <td align="center">
+#if ($velocityCount > $start)
+ <input type="submit" name="eventSubmit_doAdd" value="Prev" />
+#end
+#if ($velocityCount > $start + $size)
+ <input type="submit" name="eventSubmit_doAdd" value="Next" />
+#end
+ </td>
<td align="right">
- <input type="submit" name="eventSubmit_doAdd" name="Add" />
+ <input type="submit" name="eventSubmit_doAdd" value="Add" />
</td>
</tr>
</table>
@@ -59,7 +75,7 @@
</tr>
<tr>
<td align="right">
- <input type="submit" name="eventSubmit_doAddset" name="Add" />
+ <input type="submit" name="eventSubmit_doAddset" value="Add" />
</td>
</tr>
</table>
@@ -70,6 +86,7 @@
<form action="$jlink" method="post">
#if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action" /> #end
<table width="100%" cellspacing="0" cellpadding="0">
+ <tr height="15"><td height="15"> </td></tr>
<tr>
<td>
Set a title for this pane :<br />
@@ -77,6 +94,7 @@
</td>
</tr>
#if ($controllers)
+ <tr height="15"><td height="15"> </td></tr>
<tr>
<td>
Select a layout for this pane :<br />
@@ -90,6 +108,7 @@
</tr>
#end
#if ($controls)
+ <tr height="15"><td height="15"> </td></tr>
<tr>
<td>
Select a decoration for this pane :<br />
@@ -103,6 +122,7 @@
</tr>
#end
#if ($skins)
+ <tr height="15"><td height="15"> </td></tr>
<tr>
<td>
Select a color scheme for this pane :<br />
@@ -115,8 +135,8 @@
</td>
</tr>
#end
- <tr>
- <td align="right">
+ <tr height="50">
+ <td valign="middle" align="right" height="50">
<input type="submit" name="eventSubmit_doSave" value="Save" />
<input type="submit" name="eventSubmit_doApply" value="Save & Apply" />
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
