paulsp 01/12/21 19:02:35
Modified: webapp/WEB-INF/templates/vm/controllers/html
card-customize.vm column-customize.vm
row-customize.vm
Log:
o Internationalize customization
o Return look and feel to 1.3a1
o General HTML cleanup
Revision Changes Path
1.6 +64 -30
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- card-customize.vm 2001/12/06 06:03:39 1.5
+++ card-customize.vm 2001/12/22 03:02:35 1.6
@@ -1,5 +1,23 @@
-
-<table width="100%" cellspacing="1" cellpadding="0" border="0">
+<br>
+<center>
+<table width="80%" cellspacing="1" cellpadding="0" border="0">
+ <tr>
+ <th width="5%" #if (${skin.TitleBackgroundColor})
bgcolor="${skin.TitleBackgroundColor}" #end align="left">
+ #if ($skin.TitleColor) <font color="$skin.TitleColor"> #end
+
+ #if ($skin.TitleColor) </font> #end
+ </th>
+ <th #if (${skin.TitleBackgroundColor}) bgcolor="${skin.TitleBackgroundColor}"
#end align="left">
+ #if ($skin.TitleColor) <font color="$skin.TitleColor"> #end
+ $l10n.CUSTOMIZER_NAME
+ #if ($skin.TitleColor) </font> #end
+ </th>
+ <th width="10%" #if (${skin.TitleBackgroundColor})
bgcolor="${skin.TitleBackgroundColor}" #end align="center">
+ #if ($skin.TitleColor) <font color="$skin.TitleColor"> #end
+ $l10n.CUSTOMIZER_ACTION
+ #if ($skin.TitleColor) </font> #end
+ </th>
+ </tr>
#set ($portletcount = 0)
#set ($COUNTI="0")
#foreach ($entry in $portlets)
@@ -28,56 +46,72 @@
#foreach ($entr in $runs)
#if ($entr.parent == $entry.Parent)
#set ($FF=true)
- <img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="Portlet" hspace="2" /></TD>
+ <img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="Portlet" hspace="2"></TD>
#end
#end
## Portlet is not used - use blank image!
#if (!$FF)
#set ($portletcount = $portletcount + 1)
- <a href="$link.setAction("controls.Customize")?portlet=$portletcount"><img
src="images/is_pane.gif" alt="Pane, click for customization" width=14" height="14"
border="0" hspace="2" /></a></TD>
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount">
+ <img src="images/is_pane.gif" alt="$l10n.CUSTOMIZER_CUSTOMIZABLEPANE"
width=14" height="14" border="0" hspace="2" >
+ </a></TD>
#end
- <td valign="top" width="60%">
+ <td valign="top">
#if (!$FF)
- <a
href="$link.setAction("controls.Customize")?portlet=$portletcount"><b>$title</b></a>
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount">
+ <b>$title</b>
+ </a>
#else
<b>$title</b>
#end
</td>
- <td valign="top" align="center" width="40%">
+ <td valign="top" align="center">
<form action="$jlink" method="post">
-#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
+#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" />
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <img src="images/dot.gif" width=14" height="14" border="0">
#end
</form>
</td>
</tr>
#end
-#if ($!COUNTI="0")
- <tr><td colspan=3>No entries!<br/><br/></td></tr>
-#end
- <tr>
- <td colspan="3" align="right" valign="middle">
- <form action="$jlink" method="post">
- <table cellpadding="3" cellspacing="1" border="0" width="100%" class=MENUBAR>
- <tr><td align="right">
- #if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action"
class="BUTON"/> #end
- <input type="submit" name="eventSubmit_doApply" value="Apply"
class="BUTON"/>
- <input type="submit" name="eventSubmit_doCancel" value="Cancel"
class="BUTON"/>
- </td></tr>
- </table>
- </form>
- </td>
- </tr>
-</table>
\ No newline at end of file
+#if ($!COUNTI=="0")
+ <tr>
+ <td align="center" colspan="3">
+ <b>$l10n.CUSTOMIZER_NOTHINGDEFINED</b>
+ </td>
+ </tr>
+#end
+ </table>
+ <table cellspacing="2">
+ <tr>
+ <td>
+ <form action="$jlink" method="post">
+ #if ($!action) <input type="hidden" name="$jlink.ActionKey"
value="$action" > #end
+ <table cellspacing="2">
+ <tr>
+ <td>
+ <input type="submit" name="eventSubmit_doApply"
value="$l10n.CUSTOMIZER_APPLY">
+ </td>
+ <td>
+ <input type="submit" name="eventSubmit_doCancel"
value="$l10n.CUSTOMIZER_CANCEL">
+ </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
+ </table>
+</center>
+
1.4 +114 -78
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- column-customize.vm 2001/12/06 06:03:39 1.3
+++ column-customize.vm 2001/12/22 03:02:35 1.4
@@ -1,81 +1,117 @@
-<table width="100%" cellspacing="1" cellpadding="0" border="0">
-#set ($portletcount = 0)
-#set ($COUNTI="0")
-#foreach ($entry in $portlets)
-#set ($COUNTI="1")
-#set ($position = $velocityCount - 1)
+<br>
+<center>
+<table width="80%" cellspacing="1" cellpadding="0" border="0">
<tr>
- <td align="center" valign="top">
-##
-#set ($title="*")
-#if ($entry.Parent)
- #set ($title = $titles.get($entry.Parent) )
-#else
- #set ($title = $entry.Metainfo.Title)
-#end
-##
-#if ($title=="*")
- #if ($entry.Parent)
- #set ($title=$entry.Parent)
- #else
- #set ($title=$entry.Name)
- #end
-#end
- ## Insert a image for portlets and panes!
- #set ($FF=false)
- #foreach ($entr in $runs)
- #if ($entr.parent == $entry.Parent)
- #set ($FF=true)
- <img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="Portlet" hspace="2" /></TD>
- #end
- #end
+ <th width="5%" #if (${skin.TitleBackgroundColor})
bgcolor="${skin.TitleBackgroundColor}" #end align="left">
+ #if ($skin.TitleColor) <font color="$skin.TitleColor"> #end
+
+ #if ($skin.TitleColor) </font> #end
+ </th>
+ <th #if (${skin.TitleBackgroundColor}) bgcolor="${skin.TitleBackgroundColor}"
#end align="left">
+ #if ($skin.TitleColor) <font color="$skin.TitleColor"> #end
+ $l10n.CUSTOMIZER_NAME
+ #if ($skin.TitleColor) </font> #end
+ </th>
+ <th width="10%" #if (${skin.TitleBackgroundColor})
bgcolor="${skin.TitleBackgroundColor}" #end align="center">
+ #if ($skin.TitleColor) <font color="$skin.TitleColor"> #end
+ $l10n.CUSTOMIZER_ACTION
+ #if ($skin.TitleColor) </font> #end
+ </th>
+ </tr>
+ #set ($portletcount = 0)
+ #set ($COUNTI="0")
+ #foreach ($entry in $portlets)
+ #set ($COUNTI="1")
+ #set ($position = $velocityCount - 1)
+ <tr>
+ <td align="center" valign="top">
+ ##
+ #set ($title="*")
+ #if ($entry.Parent)
+ #set ($title = $titles.get($entry.Parent) )
+ #else
+ #set ($title = $entry.Metainfo.Title)
+ #end
+ ##
+ #if ($title=="*")
+ #if ($entry.Parent)
+ #set ($title=$entry.Parent)
+ #else
+ #set ($title=$entry.Name)
+ #end
+ #end
+ ## Insert a image for portlets and panes!
+ #set ($FF=false)
+ #foreach ($entr in $runs)
+ #if ($entr.parent == $entry.Parent)
+ #set ($FF=true)
+ <img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="$l10n.CUSTOMIZER_PORTLET" hspace="2">
+ </td>
+ #end
+ #end
- ## Portlet is not used - use the pane image!
- #if (!$FF)
- #set ($portletcount = $portletcount + 1)
- <a href="$link.setAction("controls.Customize")?portlet=$portletcount"><img
src="images/is_pane.gif" alt="Pane, click for customization" width=14" height="14"
border="0" hspace="2" /></a></TD>
- #end
+ ## Portlet is not used - use the pane image!
+ #if (!$FF)
+ #set ($portletcount = $portletcount + 1)
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount">
+ <img src="images/is_pane.gif" alt="$l10n.CUSTOMIZER_CUSTOMIZABLEPANE"
width=14" height="14" border="0" hspace="2">
+ </a>
+ </td>
+ #end
- <td valign="top" width="60%">
- #if (!$FF)
- <a
href="$link.setAction("controls.Customize")?portlet=$portletcount"><b>$title</b></a>
- #else
- <b>$title</b>
- #end
- </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
-#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
-#if ($!COUNTI="0")
- <tr><td colspan=3>No entries!<br/><br/></td></tr>
-#end
- <tr>
- <td colspan="3" align="right" valign="middle">
- <form action="$jlink" method="post">
- <table cellpadding="3" cellspacing="1" border="0" width="100%" class=MENUBAR>
- <tr><td align="right">
- #if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action"
class="BUTON"/> #end
- <input type="submit" name="eventSubmit_doApply" value="Apply"
class="BUTON"/>
- <input type="submit" name="eventSubmit_doCancel" value="Cancel"
class="BUTON"/>
- </td></tr>
- </table>
- </form>
- </td>
- </tr>
-</table>
\ No newline at end of file
+ <td valign="top">
+ #if (!$FF)
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount">
+ <b>$title</b>
+ </a>
+ #else
+ <b>$title</b>
+ #end
+ </td>
+ <td valign="top" align="center" >
+ <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="$l10n.CUSTOMIZER_DELETE"
src="images/close.gif" name="eventSubmit_doDelete">
+ #if ($velocityCount < $portlets.size())
+ <input type="image" border="0" alt="$l10n.CUSTOMIZER_MOVEDOWN"
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" alt="$l10n.CUSTOMIZER_MOVEUP"
src="images/up.gif" name="eventSubmit_doDown">
+ #else
+ <img src="images/dot.gif" width=14" height="14" border="0">
+ #end
+ </form>
+ </td>
+ </tr>
+#end
+#if ($!COUNTI=="0")
+ <tr>
+ <td align="center" colspan="3">
+ <b>$l10n.CUSTOMIZER_NOTHINGDEFINED</b>
+ </td>
+ </tr>
+#end
+ </table>
+ <table cellspacing="2">
+ <tr>
+ <td>
+ <form action="$jlink" method="post">
+ #if ($!action) <input type="hidden" name="$jlink.ActionKey"
value="$action" > #end
+ <table cellspacing="2">
+ <tr>
+ <td>
+ <input type="submit" name="eventSubmit_doApply"
value="$l10n.CUSTOMIZER_APPLY">
+ </td>
+ <td>
+ <input type="submit" name="eventSubmit_doCancel"
value="$l10n.CUSTOMIZER_CANCEL">
+ </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
+ </table>
+</center>
1.4 +64 -31
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- row-customize.vm 2001/12/06 06:03:39 1.3
+++ row-customize.vm 2001/12/22 03:02:35 1.4
@@ -1,4 +1,23 @@
-<table width="100%" cellspacing="1" cellpadding="0">
+<br>
+<center>
+<table width="80%" cellspacing="1" cellpadding="0" border="0">
+ <tr>
+ <th width="5%" #if (${skin.TitleBackgroundColor})
bgcolor="${skin.TitleBackgroundColor}" #end align="left">
+ #if ($skin.TitleColor) <font color="$skin.TitleColor"> #end
+
+ #if ($skin.TitleColor) </font> #end
+ </th>
+ <th #if (${skin.TitleBackgroundColor}) bgcolor="${skin.TitleBackgroundColor}"
#end align="left">
+ #if ($skin.TitleColor) <font color="$skin.TitleColor"> #end
+ $l10n.CUSTOMIZER_NAME
+ #if ($skin.TitleColor) </font> #end
+ </th>
+ <th width="10%" #if (${skin.TitleBackgroundColor})
bgcolor="${skin.TitleBackgroundColor}" #end align="center">
+ #if ($skin.TitleColor) <font color="$skin.TitleColor"> #end
+ $l10n.CUSTOMIZER_ACTION
+ #if ($skin.TitleColor) </font> #end
+ </th>
+ </tr>
#set ($portletcount = 0)
#set ($COUNTI="0")
#foreach ($entry in $portlets)
@@ -28,57 +47,71 @@
#foreach ($entr in $runs)
#if ($entr.parent == $entry.Parent)
#set ($FF=true)
- <img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="Portlet" hspace="2" /></TD>
+ <img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="$l10n.CUSTOMIZER_PORTLET" hspace="2"></TD>
#end
#end
## Portlet is not used - use blank image!
#if (!$FF)
#set ($portletcount = $portletcount + 1)
- <a href="$link.setAction("controls.Customize")?portlet=$portletcount"><img
src="images/is_pane.gif" alt="Pane, click for customization" width=14" height="14"
border="0" hspace="2" /></a></TD>
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount">
+ <img src="images/is_pane.gif" alt="$l10n.CUSTOMIZER_CUSTOMIZABLEPANE"
width=14" height="14" border="0" hspace="2">
+ </a></TD>
#end
- <td valign="top" width="60%">
+ <td valign="top">
#if (!$FF)
- <a
href="$link.setAction("controls.Customize")?portlet=$portletcount"><b>$title</b></a>
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount">
+ <b>$title</b>
+ </a>
#else
<b>$title</b>
#end
</td>
- <td valign="top" align="center" width="40%">
+ <td valign="top" align="center">
<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 ($!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" />
+ <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" />
+ <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" />
+ <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" />
+ <img src="images/dot.gif" width=14" height="14" border="0">
#end
</form>
</td>
</tr>
-#end
-#if ($!COUNTI="0")
- <tr><td colspan=3>No entries!<br/><br/></td></tr>
#end
- <tr>
- <td colspan="3" align="right" valign="middle">
-
- <form action="$jlink" method="post">
- <table cellpadding="3" cellspacing="1" border="0" width="100%" class=MENUBAR>
- <tr><td align="right">
- #if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action"
class="BUTON"/> #end
- <input type="submit" name="eventSubmit_doApply" value="Apply"
class="BUTON"/>
- <input type="submit" name="eventSubmit_doCancel" value="Cancel"
class="BUTON"/>
- </td></tr>
- </table>
- </form>
- </td>
- </tr>
-</table>
\ No newline at end of file
+#if ($!COUNTI=="0")
+ <tr>
+ <td align="center" colspan="3">
+ <b>$l10n.CUSTOMIZER_NOTHINGDEFINED</b>
+ </td>
+ </tr>
+#end
+ </table>
+ <table cellspacing="2">
+ <tr>
+ <td>
+ <form action="$jlink" method="post">
+ #if ($!action) <input type="hidden" name="$jlink.ActionKey"
value="$action" > #end
+ <table cellspacing="2">
+ <tr>
+ <td>
+ <input type="submit" name="eventSubmit_doApply"
value="$l10n.CUSTOMIZER_APPLY">
+ </td>
+ <td>
+ <input type="submit" name="eventSubmit_doCancel"
value="$l10n.CUSTOMIZER_CANCEL">
+ </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
+ </table>
+</center>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
