Author: rwatler
Date: Sat Dec 17 22:00:47 2005
New Revision: 357447
URL: http://svn.apache.org/viewcvs?rev=357447&view=rev
Log:
more decorator rot: fix contributed by 'cubehead'
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm
portals/jetspeed-2/trunk/xdocs/guides/guide-jpt.xml
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm?rev=357447&r1=357446&r2=357447&view=diff
==============================================================================
Binary files - no diff available.
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm?rev=357447&r1=357446&r2=357447&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
Sat Dec 17 22:00:47 2005
@@ -35,8 +35,8 @@
#end
#if ($decorator)
- #set($decoTop = "${decorator}/decorator-top.vm")
- #set($decoBottom = "${decorator}/decorator-bottom.vm")
+ #set($decoTop = "${decorator}/header.vm")
+ #set($decoBottom = "${decorator}/footer.vm")
#end
<!-- Decorator $decorator ${decoTop} - ${decoBottom}-->
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm?rev=357447&r1=357446&r2=357447&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
Sat Dec 17 22:00:47 2005
@@ -19,8 +19,8 @@
#set($decorator = $myFragment.getDecorator())
#end
#if ($decorator)
-#set($decoTop = "${decorator}/decorator-top.vm")
-#set($decoBottom = "${decorator}/decorator-bottom.vm")
+#set($decoTop = "${decorator}/header.vm")
+#set($decoBottom = "${decorator}/footer.vm")
#end
## Decorator $decorator ${decoTop} - ${decoBottom}
#if (($decoTop) && ($myFragment == $myPage.getRootFragment()))
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm?rev=357447&r1=357446&r2=357447&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
Sat Dec 17 22:00:47 2005
@@ -24,8 +24,8 @@
#set($ldecorator = $myLayout.getDecorator())
#end
#if($ldecorator)
-#set($decoTop = "${ldecorator}/decorator-top.vm")
-#set($decoBottom = "${ldecorator}/decorator-bottom.vm")
+#set($decoTop = "${ldecorator}/header.vm")
+#set($decoBottom = "${ldecorator}/footer.vm")
#end
## Decorator $decorator ${decoTop} - ${decoBottom}
#if($decoTop)
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm?rev=357447&r1=357446&r2=357447&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
Sat Dec 17 22:00:47 2005
@@ -68,7 +68,7 @@
#includeHeaderResource()
<title>#PageTitle()</title>
- <meta name="version" content="/* $Id: decorator-top.vm 239262 2005-08-22
22:23:39Z shinsuke $" />
+ <meta name="version" content="/* $Id$" />
<meta name="keywords" content="" />
<meta name="description" content="#PageDescription()" />
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm?rev=357447&r1=357446&r2=357447&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm
Sat Dec 17 22:00:47 2005
@@ -31,7 +31,7 @@
#includeHeaderResource()
<title>$jetspeed.page.getTitle($preferedLocale)</title>
- <meta name="version" content="/* $Id: decorator-top.vm 239262 2005-08-22
22:23:39Z shinsuke $" />
+ <meta name="version" content="/* $Id$" />
<meta name="keywords" content="" />
<meta name="description"
content="$jetspeed.page.getTitle($preferedLocale)" />
</head>
Modified: portals/jetspeed-2/trunk/xdocs/guides/guide-jpt.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-jpt.xml?rev=357447&r1=357446&r2=357447&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-jpt.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-jpt.xml Sat Dec 17 22:00:47 2005
@@ -75,7 +75,7 @@
</tr>
<tr>
<td>Examples</td>
-
<td>#parse($jetspeed.decorateAndInclude($fragment))<br/>returns<br/>/WEB-INF/decorations/layout/html/tigris/decorator-top.vm</td>
+
<td>#parse($jetspeed.decorateAndInclude($fragment))<br/>returns<br/>/WEB-INF/decorations/layout/html/tigris/header.vm</td>
</tr>
</table>
<hr/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
