portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r210076 - in /portals/jetspeed-2/branches/MENUS_BRANCH: components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/ components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/ components/portal-site/src/java/org/...
Date Mon, 11 Jul 2005 07:16:41 GMT
Author: rwatler
Date: Mon Jul 11 00:16:36 2005
New Revision: 210076

URL: http://svn.apache.org/viewcvs?rev=210076&view=rev
Log:
- define 'breadcrumbs' standard menu
- replace 'back' menu with new 'breadcrumbs' menu in tigris decorators, commenting out menu example
- use menu titles for 'back' and 'breadcrumbs' menus to allow decorator placement of title text instead of using inline separators
- expand decorator include links macro to allow specification of title positioning, breadcrumb style, and delimiter text


Added:
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_de.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_en.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_fr.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_it.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ko.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_nl.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_pt.properties   (with props)
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties   (with props)
Modified:
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBackMenuDefinition.java
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardNavigationsMenuDefinition.java
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_de.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_en.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_fr.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_it.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ja.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ko.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_nl.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_pt.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh.properties
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java
    portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/folder1/folder.metadata
    portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
    portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm
    portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBackMenuDefinition.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBackMenuDefinition.java?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBackMenuDefinition.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBackMenuDefinition.java Mon Jul 11 00:16:36 2005
@@ -15,15 +15,12 @@
  */
 package org.apache.jetspeed.portalsite.menu;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.folder.impl.StandardMenuDefinitionImpl;
-import org.apache.jetspeed.om.folder.impl.StandardMenuOptionsDefinitionImpl;
-import org.apache.jetspeed.om.folder.impl.StandardMenuSeparatorDefinitionImpl;
 import org.apache.jetspeed.portalsite.view.SiteView;
 
 /**
@@ -36,12 +33,6 @@
 public class StandardBackMenuDefinition extends StandardMenuDefinitionImpl
 {
     /**
-     * menuElements - ordered polymorphic list of menu option, nested
-     *                menu, separator, include, and exclude definitions
-     */
-    private List menuElements;
-
-    /**
      * StandardBackMenuDefinition - constructor
      */
     public StandardBackMenuDefinition()
@@ -60,57 +51,14 @@
     }
 
     /**
-     * getMenuElements - get ordered list of menu options,
-     *                   nested menus, separators, included
-     *                   menu, and excluded menu elements
+     * getOptions - get comma separated menu options if not specified as elements
      *
-     * @return element list
+     * @return option paths specification
      */
-    public List getMenuElements()
+    public String getOptions()
     {
-        // instantiate menu elements if necessary
-        if (menuElements == null)
-        {
-            menuElements = new ArrayList(2);
-            menuElements.add(new StandardMenuSeparatorDefinitionImpl()
-                {
-                    /**
-                     * getText - get default text for separator
-                     *
-                     * @return text
-                     */
-                    public String getText()
-                    {
-                        // use locale defaults
-                        return getMenuSeparatorText(null, "menu.separator.back");
-                    }
-
-                    /**
-                     * getText - get locale specific text for separator from metadata
-                     *
-                     * @param locale preferred locale
-                     * @return text
-                     */
-                    public String getText(Locale locale)
-                    {
-                        // use specified locale
-                        return getMenuSeparatorText(locale, "menu.separator.back");
-                    }
-                });
-            menuElements.add(new StandardMenuOptionsDefinitionImpl()
-                {
-                    /**
-                     * getOptions - get comma separated menu options
-                     *
-                     * @return option paths specification
-                     */
-                    public String getOptions()
-                    {
-                        return ".." + Folder.PATH_SEPARATOR;
-                    }
-                });
-        }
-        return menuElements;
+        // parent folder
+        return ".." + Folder.PATH_SEPARATOR;
     }
 
     /**
@@ -124,26 +72,56 @@
     }
 
     /**
-     * getMenuSeparatorText - lookup resource bundle based on locale
-     *                        and use to extract menu separator text
+     * getTitle - get default title for menu
+     *
+     * @return title text
+     */
+    public String getTitle()
+    {
+        // use locale defaults
+        return getMenuTitleText(null, "menu.title.back");
+    }
+
+    /**
+     * getTitle - get locale specific title for menu from metadata
+     *
+     * @param locale preferred locale
+     * @return title text
+     */
+    public String getTitle(Locale locale)
+    {
+        // use specified locale
+        return getMenuTitleText(locale, "menu.title.back");
+    }
+
+    /**
+     * getMenuTitleText - lookup resource bundle based on locale
+     *                    and use to extract menu title text
      *
      * @param locale preferred locale
      * @param key message key for text
      */
