Index: RowColumnControllerAction.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java,v
retrieving revision 1.19
diff -u -r1.19 RowColumnControllerAction.java
--- RowColumnControllerAction.java	23 Jul 2003 19:50:11 -0000	1.19
+++ RowColumnControllerAction.java	27 Aug 2003 07:01:54 -0000
@@ -275,7 +275,8 @@
                 Entry entry = (Entry)obj;
                 if ((entry.getMetaInfo()!=null)&&(entry.getMetaInfo().getTitle()!=null))
                 {
-                    titles.put(entry.getParent(),entry.getMetaInfo().getTitle());
+                   // titles.put(entry.getParent(),entry.getMetaInfo().getTitle());
+				   titles.put(entry.getId(), entry.getMetaInfo().getTitle());
                 }
                 else
                 {
@@ -283,7 +284,8 @@
 
                     if (pentry!=null)
                     {
-                        titles.put(entry.getParent(), pentry.getTitle());
+                        //titles.put(entry.getParent(), pentry.getTitle());
+						titles.put(entry.getId(), pentry.getTitle());
                     }
                 }
             }

Index: card-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm,v
retrieving revision 1.14
diff -u -r1.14 card-customize.vm
--- card-customize.vm	27 May 2003 23:58:41 -0000	1.14
+++ card-customize.vm	27 Aug 2003 07:01:07 -0000
@@ -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
Index: column-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm,v
retrieving revision 1.12
diff -u -r1.12 column-customize.vm
--- column-customize.vm	27 May 2003 23:58:41 -0000	1.12
+++ column-customize.vm	27 Aug 2003 07:01:08 -0000
@@ -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>
Index: flow-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm,v
retrieving revision 1.6
diff -u -r1.6 flow-customize.vm
--- flow-customize.vm	27 May 2003 23:58:42 -0000	1.6
+++ flow-customize.vm	27 Aug 2003 07:01:08 -0000
@@ -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>
Index: row-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm,v
retrieving revision 1.11
diff -u -r1.11 row-customize.vm
--- row-customize.vm	27 May 2003 23:58:42 -0000	1.11
+++ row-customize.vm	27 Aug 2003 07:01:08 -0000
@@ -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