weaver 2005/01/04 08:32:27
Modified: portal/src/webapp/WEB-INF/templates/layout/html/columns
layout.vm
Log:
see: http://issues.apache.org/jira/browse/JS2-183
Revision Changes Path
1.16 +14 -4
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Index: layout.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- layout.vm 15 Sep 2004 20:35:09 -0000 1.15
+++ layout.vm 4 Jan 2005 16:32:26 -0000 1.16
@@ -77,7 +77,7 @@
<table width="100%" class="portal-layout-column">
#foreach($f in $entry)
<tr>
- <td width="100%">
+ <td width="100%">
#set($row = $f.getPropertyValue($layoutType, "row"))
#set($col = $f.getPropertyValue($layoutType, "column"))
#set($temp = 0) ##create temp Integer to parse strings
@@ -139,14 +139,24 @@
</div>
#end
## get the decorated Portlet content
- $jetspeed.decorateAndInclude($f)
+ #if($f.type == "portlet")
+ #parse($jetspeed.decorateAndInclude($f))
+ #else
+ $jetspeed.setCurrentFragment($f)
+ $f.renderedContent
+ #end
+
+ ##$jetspeed.decorateAndInclude($f)
+
#if($editing)
</div>
</div>
- #end
+ #end
+
</td>
</tr>
- #end
+ #end
+
</table>
</td>
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