-    private String getMenuSeparatorText(Locale locale, String key)
+    protected String getMenuTitleText(Locale locale, String key)
     {
-        // get resource bundle
-        ResourceBundle bundle = null;
-        if (locale != null)
+        try
         {
-            bundle = ResourceBundle.getBundle("org.apache.jetspeed.portalsite.menu.resources.MenuSeparators",locale);
+            // get resource bundle
+            ResourceBundle bundle = null;
+            if (locale != null)
+            {
+                bundle = ResourceBundle.getBundle("org.apache.jetspeed.portalsite.menu.resources.MenuTitles",locale);
+            }
+            else
+            {
+                bundle = ResourceBundle.getBundle("org.apache.jetspeed.portalsite.menu.resources.MenuTitles");
+            }
+            
+            // lookup and return keyed message
+            return bundle.getString(key);
         }
-        else
+        catch (MissingResourceException mre)
         {
-            bundle = ResourceBundle.getBundle("org.apache.jetspeed.portalsite.menu.resources.MenuSeparators");
         }
-
-        // lookup and return keyed message
-        return bundle.getString(key);
+        return null;
     }
 }

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java Mon Jul 11 00:16:36 2005
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portalsite.menu;
+
+import java.util.Locale;
+
+import org.apache.jetspeed.portalsite.view.SiteView;
+
+/**
+ * This class provides a menu definition for the standard
+ * breadcrumbs menu.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public class StandardBreadcrumbsMenuDefinition extends StandardBackMenuDefinition
+{
+    /**
+     * StandardBreadcrumbsMenuDefinition - constructor
+     */
+    public StandardBreadcrumbsMenuDefinition()
+    {
+        super();
+    }
+
+    /**
+     * getName - get menu name
+     *
+     * @return menu name
+     */
+    public String getName()
+    {
+        return SiteView.STANDARD_BREADCRUMBS_MENU_NAME;
+    }
+
+    /**
+     * getOptions - get comma separated menu options if not specified as elements
+     *
+     * @return option paths specification
+     */
+    public String getOptions()
+    {
+        // current page
+        return SiteView.CURRENT_PAGE_PATH;
+    }
+
+    /**
+     * isPaths - get generate ordered path options for specified options
+     *
+     * @return paths options flag
+     */
+    public boolean isPaths()
+    {
+        return true;
+    }
+    
+    /**
+     * getTitle - get default title for menu
+     *
+     * @return title text
+     */
+    public String getTitle()
+    {
+        // use locale defaults
+        return getMenuTitleText(null, "menu.title.breadcrumbs");
+    }
+
+    /**
+     * getTitle - get locale specific title for menu from metadata
+     *
+     * @param locale preferred locale
+     * @return title text
+     */
+    public String getTitle(Locale locale)
+    {
+        // use specified locale
+        return getMenuTitleText(locale, "menu.title.breadcrumbs");
+    }
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardNavigationsMenuDefinition.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardNavigationsMenuDefinition.java?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardNavigationsMenuDefinition.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardNavigationsMenuDefinition.java Mon Jul 11 00:16:36 2005
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 import org.apache.jetspeed.om.folder.Folder;
@@ -201,20 +202,27 @@
      * @param locale preferred locale
      * @param key message key for text
      */
-    private String getMenuSeparatorText(Locale locale, String key)
+    protected String getMenuSeparatorText(Locale locale, String key)
     {
-        // get resource bundle
-        ResourceBundle bundle = null;
-        if (locale != null)
+        try
         {
-            bundle = ResourceBundle.getBundle("org.apache.jetspeed.portalsite.menu.resources.MenuSeparators",locale);
+            // get resource bundle
+            ResourceBundle bundle = null;
+            if (locale != null)
+            {
+                bundle = ResourceBundle.getBundle("org.apache.jetspeed.portalsite.menu.resources.MenuSeparators",locale);
+            }
+            else
+            {
+                bundle = ResourceBundle.getBundle("org.apache.jetspeed.portalsite.menu.resources.MenuSeparators");
+            }
+            
+            // lookup and return keyed message
+            return bundle.getString(key);
         }
-        else
+        catch (MissingResourceException mre)
         {
-            bundle = ResourceBundle.getBundle("org.apache.jetspeed.portalsite.menu.resources.MenuSeparators");
         }
-
-        // lookup and return keyed message
-        return bundle.getString(key);
+        return null;
     }
 }

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=Folders
 menu.separator.links=Additional Links
-menu.separator.back=Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_de.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_de.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_de.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_de.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=[de]Folders
 menu.separator.links=[de]Links
-menu.separator.back=[de]Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_en.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_en.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_en.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_en.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=Folders
 menu.separator.links=Additional Links
