portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r216120 [5/5] - in /portals/jetspeed-2/trunk: applications/pam/src/java/org/apache/jetspeed/portlets/site/ applications/pam/src/webapp/WEB-INF/view/ applications/pam/src/webapp/images/tree/ components/locator/src/java/org/apache/jetspeed/pr...
Date Wed, 13 Jul 2005 06:40:35 GMT
Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuSeparator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuSeparator.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSite.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSite.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java
Tue Jul 12 23:40:27 2005
@@ -42,7 +42,6 @@
 {
     public final static String PAGE_LOCATOR = "page";
     public final static String SECURITY_LOCATOR = "security";
-    public final static String DOCSET_LOCATOR = "docset";
 
     public final static String PATH_SEPARATOR = ":";
     

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java
Tue Jul 12 23:40:27 2005
@@ -85,16 +85,6 @@
     ProfileLocator createLocator(RequestContext context);
         
     /**
-      * Creates a new ProfiledPageContext object that references
-      * the specified locator and can be managed by the current
-      * Profiler implementation
-      *
-      * @param locators Map of ProfileLocator objects used to select page
-      * @return A new ProfiledPageContext object
-      */
-    ProfiledPageContext createProfiledPageContext(Map locators);
-        
-    /**
      * For a given principal, lookup the associated profiling rule to that principal name.
      * 
      * @param principal Lookup the profiling rule based on this principal. 

Modified: portals/jetspeed-2/trunk/maven-plugin/src/plugin-resources/sql/populate-db-default.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/src/plugin-resources/sql/populate-db-default.sql?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/src/plugin-resources/sql/populate-db-default.sql
(original)
+++ portals/jetspeed-2/trunk/maven-plugin/src/plugin-resources/sql/populate-db-default.sql
Tue Jul 12 23:40:27 2005
@@ -381,9 +381,9 @@
 
 insert into PRINCIPAL_RULE_ASSOC values ( 'guest', 'page', 'j1' );
 insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'page', 'role-fallback' );
-insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'docset', 'role-group' );
+insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'menu', 'role-group' );
 insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'page', 'j1' );
-insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'docset', 'role-group' );
+insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'menu', 'role-group' );
 
 -- test data for db browser
 insert into CLUBS values ('AC Milan', 'Italy', 'Milan', 'San Siro', 85700, 1926, '105x68m',
'');

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml Tue
Jul 12 23:40:27 2005
@@ -17,17 +17,15 @@
 -->
 <beans>
 
-  <!-- Profiler DAO-->
+  <!-- Profiler -->  
   <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl"
init-method="init">
        <constructor-arg index="0"><value>META-INF/profiler-ojb.xml</value></constructor-arg>
        <constructor-arg index="1"><value>j1</value></constructor-arg>
-    </bean>
+  </bean>
   
-  <!-- Profiler -->  
   <bean id="org.apache.jetspeed.profiler.Profiler" 
         name="profiler"
-        parent="baseTransactionProxy"        
-  >        
+        parent="baseTransactionProxy">        
         <property name="proxyInterfaces">
             <value>org.apache.jetspeed.profiler.Profiler</value>
         </property>
@@ -44,6 +42,7 @@
         </property>            
   </bean>
     
+  <!-- PageManager -->
   <bean id="PsmlDocumentHandler"      
        class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >   
     
        <constructor-arg index="0"><value>/META-INF/page-mapping.xml</value></constructor-arg>
@@ -62,15 +61,6 @@
        <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
-  <bean id="DocumentSetDocumentHandler"        
-       class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >   
     
-       <constructor-arg index="0"><value>/META-INF/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>.ds</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.DocumentSet</value></constructor-arg>
     
-       <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
-  </bean>
-  
   <bean id="FolderMetaDataDocumentHandler"         
        class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >   
     
        <constructor-arg index="0"><value>/META-INF/page-mapping.xml</value></constructor-arg>
@@ -99,9 +89,6 @@
           <entry key=".link">
             <ref bean="LinkDocumentHandler" />
           </entry>  
-          <entry key=".ds">
-            <ref bean="DocumentSetDocumentHandler" />
-          </entry>  
           <entry key="folder.metadata">
             <ref bean="FolderMetaDataDocumentHandler" />
           </entry>        
@@ -119,8 +106,6 @@
        <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>
       
   </bean>
     
-    
-  <!-- PageManager -->
   <bean id="org.apache.jetspeed.page.PageManager" 
        name="pageManager"
        class="org.apache.jetspeed.page.impl.CastorXmlPageManager">         
@@ -128,14 +113,17 @@
        <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
        <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
        <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>
       
-       <!-- size of profiled page context LRU cache, default=100 -->
-       <constructor-arg index="4"><value>100</value></constructor-arg>
-       <!-- profiling enabled flag, default=true -->
-       <constructor-arg index="5"><value>true</value></constructor-arg>
        <!-- permissions security enabled flag, default=false -->
-       <constructor-arg index="6"><value>false</value></constructor-arg>
+       <constructor-arg index="4"><value>false</value></constructor-arg>
        <!-- constraints security enabled flag, default=true -->
-       <constructor-arg index="7"><value>true</value></constructor-arg>
+       <constructor-arg index="5"><value>true</value></constructor-arg>
+  </bean>
+
+  <!-- PortalSite -->
+  <bean id="org.apache.jetspeed.portalsite.PortalSite" 
+       name="portalSite"
+       class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">         
+       <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
   </bean>
 
 </beans>

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/pipelines.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/pipelines.xml?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/pipelines.xml Tue Jul
12 23:40:27 2005
@@ -88,6 +88,9 @@
    	<ref bean="org.apache.jetspeed.profiler.Profiler" />
    </constructor-arg>
    <constructor-arg>
+   	<ref bean="org.apache.jetspeed.portalsite.PortalSite" />
+   </constructor-arg>
+   <constructor-arg>
    	<ref bean="org.apache.jetspeed.page.PageManager" />
    </constructor-arg>
   </bean> 

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
(original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
Tue Jul 12 23:40:27 2005
@@ -38,7 +38,6 @@
 
 #set($myF = $jetspeed.currentFragment)
 #set($site = $request.getAttribute("org.apache.jetspeed.profiledPageContext"))
-#set($parentFolder = $site.parentFolder)
 
 <!--  BEGIN: layout/html/tigris/decorator.vm -->
 
@@ -48,7 +47,7 @@
         <table border="0" cellspacing="0" cellpadding="8" width="100%">
           <tr>
             <td>
-              <h1><img src="content/images/jetspeed-logo.gif" alt="Jetspeed 2 Logo"
border="0"/></h1>
+              <h1><img src="$response.encodeURL('content/images/jetspeed-logo.gif')"
alt="Jetspeed 2 ロゴ" border="0"/></h1>
             </td>
             <td>
               <div align="right" id="login">
@@ -60,70 +59,40 @@
       </div>
 <!-- Top Tabs -->
       <div class="tabs">
-#includeTabsNavigation($site.siblingPages $LEFT_TO_RIGHT)
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
       </div>
       <div id="breadcrumbs">
-#if($parentFolder)
-		<a href="$jetspeed.getAbsoluteUrl($parentFolder.url)" title="$parentFolder.getTitle($preferedLocale)">$parentFolder.getShortTitle($preferedLocale)
-へ戻る
-</a>
-#end
+#* standard back breadcrumb *#
+##set($backStandardMenu = $site.getMenu("back"))
+##if(!$backStandardMenu.empty)
+##includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT $TITLE_LAST "" "")
+#* standard breadcrumbs *#
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
         &nbsp;
+#end
       </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)
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
           <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">    
-        <div class="label">
-          フォルダ&ページ
-        </div>
-        <div class="body">
-#includeFoldersNavigation($site.siblingFolders $TOP_TO_BOTTOM)
-
-#foreach($docSetName in $site.documentSetNames)
-  #set($docSet = $site.getDocumentSet($docSetName))
-  #set($docSetNodes = $site.getDocumentSetNodes($docSetName))
-          <div>
-            <div class="pagetitle" title="$docSet.getTitle($preferedLocale)">
-            ${docSet.getShortTitle($preferedLocale)}
-            </div>
-          </div>
-#includeNestedLinksWithIconNavigation($docSetNodes $docSet.url $TOP_TO_BOTTOM)
-#end
-        </div>
-      </div>
-    </td>
-  </tr>
-#end
-#if($hasAdditionaLinks)
-  <tr>
-    <td>  
-      <div class="toolgroup">
-        <div class="label">
-          追加リンク
-        </div>
-        <div class="body">
-#includeLinksWithIconNavigation($site.rootLinks $TOP_TO_BOTTOM)
-        </div>
-      </div>
-    </td>
-  </tr>
-#end
-</table>
+              <table cellpadding="0" cellspacing="4" border="0" width="100%">
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+              </table>
 
             </div>
           </td>
 #end
+
           <td nowrap valign="top">
   
 ## $jetspeed.include($jetspeed.currentFragment)

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm
(original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm
Tue Jul 12 23:40:27 2005
@@ -5,132 +5,208 @@
   #set($RIGHT_TO_LEFT = "RightToLeft")
   #set($TOP_TO_BOTTOM = "TopToBottom")
   #set($BOTTOM_TO_TOP = "BottomToTop")
+  #set($TITLE_FIRST = "TitleFirst")
+  #set($TITLE_LAST = "TitleLast")
+  #set($BREADCRUMBS_STYLE = "BreadcrumbsStyle")
 #end
 
-#* include potentially nested links navigation component *#
-#macro (includeNestedLinksWithIconNavigation $_nodeSet $_nodePrefix $_orientation)
-  <div>
-  #foreach($node in $_nodeSet.iterator()) 
-    #if($_orientation == $TOP_TO_BOTTOM)
-      #if($node.type == ".ds")
-        <div class="pagetitle" title="$node.getTitle($preferedLocale)">${node.getShortTitle($preferedLocale)}</div>
-      #else
-        <div>
+#* include tabs navigation component *#
+#macro (includeTabsNavigation $_menu $_orientation)
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr>
+    #foreach($element in $_menu.elements.iterator())
+      #if($element.elementType == "option")
+        #set($tabTitle = $element.getTitle($preferedLocale))
+        #set($tabName = $element.getShortTitle($preferedLocale))
+        #if($_orientation == $LEFT_TO_RIGHT)
+          #if($element.isSelected($site))
+            <td class="LTabLeft" nowrap="true">&nbsp;</td>
+            <td class="LTab" align="center" valign="middle" nowrap="true" title="$!tabTitle">${tabName}</td>
+            <td class="LTabRight"  nowrap="true">&nbsp;</td>
+          #else
+            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+            <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
+            <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$!tabTitle"><a
href="$tabUrl">${tabName}</a></td>
+            <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
+          #end
+        #end
       #end
     #end
+          </tr>
+        </table>
+#end
 
-    #if($node.type == ".psml")
-      <a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkPage" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>

-    #elseif($node.type == ".link")
-      <a href="$jetspeed.getAbsoluteUrl($node.url)" target="$node.target" class="Link"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>

-    #elseif($node.type == "folder")
-      <a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkFolder" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>

-    #elseif($node.type == ".ds")
-      #set($__nodePrefix = "${_nodePrefix}${node.url}")
-      #set($__nodeSet = $site.getDocumentSetNodes($__nodePrefix))
-      #includeNestedLinksWithIconNavigation($__nodeSet $__nodePrefix $_orientation)
+#* include links navigation component *#
+#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+  #if(!$_delimiter || $_delimiter == "")
+    #if($_style != $BREADCRUMBS_STYLE)
+      #set($_delimiter = "&nbsp;")
     #else
-      <a href="$jetspeed.getAbsoluteUrl($node.url)" title="$node.getTitle()">$node.getShortTitle()</a>

-    #end
-
-    #if($_orientation == $TOP_TO_BOTTOM)
-      #if($node.type != ".ds")
-        </div>
-      #end
+      #set($_delimiter = "&nbsp;&gt;&gt;&nbsp;")
     #end
   #end
-  </div>
-#end
-#macro (includeLinksWithIconNavigation $_nodeSet $_orientation)
-  #includeNestedLinksWithIconNavigation($_nodeSet "" $_orientation)
-#end
-
-#* include folders navigation component *#
-#macro (includeFoldersNavigation $_nodeSet $_orientation)
-  <div class="FolderList">
-  #foreach($childFolder in $_nodeSet.iterator())
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+      <div class="FolderList">
+  #if($_title == $TITLE_FIRST)
     #if($_orientation == $LEFT_TO_RIGHT)
-      <span>
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
     #elseif($_orientation == $TOP_TO_BOTTOM)
-      <div>
-    #end
-
-    <a href="$jetspeed.getAbsoluteUrl($childFolder.url)" class="FolderLink" title="$childFolder.getTitle($preferedLocale)">$childFolder.getShortTitle($preferedLocale)</a>
	
-
-    #if($_orientation == $LEFT_TO_RIGHT)
-      </span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-      </div>
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
     #end
   #end
-  </div>
-#end
-
-#* include tabs navigation component *#
-#macro (includeTabsNavigation $_nodeSet $_orientation)
-  <table border="0" cellpadding="0" cellspacing="0">
-    <tr>
-    #foreach($childPage in $_nodeSet.iterator())
-      #set($tabTitle = $childPage.getTitle($preferedLocale))
-      #set($tabName = $childPage.getShortTitle($preferedLocale))
-
-      #if($_orientation == $LEFT_TO_RIGHT)
-        #if($jetspeed.page.id == $childPage.id)
-          <td class="LTabLeft" nowrap="true">&nbsp;</td>
-          <td class="LTab" align="center" valign="middle" nowrap="true" title="$tabTitle">${tabName}</td>
-          <td class="LTabRight"  nowrap="true">&nbsp;</td>
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount <
$_menu.elements.size())
+        #if($_orientation == $LEFT_TO_RIGHT)
+        <span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+        <div>
+        #end
+        #if($element.type == "page")
+          <a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "link")
+          <a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "folder")
+          <a href="$linkUrl" class="LinkFolder" title="$!linkTitle">${linkName}</a>
         #else
-          <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
-          <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$tabTitle"><a
href="$jetspeed.getAbsoluteUrl($childPage.url)">${tabName}</a></td>
-          <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
+          <a href="$linkUrl" title="$!linkTitle">${linkName}</a>
+        #end
+        #if($_orientation == $LEFT_TO_RIGHT)
+        ${_delimiter}</span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+        </div>
+        #end
+      #else
+        #if($_orientation == $LEFT_TO_RIGHT)
+        <span title="$!linkTitle">${linkName}&nbsp;</span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+        <div title="$!linkTitle">${linkName}</div>
         #end
       #end
-    #end
-    </tr>
-  </table>
-#end
-
-#* include tabs navigation component *#
-#macro (includeFolderTabsNavigation $_nodeSet $_orientation)
-  <table border="0" cellpadding="0" cellspacing="0">
-    <tr>
-    #foreach($childFolder in $_nodeSet.iterator())
-      #set($tabTitle = $childFolder.getTitle($preferedLocale))
-      #set($tabName = $childFolder.getShortTitle($preferedLocale))
-
+    #elseif($element.elementType == "separator")
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
       #if($_orientation == $LEFT_TO_RIGHT)
-        #if($site.folder.id == $childFolder.id)
-          <td class="LTabLeft" nowrap="true">&nbsp;</td>
-          <td class="LTab" align="center" valign="middle" nowrap="true" title="$tabTitle">${tabName}</td>
-          <td class="LTabRight"  nowrap="true">&nbsp;</td>
-        #else
-          <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
-          <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$tabTitle"><a
href="$jetspeed.getAbsoluteUrl($childFolder.url)">${tabName}</a></td>
-          <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
-        #end
+        <span title="$!separatorTitle">${separatorText}${_delimiter}</span> 
            
+      #elseif($_orientation == $TOP_TO_BOTTOM)
+        <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
             
       #end
-    #end           
-            
-    </tr>
-  </table>
-#end
-
-#macro (includePagesNavigation $_nodeSet $_orientation)
-  <div class="FolderList">
-  #foreach($childPage in $_nodeSet.iterator())
+    #end
+  #end
+  #if($_title == $TITLE_LAST)
     #if($_orientation == $LEFT_TO_RIGHT)
-      <span>
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
     #elseif($_orientation == $TOP_TO_BOTTOM)
-      <div>
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
     #end
+  #end
+      </div>
+#end
 
-    <a href="$jetspeed.getAbsoluteUrl($childPage.url)" class="FolderLink" title="$childPage.getTitle($preferedLocale)">$childPage.getShortTitle($preferedLocale)</a>
	
+#* include nested menu links navigation component *#
+#macro (includeNestedLinksWithIconNavigation $_menu $_orientation)
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+  #if($menuName)
+              <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+  #end
+              <div>
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                <div><a href="$linkUrl" target="$linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>

+      #elseif($element.type == "folder")
+                <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+    #elseif($element.elementType == "menu")
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+    #elseif($element.elementType == "separator")
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+                  <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
             
+    #end
+  #end
+              </div>
+#end
 
-    #if($_orientation == $LEFT_TO_RIGHT)
-      </span>
-    #elseif($_orientation == $TOP_TO_BOTTOM)
-      </div>
+#* include top level menu links navigation component *#
+#macro (includeLinksWithIconNavigation $_menu $_orientation)
+  #set($rowStarted = false)
+  #set($elementsStarted = false)
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #if(!$rowStarted)
+        <tr>
+          <td>
+            <div class="toolgroup">
+              <div class="body">
+                <div class="FolderList">
+      #elseif(!$elementsStarted)
+              <div class="body">
+                <div class="FolderList">
+      #end
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                  <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                  <div><a href="$linkUrl" target="$!linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>

+      #elseif($element.type == "folder")
+                  <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "menu")
+      #if(!$rowStarted)
+        <tr>
+          <td>
+            <div class="toolgroup">
+              <div class="body">
+                <div class="FolderList">
+      #elseif(!$elementsStarted)
+              <div class="body">
+                <div class="FolderList">
+      #end
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "separator")
+      #if(!$rowStarted)
+        <tr>
+          <td>
+            <div class="toolgroup">
+      #elseif($elementsStarted)
+                </div>
+              </div>
+      #end
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+              <div class="label">
+                ${separatorText}
+              </div>
+      #set($rowStarted = true)
+      #set($elementsStarted = false)
     #end
   #end
-  </div>
+  #if($elementsStarted)
+                </div>
+              </div>
+  #end
+  #if($rowStarted)
+            </div>
+          <td>
+        <tr>
+  #end
 #end

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
(original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
Tue Jul 12 23:40:27 2005
@@ -38,7 +38,6 @@
 
 #set($myF = $jetspeed.currentFragment)
 #set($site = $request.getAttribute("org.apache.jetspeed.profiledPageContext"))
-#set($parentFolder = $site.parentFolder)
 
 <!--  BEGIN: layout/html/tigris/decorator.vm -->
 
@@ -60,68 +59,40 @@
       </div>
 <!-- Top Tabs -->
       <div class="tabs">
-#includeTabsNavigation($site.siblingPages $LEFT_TO_RIGHT)
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+#end
       </div>
       <div id="breadcrumbs">
-#if($parentFolder)
-		<a href="$jetspeed.getAbsoluteUrl($parentFolder.url)" title="$parentFolder.getTitle($preferedLocale)">Back
to $parentFolder.getShortTitle($preferedLocale)</a>
-#end
+#* standard back breadcrumb *#
+##set($backStandardMenu = $site.getMenu("back"))
+##if(!$backStandardMenu.empty)
+##includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT $TITLE_FIRST "" "")
+#* standard breadcrumbs *#
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+#else
         &nbsp;
+#end
       </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)
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
           <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">    
-        <div class="label">
-          Folders and Pages
-        </div>
-        <div class="body">
-#includeFoldersNavigation($site.siblingFolders $TOP_TO_BOTTOM)
-
-#foreach($docSetName in $site.documentSetNames)
-  #set($docSet = $site.getDocumentSet($docSetName))
-  #set($docSetNodes = $site.getDocumentSetNodes($docSetName))
-          <div>
-            <div class="pagetitle" title="$docSet.getTitle($preferedLocale)">
-            ${docSet.getShortTitle($preferedLocale)}
-            </div>
-          </div>
-#includeNestedLinksWithIconNavigation($docSetNodes $docSet.url $TOP_TO_BOTTOM)
-#end
-        </div>
-      </div>
-    </td>
-  </tr>
-#end
-#if($hasAdditionaLinks)
-  <tr>
-    <td>  
-      <div class="toolgroup">
-        <div class="label">
-          Additional Links
-        </div>
-        <div class="body">
-#includeLinksWithIconNavigation($site.rootLinks $TOP_TO_BOTTOM)
-        </div>
-      </div>
-    </td>
-  </tr>
-#end
-</table>
+              <table cellpadding="0" cellspacing="4" border="0" width="100%">
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+              </table>
 
             </div>
           </td>
 #end
+
           <td nowrap valign="top">
   
 ## $jetspeed.include($jetspeed.currentFragment)

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/Administrative/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/Administrative/folder.metadata?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/Administrative/folder.metadata
(original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/Administrative/folder.metadata
Tue Jul 12 23:40:27 2005
@@ -13,6 +13,16 @@
   <document-order>palm.psml</document-order>
   <document-order>profiler.psml</document-order>
 
+  <menu name="page-navigations">
+    <separator>Users Admin Pages</separator>
+    <options>/Administrative/user-mgt.psml</options>
+    <options>/Administrative/users-jsf.psml</options>
+    <separator>Profiled Pages</separator>
+    <options regexp="true">/p[0-9][0-9][0-9].psml</options>
+    <separator>Non Java Pages</separator>
+    <options>/non-java</options>
+  </menu>
+
   <security-constraints>
     <security-constraints-ref>manager</security-constraints-ref>
   </security-constraints>

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_role/user/top-links/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_role/user/top-links/folder.metadata?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_role/user/top-links/folder.metadata
(original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_role/user/top-links/folder.metadata
Tue Jul 12 23:40:27 2005
@@ -4,6 +4,5 @@
   <document-order>apache_portals.link</document-order>
   <document-order>apache_tomcat.link</document-order>
   <document-order>apache_velocity.link</document-order>
-  <document-order>more-pages.ds</document-order>
   <document-order>apache_commons.link</document-order>
 </folder>

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_user/user/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_user/user/folder.metadata?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_user/user/folder.metadata
(original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_user/user/folder.metadata
Tue Jul 12 23:40:27 2005
@@ -21,9 +21,20 @@
   <document-order>non-java</document-order>
   <document-order>Administrative</document-order>
 
-  <document-order>top-pages.ds</document-order>
-  <document-order>pages.ds</document-order>
-  <document-order>non-java.ds</document-order>
+  <menu name="page-navigations">
+    <separator>
+      <text>[USER] Top Pages</text>
+      <metadata name="text" xml:lang="fr">[USER] Page haut</metadata>
+    </separator>
+    <options regexp="true" profile="menu">/top-links/*.*</options>
+    <menu regexp="true" profile="menu" options="/top-links/more/*.*">
+      <title>[USER] More Pages</title>
+    </menu>
+    <separator>Profiled Pages</separator>
+    <options regexp="true">/p[0-9][0-9][0-9].psml</options>
+    <separator>Non Java Pages</separator>
+    <options>/non-java</options>
+  </menu>
 
   <security-constraints>
     <owner>user</owner>

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/folder.metadata?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/folder.metadata (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/folder.metadata Tue Jul
12 23:40:27 2005
@@ -9,6 +9,18 @@
   <document-order>apache_portals.link</document-order>
   <document-order>apache.link</document-order>
 
+  <menu name="page-navigations">
+    <separator>
+      <text>Top Pages</text>
+      <metadata name="text" xml:lang="fr">Page haut</metadata>
+    </separator>
+    <options>/Administrative</options>
+    <separator>Profiled Pages</separator>
+    <options regexp="true">/p[0-9][0-9][0-9].psml</options>
+    <separator>Non Java Pages</separator>
+    <options>/non-java</options>
+  </menu>
+
   <security-constraints>
     <security-constraints-ref>public-view</security-constraints-ref>
   </security-constraints>



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


Mime
View raw message