Synchronized with changes in final release 2. 3. 5-01

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

ccm-core/src/log4j2.xml

@@ -45,7 +45,7 @@
       <appenderRef ref="Console"/>
       <appenderRef ref="FileLog" />
     </Logger>
-                                                                                                                                                   43,1          40%
+
     <!-- Set level="DEBUG" to get information JSP file dispatcher      -->
     <Logger name="com.arsdigita.web.ApplicationFileServlet"
             level="ERROR" additivity="false" >

ccm-sci-bundle/CHANGE_LOG

@@ -1,5 +1,9 @@
+2016-04-29
+==========
+New version, now responsive and based on Foundry.
+
+
 2011-09-15:
 ===========
-
 Initial Release, based on ccm-ldn-aplaws which tailors CCM for use by UK
 Local Authorities.

ccm-sci-bundle/bundles/standard/cfg/integration.properties

@@ -1,5 +1,5 @@
 # ##############################################################################
-# Scientific CMS standard bundle integration.properties, version 2.3.x
+# Scientific CMS standard bundle integration.properties, version 2.3.99
 # ##############################################################################
 #
 #
@@ -52,14 +52,14 @@ waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetRes
 ; For new installations and Foundry default theme
 waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
 ; For updates and existing Mandalay based themes:
-#waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-Mandalay-stylesheet-paths.txt
+#waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-mandalay-stylesheet-paths.txt
 
 
 # CORE UI configuration parameters
 # ##############################################################################
-core.ui.pagemap.root_page_url=/portal/
+core.ui.pagemap.root_page_url=/navigation/
 core.ui.pagemap.user_redirect_url=/content-center/
-core.ui.pagemap.workspace_url=/portal/
+core.ui.pagemap.workspace_url=/navigation/
 # With version 2 moved from kernel/security to ui rsp ui.permissions and
 # no longer intended to be user configurable. 
 # TODO CHECK what these URLS (esp. ../one) is used for.
@@ -165,10 +165,9 @@ com.arsdigita.cms.publicpersonalprofile.publications.groups=monographs\:com.arsd
 #com.arsdigita.cms.publicpersonlprofile.publications.groupSplit=20
 com.arsdigita.cms.publicpersonlprofile.publications.groupSplit=1
 com.arsdigita.cms.publicpersonlprofile.publications.pageSize=100
-
+com.arsdigita.cms.publicpersonalprofile.projects.groupSplit=1
 com.arsdigita.cms.publicPersonalProfile.person_type=com.arsdigita.cms.contenttypes.SciMember
 
-com.arsdigita.cms.publicpersonalprofile.projects.groupSplit=1
 
 # AtoZ configuration parameters
 # ##############################################################################

ccm-sci-bundle/bundles/standard/cfg/project.xml

@@ -3,6 +3,7 @@
 <!-- ======================================================================
      project.xml SCI standard - containing only modules used for 
                                  ScientificCMS  standard bundle
+     Stand: April 2019
      ======================================================================= -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  

ccm-sci-bundle/web/WEB-INF/systeminformation.properties

@@ -1,3 +1,3 @@
-version = 2.3.2
+version = 2.3.99
 appname = ScientificCMS
 apphomepage = http://www.scientificcms.org

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-aREADME

@@ -9,5 +9,9 @@ template.txt must be provided and activated in the integrations.properties
 configuration file. 
 
 Naming Convention
-Please, use "sci-" to prefix the name of any added jsp and ensure to include
+Please, use "sci-" to prefix the name of any added generic ScientificCMS jsp 
-the usage comment! 
+and ensure to include the usage comment! 
+
+Please, use "{SITE}-" to prefix the name of any customized jsp, either a new
+one or a modification of an existing one and ensure to include the usage
+comment!

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-memberslist-native-sql-jsp.jsp

@@ -0,0 +1,52 @@
+<!--
+   The ScientificCMS default list of institute members.
+   Sites will probably use a customized index page. 
+
+   ##Title: ScientificCMS Default Institute Members List 
+   ##Descr: Navigation Index Page listing institute members manually adjustable
+   ##Path : /templates/ccm-navigation/navigation/sci-institute-memberslist.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:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="org.apache.log4j.Logger"/>
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="false">
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.navigation.ui.GreetingItem"/>
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.navigation.ui.category.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.cms.scimember.navigation.SciMemberList" />
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
+    </define:page>
+    <show:all/>
+</jsp:root>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-memberslist.jsp

@@ -0,0 +1,56 @@
+<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:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="org.apache.log4j.Logger"/>
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="false">
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.navigation.ui.GreetingItem"/>
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.navigation.ui.category.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>
+
+        <define:component name="itemList"
+                          classname="com.arsdigita.navigation.ui.object.CustomizableObjectList"/>
+        <jsp:scriptlet>
+ 	    ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).addTextFilter("surname", "surname");	    
+ 	    ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).setCustomName("memberList");	    
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.GenericPerson");
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20);
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("surname");	
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("givenname");	
+        </jsp:scriptlet>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
+    </define:page>
+    <show:all/>	
+</jsp:root>

ccm-sci-bundle/web/themes/scicms-default/README.txt

@@ -1,39 +0,0 @@
-This theme is structured as follows:
-
-Directories
------------
-
-conf            Configuration files (see README.txt in this directory for more
-                information
-
-fancybox        Files for the Fancybox script (used to display images and image
-                galleries)
-
-font-awesome    Files from the font-awesome icon font
-
-fonts           Fonts used by the theme
-
-images          Images used by the theme (see README.txt in this directory)
-
-js              JavaScript part of the theme, including jQuery
-
-styles          CSS files of the theme and the Less source files
-
-templates       Templates defining the HTML structure of the output
-
-texts           Localisable texts of the theme
-
-user            Custom extensions for the Foundry theme engine for this theme
-
-Files in the root of the theme
-------------------------------
-
-start.xsl   Entry point for the theme manager. Do not delete or alter this
-            file!
-
-admin-index.xsl                 -+    
-ccm-admin-application-index.xsl  |----Entry points for legacy configurations
-content-center-index.xsl         |
-content-section-admin.xsl       -+
-
-

ccm-sci-bundle/web/themes/scicms-default/conf/README.txt

@@ -1,7 +0,0 @@
-The files in this directory control several aspects of the theme. The most
-important ones are the templates.xml file and the css-files.xml file.
-
-The templates.xml file controls which templates from the templates directory
-are used to create the HTML output for a page. 
-
-The css-files.xml file controls which CSS files are used.

ccm-sci-bundle/web/themes/scicms-default/styles/README.txt

@@ -4,9 +4,8 @@ files are also included.
 
 If you want to customise the stylesheet we strongly recommanded to use Less. 
 
-To customise to styles make a copy of the Less file(s) you want to customize
+to customise to styles make a copy of the Less file(s) you want to customize
-and create a new configuration file pointing to your files in conf (see
+and create a new configuration file pointing to your files in conf.
-README.txt in conf).
 
 To make editing of the Less file(s) 
 easier this theme also includes the Less compiler in the development mode. For