You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2005/12/18 07:00:30 UTC

svn commit: r357446 - in /portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1: src/webapp/WEB-INF/templates/layout/html/columns/ src/webapp/WEB-INF/templates/layout/html/tcolumns/ src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/ src/webapp/WEB-IN...

Author: rwatler
Date: Sat Dec 17 22:00:25 2005
New Revision: 357446

URL: http://svn.apache.org/viewcvs?rev=357446&view=rev
Log:
more decorator rot: fix contributed by 'cubehead'

Modified:
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm
    portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/xdocs/guides/guide-jpt.xml

Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm?rev=357446&r1=357445&r2=357446&view=diff
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm?rev=357446&r1=357445&r2=357446&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm Sat Dec 17 22:00:25 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/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm?rev=357446&r1=357445&r2=357446&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm Sat Dec 17 22:00:25 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/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm?rev=357446&r1=357445&r2=357446&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm Sat Dec 17 22:00:25 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/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm?rev=357446&r1=357445&r2=357446&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm Sat Dec 17 22:00:25 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/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm?rev=357446&r1=357445&r2=357446&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/html/ja/decorator-top.vm Sat Dec 17 22:00:25 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/branches/JETSPEED-BRANCH-2.0.1/xdocs/guides/guide-jpt.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/xdocs/guides/guide-jpt.xml?rev=357446&r1=357445&r2=357446&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/xdocs/guides/guide-jpt.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/xdocs/guides/guide-jpt.xml Sat Dec 17 22:00:25 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: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org