From 4ad6bcbb812dc0dc091bd1e2f8ce2235fde46eff Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 17 Dec 2018 00:46:24 +0000
Subject: [PATCH] Some minor navigation templates finetuning

git-svn-id: https://svn.libreccm.org/ccm/trunk@5789 8810af33-2d31-482b-a856-94f89814c4df
---
 .../ccm-navigation/navigation/def-atoz.jsp        |  9 +++++++++
 .../navigation/def-portal-welcome.jsp             | 12 ++++++++++--
 .../ccm-navigation/navigation/def-portal.jsp      |  9 +++++++++
 .../ccm-navigation/navigation/def-recent.jsp      |  9 +++++++++
 .../ccm-navigation/navigation/def-welcome.jsp     | 15 +++++++--------
 .../ccm-navigation/navigation/min-atoz.jsp        |  8 ++++++++
 .../ccm-navigation/navigation/min-default.jsp     |  9 +++++++++
 .../ccm-navigation/navigation/min-recent.jsp      |  9 +++++++++
 ...projectlist.jsp => sci-institute-projects.jsp} |  0
 ...-publicationslist.jsp => sci-publications.jsp} |  0
 10 files changed, 70 insertions(+), 10 deletions(-)
 rename ccm-sci-bundle/web/templates/ccm-navigation/navigation/{sci-institute-projectlist.jsp => sci-institute-projects.jsp} (100%)
 rename ccm-sci-bundle/web/templates/ccm-navigation/navigation/{sci-publicationslist.jsp => sci-publications.jsp} (100%)

diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/def-atoz.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-atoz.jsp
index f830f7cbb..52b5c474e 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-atoz.jsp
+++ b/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>
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp
index 1fa53d61a..b1ea0bbf5 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp
+++ b/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");
-      ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
+            portalsPage.setClassAttr("portalPage");
+            ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
         </jsp:scriptlet>
     </define:page>
 
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp
index 9ad4cfb8d..fd2950c9c 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp
+++ b/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>
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/def-recent.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-recent.jsp
index b56f8019f..bcf080440 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-recent.jsp
+++ b/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>
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp
index 40a30764a..967cbea30 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp
+++ b/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();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-    int maxItems = Navigation.getConfig().getIndexPageMaxItems();
+        long age = Navigation.getConfig().getIndexPageCacheLifetime();
+        if (age == 0) {
+          DispatcherHelper.cacheDisable(response);
+        } else {
+          DispatcherHelper.cacheForWorld(response, (int)age);
+        }
+        int maxItems = Navigation.getConfig().getIndexPageMaxItems();
     </jsp:scriptlet>
 
     <define:page name="defaultItemPage" 
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/min-atoz.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/min-atoz.jsp
index 72c1859e4..ef4a2ebba 100755
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/min-atoz.jsp
+++ b/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>
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/min-default.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/min-default.jsp
index 736cf3b93..6b0b17b67 100755
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/min-default.jsp
+++ b/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"
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/min-recent.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/min-recent.jsp
index d1023c9a2..7d5725511 100755
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/min-recent.jsp
+++ b/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>
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-projects.jsp
similarity index 100%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp
rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-projects.jsp
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publicationslist.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publications.jsp
similarity index 100%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publicationslist.jsp
rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publications.jsp