From 2bc410e77303dc56a414d5846e1e3163b11bf724 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 8 Apr 2019 08:34:53 +0000
Subject: [PATCH] Synchronized with changes in final release 2. 3. 5-01
 (navigation templates adjusted)

git-svn-id: https://svn.libreccm.org/ccm/trunk@5935 8810af33-2d31-482b-a856-94f89814c4df
---
 .../templates/ccm-navigation/navigation/def-atoz.jsp  |  3 ++-
 .../ccm-navigation/navigation/def-events.jsp          |  2 ++
 .../templates/ccm-navigation/navigation/def-page.jsp  |  4 +++-
 .../ccm-navigation/navigation/def-welcome.jsp         | 11 +++++++++--
 4 files changed, 16 insertions(+), 4 deletions(-)

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 52b5c474e..407f1ff14 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-atoz.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-atoz.jsp
@@ -17,6 +17,7 @@
     } else {
       DispatcherHelper.cacheForWorld(response, (int)age);
     }
+    int maxItems = Navigation.getConfig().getIndexPageMaxItems();
   </jsp:scriptlet>
 
   <define:page name="atozItemPage" application="navigation"
@@ -47,7 +48,7 @@
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().addOrder("title");
       
-      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(20);
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(maxItems);
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "definition");
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/def-events.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-events.jsp
index b3de04594..28af8f77b 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-events.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-events.jsp
@@ -25,6 +25,7 @@
     } else {
       DispatcherHelper.cacheForWorld(response, (int)age);
     }
+    int maxItems = Navigation.getConfig().getIndexPageMaxItems();
   </jsp:scriptlet>
 
   <define:page name="defaultItemPage" application="navigation"
@@ -76,6 +77,7 @@
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true);
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate");
 
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(maxItems);
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType");
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title");
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead");
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/def-page.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-page.jsp
index cb28a8f2a..8940e7247 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-page.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-page.jsp
@@ -27,6 +27,7 @@
       } else {
         DispatcherHelper.cacheForWorld(response, (int)age);
       }
+      int maxItems = Navigation.getConfig().getIndexPageMaxItems();
     </jsp:scriptlet>
 
     <define:page name="defaultItemPage" application="navigation"
@@ -60,13 +61,14 @@
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
       
-          ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+          ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(maxItems);
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
+          ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "launchDate");
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
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 967cbea30..64e89a1b8 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp
@@ -1,11 +1,18 @@
+<!-- 
+   The JSP template for the welcome / start page using navigation 
+
+   ##Title: Default Content Items Page 
+   ##Descr: Site start (landing) page created by navigationNavigation ordering 
+            items in ascending order, manually adjustable and adding News and 
+            Events lists
+   ##Path : /templates/ccm-navigation/navigation/def-welcome.jsp
+-->
 <jsp:root 
      xmlns:jsp="http://java.sun.com/JSP/Page"
   xmlns:define="/WEB-INF/bebop-define.tld"
     xmlns:show="/WEB-INF/bebop-show.tld"
        version="1.2">
 
-  <!-- JSP template for the welcome / start page using navigation -->
-
     <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
     <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
     <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>