portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris decorator-top.vm
Date Tue, 25 Jan 2005 00:52:12 GMT
rwatler     2005/01/24 16:52:12

  Modified:    portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris
                        decorator-top.vm
               portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed
                        decorator-top.vm
               portal/src/webapp/WEB-INF/decorations/layout/html/tigris
                        decorator-top.vm
  Log:
  cleanup layout template behavior when Folder and Pages and Additional Links nav components
are missing
  
  Revision  Changes    Path
  1.8       +8 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
  
  Index: decorator-top.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- decorator-top.vm	3 Dec 2004 23:28:00 -0000	1.7
  +++ decorator-top.vm	25 Jan 2005 00:52:12 -0000	1.8
  @@ -71,11 +71,15 @@
         </div>
         <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
           <tr>
  +#set($hasFoldersAndPages = ($site.siblingFolders && !$site.siblingFolders.isEmpty())
|| ($site.documentSetNames && !$site.documentSetNames.isEmpty()))
  +#set($hasAdditionaLinks = $site.rootLinks && !$site.rootLinks.isEmpty())
  +#if($hasFoldersAndPages || $hasAdditionaLinks)
             <td valign="top" id="leftcol" width="20%">
               <div id="navcolumn">
   
   <!-- Navigation Column -->
   <table cellpadding="0" cellspacing="4" border="0" width="100%">
  +#if($hasFoldersAndPages)
     <tr>
       <td>
         <div class="toolgroup">    
  @@ -99,7 +103,8 @@
         </div>
       </td>
     </tr>
  -#if($site.rootLinks)
  +#end
  +#if($hasAdditionaLinks)
     <tr>
       <td>  
         <div class="toolgroup">
  @@ -117,6 +122,7 @@
   
               </div>
             </td>
  +#end
             <td nowrap valign="top">
     
   ## $jetspeed.include($jetspeed.currentFragment)
  
  
  
  1.25      +5 -1      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- decorator-top.vm	3 Dec 2004 09:10:18 -0000	1.24
  +++ decorator-top.vm	25 Jan 2005 00:52:12 -0000	1.25
  @@ -56,9 +56,12 @@
   	
   <table cellpadding="0" cellspacing="0" border="0" width="100%">
   <tr>
  +#set($hasFoldersAndPages = $site.documentSetNames && !$site.documentSetNames.isEmpty())
  +#set($hasAdditionaLinks = $site.rootLinks && !$site.rootLinks.isEmpty())
  +#if($hasFoldersAndPages || $hasAdditionaLinks)
     <td valign="top">
       <table cellpadding="0" cellspacing="0" border="0" width="100%">
  -    #if($site.rootLinks)
  +    #if($hasAdditionaLinks)
       <tr>
         <td nowrap>  
           <br>Additional Links:
  @@ -78,6 +81,7 @@
       #end
       </table>
     </td>
  +#end
     <td width="99%" nowrap valign="top">
     
   ## $jetspeed.include($jetspeed.currentFragment)
  
  
  
  1.6       +8 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
  
  Index: decorator-top.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- decorator-top.vm	3 Dec 2004 09:10:18 -0000	1.5
  +++ decorator-top.vm	25 Jan 2005 00:52:12 -0000	1.6
  @@ -69,11 +69,15 @@
         </div>
         <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
           <tr>
  +#set($hasFoldersAndPages = ($site.siblingFolders && !$site.siblingFolders.isEmpty())
|| ($site.documentSetNames && !$site.documentSetNames.isEmpty()))
  +#set($hasAdditionaLinks = $site.rootLinks && !$site.rootLinks.isEmpty())
  +#if($hasFoldersAndPages || $hasAdditionaLinks)
             <td valign="top" id="leftcol" width="20%">
               <div id="navcolumn">
   
   <!-- Navigation Column -->
   <table cellpadding="0" cellspacing="4" border="0" width="100%">
  +#if($hasFoldersAndPages)
     <tr>
       <td>
         <div class="toolgroup">    
  @@ -97,7 +101,8 @@
         </div>
       </td>
     </tr>
  -#if($site.rootLinks)
  +#end
  +#if($hasAdditionaLinks)
     <tr>
       <td>  
         <div class="toolgroup">
  @@ -115,6 +120,7 @@
   
               </div>
             </td>
  +#end
             <td nowrap valign="top">
     
   ## $jetspeed.include($jetspeed.currentFragment)
  
  
  

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