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/decorations/layout/html/jetspeed decorator-top.vm decorator-bottom.vm
Date Fri, 03 Sep 2004 13:29:21 GMT
weaver      2004/09/03 06:29:21

  Modified:    portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed
                        decorator-top.vm decorator-bottom.vm
  Log:
  - Added links
  - Make folder links show up above the tabs
  
  Revision  Changes    Path
  1.13      +29 -21    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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- decorator-top.vm	2 Sep 2004 17:08:41 -0000	1.12
  +++ decorator-top.vm	3 Sep 2004 13:29:21 -0000	1.13
  @@ -26,14 +26,6 @@
   </head>
   <body class="layout-Jetspeed">
   
  -#*
  -<ol>
  -#foreach($cssUrl in $cssUrls)
  -	<li>$cssUrl</li>
  -#end
  -</ol>
  -*#
  -
   #set($myF = $jetspeed.currentFragment)
   
   <!--  BEGIN: layout/html/jetspeed/decorator.vm -->
  @@ -46,28 +38,27 @@
   	#set($folder = $request.getAttribute("org.apache.jetspeed.folder"))
   	
   	## #set($preferedLocal = $request.getAttribute("org.apache.jetspeed.prefered.locale"))
  -	#set($preferedLocal = $JS2RequestContext.locale)
  -
  +	#set($preferedLocale = $JS2RequestContext.locale)
  +	
   	#if($folder.parent)
   	 <p style="font-style:italic">	
  -		<a href="${appRoot}/portal${folder.parent.name}">Back to $folder.parent.metaData.getTitle($preferedLocal)</a>
&nbsp;
  +		<a href="${appRoot}/portal${folder.parent.url}">Back to $folder.parent.metaData.getTitle($preferedLocale)</a>
&nbsp;
   	 </p>
   	#end
   		
   	#foreach($childFolder in $folder.folders.iterator())
  -	  <a href="${appRoot}/portal${childFolder.name}">$childFolder.metaData.getTitle($preferedLocal)</a>
&nbsp;		
  +	  <a href="${appRoot}/portal${childFolder.url}">$childFolder.metaData.getTitle($preferedLocale)</a>
&nbsp;		
   	#end
   
  -    #*	
  -	#foreach($childPage in $folder.pages.iterator())		
  -		<a href="${appRoot}/portal${childPage.id}">$childPage.getTitle($preferedLocal)</a>
&nbsp;
  -	#end
  -    *#
  +
  +
  +</p>
  +
       <p>
           <table border="0" cellpadding="0" cellspacing="0" width="100%">
               <tr>
                   #foreach($childPage in $folder.pages.iterator())
  -                #set($tabName = $childPage.getTitle($preferedLocal))
  +                #set($tabName = $childPage.getTitle($preferedLocale))
                   #if($jetspeed.page == $childPage)
                   <td class="LTabLeft" style="font-size:1pt;" nowrap="true">&nbsp;</td>
                   <td class="LTab" align="center" valign="middle" nowrap="true">${tabName}</td>
  @@ -81,10 +72,27 @@
               </tr>
           </table>
       </p>
  -	
   </p>
  -</div>
  -
  +	
  +<table cellpadding="0" cellspacing="0" border="0" width="100%">
  +<tr>
  +	<td valign="top" nowrap>	
  +		
  +	 #set($pageManager = $jetspeed.getComponent("pageManager"))
  +     #set($rootFolder = $pageManager.getFolder("/"))
  +     #set($links = $rootFolder.links)
  +	 Additional Links:
  +	
  +     <div id="rootLinks">
  +     #foreach($link in $links.iterator()) 
  +	 <p>
  +      <a href="$link.url" target="$link.target">$link.getTitle($preferedLocale)</a>

  +	 </p> 
  +	 #end
  +	 </div>
  +	</td>
  +	<td width="99%" nowrap valign="top">
  +  
   ## $jetspeed.include($jetspeed.currentFragment)
   
   <!--  END: layout/html/jetspeed/decorator.vm -->
  
  
  
  1.7       +5 -0      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-bottom.vm
  
  Index: decorator-bottom.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-bottom.vm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- decorator-bottom.vm	30 Jun 2004 02:40:48 -0000	1.6
  +++ decorator-bottom.vm	3 Sep 2004 13:29:21 -0000	1.7
  @@ -14,6 +14,11 @@
   limitations under the License.
   *#
   
  +  </td>
  + </tr>
  +</table> 
  +</div>
  +
   <p>
   <img src="content/images/jetspeed-powered.gif" alt="Jetspeed 2 Powered" border="0">
   </p>
  
  
  

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