jford 2003/09/08 09:17:27
Modified: webapp/WEB-INF/templates/vm/controllers/html
row-customize.vm flow-customize.vm
card-customize.vm column-customize.vm
Log:
Patch from Roshan to row/column controller to put titles into map by id instead of
name
PR: Bugzilla #22712
Submitted by: Roshan
Revision Changes Path
1.12 +4 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- row-customize.vm 27 May 2003 23:58:42 -0000 1.11
+++ row-customize.vm 8 Sep 2003 16:17:27 -0000 1.12
@@ -31,7 +31,7 @@
## Retrieve Entrytitle (-name)
#set ($title="*")
#if ($entry.Parent)
- #set ($title = $titles.get($entry.Parent) )
+ #set ($title = $titles.get($entry.Id) )
#else
#set ($title = $entry.MetaInfo.Title)
#end
@@ -47,9 +47,9 @@
## Insert a image for portlets and panes!
#set ($FF=false)
#foreach ($entr in $runs)
- #if ($entr.parent == $entry.Parent)
+ #if ($entr.parent == $entry.Parent && !$FF)
#set ($FF=true)
- <img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="$l10n.CUSTOMIZER_PORTLET" hspace="2"></TD>
+ <img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="$l10n.CUSTOMIZER_PORTLET" hspace="2">
#end
#end
1.7 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm
Index: flow-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- flow-customize.vm 27 May 2003 23:58:42 -0000 1.6
+++ flow-customize.vm 8 Sep 2003 16:17:27 -0000 1.7
@@ -29,7 +29,7 @@
##
#set ($title="*")
#if ($entry.Parent)
- #set ($title = $titles.get($entry.Parent) )
+ #set ($title = $titles.get($entry.Id) )
#else
#set ($title = $entry.MetaInfo.Title)
#end
@@ -44,7 +44,7 @@
## Insert a image for portlets and panes!
#set ($FF=false)
#foreach ($entr in $runs)
- #if ($entr.parent == $entry.Parent)
+ #if ($entr.parent == $entry.Parent && !$FF)
#set ($FF=true)
<img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="$l10n.CUSTOMIZER_PORTLET" hspace="2">
</td>
1.15 +3 -3
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- card-customize.vm 27 May 2003 23:58:41 -0000 1.14
+++ card-customize.vm 8 Sep 2003 16:17:27 -0000 1.15
@@ -31,7 +31,7 @@
## Retrieve Entrytitle (-name)
#set ($title="*")
#if ($entry.Parent)
- #set ($title = $titles.get($entry.Parent) )
+ #set ($title = $titles.get($entry.Id) )
#else
#set ($title = $entry.MetaInfo.Title)
#end
@@ -46,7 +46,7 @@
## Insert a image for portlets and panes!
#set ($FF=false)
#foreach ($entr in $runs)
- #if ($entr.parent == $entry.Parent)
+ #if ($entr.parent == $entry.Parent && !$FF)
#set ($FF=true)
<img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="Portlet" hspace="2"></TD>
#end
1.13 +4 -4
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- column-customize.vm 27 May 2003 23:58:41 -0000 1.12
+++ column-customize.vm 8 Sep 2003 16:17:27 -0000 1.13
@@ -30,7 +30,7 @@
##
#set ($title="*")
#if ($entry.Parent)
- #set ($title = $titles.get($entry.Parent) )
+ #set ($title = $titles.get($entry.Id) )
#else
#set ($title = $entry.MetaInfo.Title)
#end
@@ -44,8 +44,8 @@
#end
## Insert a image for portlets and panes!
#set ($FF=false)
- #foreach ($entr in $runs)
- #if ($entr.parent == $entry.Parent)
+ #foreach ($entr in $runs )
+ #if ($entr.parent == $entry.Parent && !$FF)
#set ($FF=true)
<img src="images/html/is_portlet.gif" width=14" height="14" border="0"
alt="$l10n.CUSTOMIZER_PORTLET" hspace="2">
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