-menu.separator.back=Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=[es]Folders
 menu.separator.links=[es]Links
-menu.separator.back=[es]Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_fr.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_fr.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_fr.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_fr.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=[fr]Folders
 menu.separator.links=[fr]Links
-menu.separator.back=[fr]Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_it.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_it.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_it.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_it.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=[it]Folders
 menu.separator.links=[it]Links
-menu.separator.back=[it]Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ja.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ja.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ja.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ja.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=[ja]Folders
 menu.separator.links=[ja]Links
-menu.separator.back=[ja]Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ko.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ko.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ko.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ko.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=[ko]Folders
 menu.separator.links=[ko]Links
-menu.separator.back=[ko]Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_nl.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_nl.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_nl.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_nl.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=[nl]Folders
 menu.separator.links=[nl]Links
-menu.separator.back=[nl]Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_pt.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_pt.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_pt.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_pt.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=[pt]Folders
 menu.separator.links=[pt]Links
-menu.separator.back=[pt]Back to

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh.properties?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh.properties (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh.properties Mon Jul 11 00:16:36 2005
@@ -15,4 +15,3 @@
 ## menu separators
 menu.separator.folders=[zh]Folders
 menu.separator.links=[zh]Links
-menu.separator.back=[zh]Back to

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_de.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_de.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_de.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_de.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=[de]Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_en.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_en.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_en.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_en.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=[es]Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_fr.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_fr.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_fr.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_fr.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=[fr]Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_it.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_it.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_it.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_it.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=[it]Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_it.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=[ja]Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ko.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ko.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ko.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ko.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=[ko]Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_nl.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_nl.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_nl.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_nl.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=[nl]Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_nl.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_pt.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_pt.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_pt.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_pt.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=[pt]Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_pt.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties?rev=210076&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties Mon Jul 11 00:16:36 2005
@@ -0,0 +1,17 @@
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## menu titles
+menu.title.back=[zh]Back to
+menu.title.breadcrumbs=

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java Mon Jul 11 00:16:36 2005
@@ -35,6 +35,7 @@
 import org.apache.jetspeed.page.document.proxy.NodeProxy;
 import org.apache.jetspeed.portalsite.Menu;
 import org.apache.jetspeed.portalsite.menu.StandardBackMenuDefinition;
+import org.apache.jetspeed.portalsite.menu.StandardBreadcrumbsMenuDefinition;
 import org.apache.jetspeed.portalsite.menu.StandardNavigationsMenuDefinition;
 import org.apache.jetspeed.portalsite.menu.StandardPagesMenuDefinition;
 import org.apache.jetspeed.profiler.ProfileLocator;
@@ -72,6 +73,7 @@
      * STANDARD_*_MENU_NAME - standard menu names
      */
     public final static String STANDARD_BACK_MENU_NAME = "back";
+    public final static String STANDARD_BREADCRUMBS_MENU_NAME = "breadcrumbs";
     public final static String STANDARD_PAGES_MENU_NAME = "pages";
     public final static String STANDARD_NAVIGATIONS_MENU_NAME = "navigations";
 
@@ -87,6 +89,7 @@
     static
     {
         STANDARD_MENU_NAMES.add(STANDARD_BACK_MENU_NAME);
+        STANDARD_MENU_NAMES.add(STANDARD_BREADCRUMBS_MENU_NAME);
         STANDARD_MENU_NAMES.add(STANDARD_PAGES_MENU_NAME);
         STANDARD_MENU_NAMES.add(STANDARD_NAVIGATIONS_MENU_NAME);
     }
@@ -98,6 +101,7 @@
     static
     {
         STANDARD_MENU_DEFINITION_LOCATORS.add(new SiteViewMenuDefinitionLocator(new StandardBackMenuDefinition()));
+        STANDARD_MENU_DEFINITION_LOCATORS.add(new SiteViewMenuDefinitionLocator(new StandardBreadcrumbsMenuDefinition()));
         STANDARD_MENU_DEFINITION_LOCATORS.add(new SiteViewMenuDefinitionLocator(new StandardPagesMenuDefinition()));
         STANDARD_MENU_DEFINITION_LOCATORS.add(new SiteViewMenuDefinitionLocator(new StandardNavigationsMenuDefinition()));
     }

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java Mon Jul 11 00:16:36 2005
@@ -738,7 +738,7 @@
         assertFalse(customMenu.isEmpty());
         List customElements = customMenu.getElements();
         assertNotNull(customElements);
-        assertEquals(13, customElements.size());
+        assertEquals(12, customElements.size());
         assertEquals("custom", customMenu.getName());
         assertEquals("Top Menu", customMenu.getTitle());
         assertEquals("Haut", customMenu.getTitle(Locale.FRENCH));
@@ -899,7 +899,7 @@
             MenuElement element = (MenuElement)menuElementsIter.next();
             if (element.getElementType().equals(MenuElement.SEPARATOR_ELEMENT_TYPE) &&
                 (element instanceof MenuSeparator) &&
-                ((MenuSeparator)element).getText().equals("Back to"))
+                ((MenuSeparator)element).getText().equals("=== Standard Menus ==="))
             {
             }
             else
