Author: weaver
Date: Tue Dec 6 13:29:50 2005
New Revision: 354571
URL: http://svn.apache.org/viewcvs?rev=354571&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-398:
- Adjust accordingly for new Decoration API.
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=354571&r1=354570&r2=354571&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Tue Dec 6 13:29:50 2005
@@ -14,6 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*#
+#set($theme = $request.getAttribute("org.apache.jetspeed.theme"))
#set($sizes = $jetspeed.columnSizes)
@@ -23,7 +24,7 @@
#set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
-#set($actions = $jetspeed.PageDecoratorActions)
+#set($actions = $myFragment.decoration.actions)
#if($jetspeed.portletMode.toString() == "edit")
#set($editing = true)
@@ -32,19 +33,10 @@
#if($myFragment.getDecorator())
#set($decorator = $myFragment.getDecorator())
- #end
-
- #if ($decorator)
- #set($decoTop = "${decorator}/decorator-top.vm")
- #set($decoBottom = "${decorator}/decorator-bottom.vm")
- #end
-
+ #end
+
<!-- Decorator $decorator ${decoTop} - ${decoBottom}-->
-
-
- #if (($decoTop) && ($myFragment == $myPage.getRootFragment()))
- #parse($jetspeed.getDecoration($decoTop, "layout").appRelativePath)
- #end
+#parse($myFragment.decoration.header)
#set($layoutType =$portletConfig.getInitParameter("layoutType"))
#set($columnLayout = $renderRequest.getAttribute("columnLayout"))
@@ -162,7 +154,7 @@
#end
#if($f.type == "portlet")
- #parse($jetspeed.decorateAndInclude($f))
+ #parse($f.decoration.template)
#else
$jetspeed.setCurrentFragment($f)
$f.renderedContent
@@ -174,8 +166,8 @@
#end
</div>
- #if (($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
- #parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath)
+ #if ($myFragment == $myPage.getRootFragment())
+ #parse($myFragment.decoration.footer)
#end
<form name='portletform' action="$renderResponse.createActionURL()"
method="post">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
