portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns layout.vm
Date Sun, 14 Mar 2004 00:01:46 GMT
weaver      2004/03/13 16:01:46

  Modified:    portal/src/webapp/WEB-INF/templates/layout/html/columns
                        layout.vm
  Log:
  layout.vm now handles decorator correctly
  
  Revision  Changes    Path
  1.2       +6 -5      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- layout.vm	13 Jan 2004 17:40:56 -0000	1.1
  +++ layout.vm	14 Mar 2004 00:01:46 -0000	1.2
  @@ -12,14 +12,15 @@
     #end
   
     #if ($decorator)
  -        #set($decoTop = "${decorator}-top.vm")
  -        #set($decoBottom = "${decorator}-bottom.vm")
  +        #set($decoTop = "${decorator}/decorator-top.vm")
  +        #set($decoBottom = "${decorator}/decorator-bottom.vm")
     #end
   
  -<!-- Decorator  $decorator  ${decoTop}.vm-${decoBottom}.vm-->
  +<!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
  +
   
     #if (($decoTop) && ($myFragment == $myPage.getRootFragment()))
  -      #parse($jetspeed.getTemplate($decoTop).appRelativePath)
  +      #parse($jetspeed.getDecoration($decoTop, "layout").appRelativePath)
     #end
   
   <table width="100%" cellspacing="0" cellpadding="0">
  @@ -41,5 +42,5 @@
   </table>
   
   #if (($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
  -   #parse($jetspeed.getTemplate($decoBottom).appRelativePath)
  +   #parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath)
   #end
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message