@@ -915,19 +915,6 @@
                 assertTrue(element instanceof MenuOption);
                 assertEquals("/", ((MenuOption)element).getUrl());
                 assertEquals(MenuOption.FOLDER_OPTION_TYPE, ((MenuOption)element).getType());
-            }
-            else
-            {
-                fail("Unexpected menu element type/title: "+element.getElementType()+"/"+element.getTitle());
-            }            
-        }
-        if (menuElementsIter.hasNext())
-        {
-            MenuElement element = (MenuElement)menuElementsIter.next();
-            if (element.getElementType().equals(MenuElement.SEPARATOR_ELEMENT_TYPE) &&
-                (element instanceof MenuSeparator) &&
-                ((MenuSeparator)element).getText().equals("=== Standard Menus ==="))
-            {
             }
             else
             {

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/folder1/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/folder1/folder.metadata?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/folder1/folder.metadata (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/folder1/folder.metadata Mon Jul 11 00:16:36 2005
@@ -49,9 +49,8 @@
     <separator>=== More Options ===</separator>
     <options regexp="true" order="*.link,/page[0-9].psml">@,/*.psml,/*.link</options>
     <exclude>zero-root-options</exclude>
-    <separator>=== Ignored Replaced Separator ===</separator>
-    <include>back</include>
     <separator>=== Standard Menus ===</separator>
+    <include>back</include>
     <include nest="true">navigations</include>
     <include nest="true">pages</include>
   </menu>

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm Mon Jul 11 00:16:36 2005
@@ -65,9 +65,14 @@
 #end
       </div>
       <div id="breadcrumbs">
-#set($backStandardMenu = $site.getMenu("back"))
-#if(!$backStandardMenu.empty)
-#includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT)
+#* 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

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm Mon Jul 11 00:16:36 2005
@@ -5,6 +5,9 @@
   #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 tabs navigation component *#
@@ -34,40 +37,71 @@
 #end
 
 #* include links navigation component *#
-#macro (includeLinksNavigation $_menu $_orientation)
+#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+  #if(!$_delimiter || $_delimiter == "")
+    #if($_style != $BREADCRUMBS_STYLE)
+      #set($_delimiter = "&nbsp;")
+    #else
+      #set($_delimiter = "&nbsp;&gt;&gt;&nbsp;")
+    #end
+  #end
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
       <div class="FolderList">
+  #if($_title == $TITLE_FIRST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+    #end
+  #end
   #foreach($element in $_menu.elements.iterator())
     #if($element.elementType == "option")
-      #if($_orientation == $LEFT_TO_RIGHT)
-        <span>
-      #elseif($_orientation == $TOP_TO_BOTTOM)
-        <div>
-      #end
       #set($linkTitle = $element.getTitle($preferedLocale))
       #set($linkName = $element.getShortTitle($preferedLocale))
       #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
-      #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
-          <a href="$linkUrl" title="$!linkTitle">${linkName}</a>		
-      #end
-      #if($_orientation == $LEFT_TO_RIGHT)
-        &nbsp;</span>
-      #elseif($_orientation == $TOP_TO_BOTTOM)
+      #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
+          <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
     #elseif($element.elementType == "separator")
       #set($separatorTitle = $element.getTitle($preferedLocale))
       #set($separatorText = $element.getText($preferedLocale))
       #if($_orientation == $LEFT_TO_RIGHT)
-        <span title="$!separatorTitle">${separatorText}&nbsp;</span>              
+        <span title="$!separatorTitle">${separatorText}${_delimiter}</span>              
       #elseif($_orientation == $TOP_TO_BOTTOM)
         <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
       #end
+    #end
+  #end
+  #if($_title == $TITLE_LAST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
     #end
   #end
       </div>

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm?rev=210076&r1=210075&r2=210076&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm Mon Jul 11 00:16:36 2005
@@ -65,9 +65,14 @@
 #end
       </div>
       <div id="breadcrumbs">
-#set($backStandardMenu = $site.getMenu("back"))
-#if(!$backStandardMenu.empty)
-#includeLinksNavigation($backStandardMenu $LEFT_TO_RIGHT)
+#* 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



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