portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/maximized layout.vm
Date Sat, 08 May 2004 02:13:46 GMT
taylor      2004/05/07 19:13:46

  Modified:    portal/src/webapp/WEB-INF/templates/layout/html/maximized
                        layout.vm
  Log:
  fixed bug in maximize state where the portal header/footers were dropping out
  
  PR:
  Obtained from:
  Submitted by:	
  Reviewed by:	
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.3       +16 -11    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
  
  Index: layout.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- layout.vm	8 May 2004 01:29:11 -0000	1.2
  +++ layout.vm	8 May 2004 02:13:46 -0000	1.3
  @@ -20,21 +20,26 @@
   
   #set($myFragment = $jetspeed.currentFragment)
   
  +#set($myLayout = $jetspeed.currentLayout)
  +
   #set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
  +#set($ldecorator = $myPage.getDefaultDecorator("layout"))  
   
  -  
  - #if($myFragment.getDecorator())
  -        #set($decorator = $myFragment.getDecorator())
  -  #end
  -
  -  #if ($decorator)
  -        #set($decoTop = "${decorator}/decorator-top.vm")
  -        #set($decoBottom = "${decorator}/decorator-bottom.vm")
  -  #end
  +#if($myFragment.getDecorator())
  +    #set($decorator = $myFragment.getDecorator())
  +#end
  +
  +#if($myLayout.getDecorator())
  +        #set($ldecorator = $myLayout.getDecorator())
  +#end
  +
  +#if ($ldecorator)
  +   #set($decoTop = "${ldecorator}/decorator-top.vm")
  +   #set($decoBottom = "${ldecorator}/decorator-bottom.vm")
  +#end
   
   <!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
   
  -
     #if ($decoTop)
         #parse($jetspeed.getDecoration($decoTop, "layout").appRelativePath)
     #end
  @@ -48,6 +53,6 @@
     </tr>
   </table>
   
  -#if (($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
  +#if ($decoBottom)
      #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