Some minor navigation templates finetuning

git-svn-id: https://svn.libreccm.org/ccm/trunk@5789 8810af33-2d31-482b-a856-94f89814c4df

ccm-navigation/web/templates/ccm-navigation/navigation/def-atoz.jsp

@@ -28,6 +28,15 @@
       classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
       classname="com.arsdigita.navigation.ui.category.Menu"/>
+
+    // Used by responsive mobile navigation menu
+    <define:component name="categoryNav"
+                      classname="com.arsdigita.navigation.ui.category.Hierarchy">
+    </define:component>
+    <jsp:scriptlet>
+                ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+    </jsp:scriptlet>
+
     <define:component name="itemList"
       classname="com.arsdigita.navigation.ui.object.AtoZObjectList"/>
     <jsp:scriptlet>

ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp

@@ -35,11 +35,19 @@
                           classname="com.arsdigita.navigation.ui.category.Path"/>
         <define:component name="categoryMenu"
                           classname="com.arsdigita.navigation.ui.category.Menu"/>
+        // optional: mobile responsive menu
+        <define:component name="categoryNav"
+                      classname="com.arsdigita.navigation.ui.category.Hierarchy">
+        </define:component>
+        <jsp:scriptlet>
+                ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+        </jsp:scriptlet>
+
         <define:component name="portalWorkspace"
                           classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
         <jsp:scriptlet>
-        portalsPage.setClassAttr("portalPage");
+            portalsPage.setClassAttr("portalPage");
-      ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
+            ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
         </jsp:scriptlet>
     </define:page>
 

ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp

@@ -35,6 +35,15 @@
                           classname="com.arsdigita.navigation.ui.category.Path"/>
         <define:component name="categoryMenu"
                           classname="com.arsdigita.navigation.ui.category.Menu"/>
+
+        // optional for usage by mobile version of responsive navigation menu
+        <define:component name="categoryNav"
+                      classname="com.arsdigita.navigation.ui.category.Hierarchy">
+        </define:component>
+        <jsp:scriptlet>
+                ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+        </jsp:scriptlet>
+
         <define:component name="portalWorkspace"
                           classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
         <jsp:scriptlet>

ccm-navigation/web/templates/ccm-navigation/navigation/def-recent.jsp

@@ -30,6 +30,15 @@
       classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
       classname="com.arsdigita.navigation.ui.category.Menu"/>
+
+    // optional: mobile navigation menu in responsive design
+    <define:component name="categoryNav"
+                      classname="com.arsdigita.navigation.ui.category.Hierarchy">
+    </define:component>
+    <jsp:scriptlet>
+                ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+    </jsp:scriptlet>
+
     <define:component name="itemList"
       classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
     <jsp:scriptlet>

ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp

@@ -13,14 +13,13 @@
     <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
     <jsp:scriptlet>
-
+        long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+        if (age == 0) {
-    if (age == 0) {
+          DispatcherHelper.cacheDisable(response);
-      DispatcherHelper.cacheDisable(response);
+        } else {
-    } else {
+          DispatcherHelper.cacheForWorld(response, (int)age);
-      DispatcherHelper.cacheForWorld(response, (int)age);
+        }
-    }
+        int maxItems = Navigation.getConfig().getIndexPageMaxItems();
-    int maxItems = Navigation.getConfig().getIndexPageMaxItems();
     </jsp:scriptlet>
 
     <define:page name="defaultItemPage" 

ccm-navigation/web/templates/ccm-navigation/navigation/min-atoz.jsp

@@ -28,6 +28,14 @@
       classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
       classname="com.arsdigita.navigation.ui.category.Menu"/>
+
+    // Used by responsive mobile navigation menu 
+    <define:component name="categoryNav"
+                      classname="com.arsdigita.navigation.ui.category.Hierarchy"/>
+    <jsp:scriptlet>
+                ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+    </jsp:scriptlet>
+
     <define:component name="itemList"
       classname="com.arsdigita.navigation.ui.object.AtoZObjectList"/>
     <jsp:scriptlet>

ccm-navigation/web/templates/ccm-navigation/navigation/min-default.jsp

@@ -42,6 +42,15 @@
       classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
       classname="com.arsdigita.navigation.ui.category.Menu"/>
+
+    // Used by responsive mobile navigation menu
+    <define:component name="categoryNav"
+                      classname="com.arsdigita.navigation.ui.category.Hierarchy">
+    </define:component>
+    <jsp:scriptlet>
+                ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+    </jsp:scriptlet>
+
     <define:component name="itemList"
       classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
     <define:component name="applicationList"

ccm-navigation/web/templates/ccm-navigation/navigation/min-recent.jsp

@@ -28,6 +28,15 @@
       classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
       classname="com.arsdigita.navigation.ui.category.Menu"/>
+
+    // Used by responsive mobile navigation menu
+    <define:component name="categoryNav"
+                      classname="com.arsdigita.navigation.ui.category.Hierarchy">
+    </define:component>
+    <jsp:scriptlet>
+                ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+    </jsp:scriptlet>
+
     <define:component name="itemList"
       classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
     <jsp:scriptlet>