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/decorations/layout/html/jetspeed decorator-top.vm
Date Fri, 17 Sep 2004 20:26:54 GMT
taylor      2004/09/17 13:26:54

  Modified:    portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed
                        decorator-top.vm
  Log:
  Merge on decorator top from Randy Watler
  
  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.17      +10 -18    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm
  
  Index: decorator-top.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- decorator-top.vm	17 Sep 2004 18:05:25 -0000	1.16
  +++ decorator-top.vm	17 Sep 2004 20:26:54 -0000	1.17
  @@ -18,6 +18,7 @@
   #defineConstants()
   
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  +## #set($preferedLocal = $request.getAttribute("org.apache.jetspeed.prefered.locale"))
   #set($preferedLocale = $JS2RequestContext.locale)
   <html>
   <head>
  @@ -37,22 +38,22 @@
   <p>
   <img src="content/images/jetspeed-logo.gif" alt="Jetspeed 2 Logo" border="0">
   </p>
  +
  +#set($profiledPageContext = $request.getAttribute("org.apache.jetspeed.profiledPageContext"))
  +
   <p>
  -	#set($folder = $request.getAttribute("org.apache.jetspeed.folder"))
  -	
  -	## #set($preferedLocal = $request.getAttribute("org.apache.jetspeed.prefered.locale"))
  +	#set($parentFolder = $profiledPageContext.parentFolder)
   	
  -	
  -	#if($folder.parent)
  +	#if($parentFolder)
   	 <p style="font-style:italic">	
  -		<a href="$jetspeed.getAbsoluteUrl($folder.parent.url)">Back to $folder.parent.metaData.getTitle($preferedLocale)</a>
&nbsp;
  +		<a href="$jetspeed.getAbsoluteUrl($parentFolder.url)">Back to $parentFolder.metaData.getTitle($preferedLocale)</a>
&nbsp;
   	 </p>
   	#end
   	
  -  #includeNavigation("folders" $folder.folders $LEFT_TO_RIGHT)
  +  #includeNavigation("folders" $profiledPageContext.siblingFolders $LEFT_TO_RIGHT)
   </p>
     <p>
  -  #includeNavigation("tabs" $folder.pages $LEFT_TO_RIGHT)
  +  #includeNavigation("tabs" $profiledPageContext.siblingPages $LEFT_TO_RIGHT)
     </p>
   </p>
   	
  @@ -60,20 +61,11 @@
   <tr>
   	<td valign="top" nowrap>	
   		
  -	 #set($pageManager = $jetspeed.getComponent("pageManager"))
  -     #set($rootFolder = $pageManager.getFolder("/"))
  -     #set($links = $rootFolder.links)
   	 Additional Links:
  -	 #includeNavigation("linksWithIcon1" $links $TOP_TO_BOTTOM)
  +	 #includeNavigation("linksWithIcon1" $profiledPageContext.rootLinks $TOP_TO_BOTTOM)
   	</td>
   	<td width="99%" nowrap valign="top">
     
   ## $jetspeed.include($jetspeed.currentFragment)
   
   <!--  END: layout/html/jetspeed/decorator.vm -->
  -
  -
  -
  -
  -
  -
  
  
  

---------------------------------------------------------------------
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