Backport r4260: fixed stylesheet-path inconsistencies, added documentation.

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

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

@@ -52,7 +52,10 @@ waf.search.indexer=lucene
 # ##############################################################################
 ; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+; 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
 
 
 # CORE UI configuration parameters
@@ -84,8 +87,10 @@ waf.workflow.simple.alerts_sender=root@localhost.localdomain
 
 # CORE XML processing configuration parameters
 # ##############################################################################
-waf.xml.xsl_transformer=saxonhe
 waf.xml.activate_full_date_formatter=true
+; For new installations and Foundry default theme
+waf.xml.xsl_transformer=saxonhe
+; For updates and existing Mandalay based themes:
 
 
 
@@ -116,6 +121,7 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 
 com.arsdigita.cms.disable_item_pfs=true
+com.arsdigita.cms.delete_workflow_after_publication=false
 
 com.arsdigita.cms.hide_admin_tabs=true
 com.arsdigita.cms.hide_folder_index_checkbox=true
@@ -134,9 +140,9 @@ com.arsdigita.cms.unpublished_not_found=false
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
 
-com.arsdigita.cms.delete_workflow_after_publication=false
 
 # ccm-cms-types-event parameters
+# ##############################################################################
 com.arsdigita.cms.contenttypes.event.hide_cost=true
 com.arsdigita.cms.contenttypes.event.hide_date_description=false
 com.arsdigita.cms.contenttypes.event.hide_event_type=true

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

@@ -1,5 +1,5 @@
 # ##############################################################################
-# Scientific CMS standard bundle integration.properties, version 2.0.x
+# Scientific CMS standard bundle integration.properties, version 2.3.x
 # ##############################################################################
 #
 #

ccm-sci-bundle/src/WEB-INF/resources/scientificCMS-Mandalay-stylesheet-paths.txt

@@ -0,0 +1,60 @@
+# -*- text -*-
+# This file locates stylesheets, if you are using the
+# "PatternStylesheetResolver". Please read the Javadoc for that file for
+# the full story.
+
+# Currently the "resource" part is actually "short-circuited", see 
+# Templating#transformURL(url). As long as we store and synchronize all theme
+# files in each server's local file system, we use the direct file apprach to
+# avoid unnecessary http request and traffic between client (user) and server!
+# Additionally all modules are installed into one webapp context, so the
+# webapp tag is redundant, but sort of required by some part of the code.
+
+
+# Theme with single entry point (e.g Foundry, Mandalay) managed by themedirector
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/start.xsl
+
+
+# Theme with single entry point (e.g Foundry) unmanaged optional custom default
+http://::host::/::webapp::/themes/scicms-custom/start.xsl
+
+# Theme with single entry point (here: Foundry) unmanaged bundle specific default
+#http://::host::/::webapp::/themes/scicms-default/start.xsl
+
+# Theme with single entry point backwards compatible (Mandalay) unmanaged default
+http://::host::/::webapp::/themes/mandalay/start.xsl
+
+
+
+
+# ==============================================================================
+# The following is for multi-entry themes, not used in ScientificCMS
+# ==============================================================================
+
+# Output type is for things such as text/javascript
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
+
+# Grabs custom item xsl for CMS
+#http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
+
+# Theme, with optional locale & prefix
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+
+# Theme, with optional locale
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+
+# APLAWS generic default, with locale and prefix
+# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
+
+# APLAWS generic default, with locale
+# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
+# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.xsl
+
+# Global default, from application's own web app
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl

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

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

ccm-sci-bundle/web/templates/ccm-navigation/navigation/SpecializingList.jsp

@@ -28,6 +28,14 @@
                           classname="com.arsdigita.navigation.ui.category.Path"/>
         <define:component name="categoryMenu"
                           classname="com.arsdigita.navigation.ui.category.Menu"/>
+        // Navigation menu for mobile devices (responsive)
+        <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.ComplexObjectList"/>
         <jsp:scriptlet>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp

@@ -28,6 +28,14 @@
                           classname="com.arsdigita.navigation.ui.category.Path"/>
         <define:component name="categoryMenu"
                           classname="com.arsdigita.navigation.ui.category.Menu"/>
+        // Menu for mobile responsive version
+        <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.SimpleObjectList"/>
         <jsp:scriptlet>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp

@@ -28,6 +28,15 @@
       classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
       classname="com.arsdigita.navigation.ui.category.Menu"/>
+    // Menu for mobile (responsive) Version theme UniHB
+    <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="eventList"
       classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
     <jsp:scriptlet>
@@ -37,7 +46,10 @@
 
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
 
-      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings          // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.                    // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.                        // Komplizierter geht's wohl nicht mehr.
+      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
+      // abstract. Deshalb muss man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.
+      // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.
+      // Komplizierter geht's wohl nicht mehr.
       java.util.GregorianCalendar now = new java.util.GregorianCalendar();
       java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR),
                                                               now.get(java.util.GregorianCalendar.MONTH),

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp

@@ -32,7 +32,6 @@
                           classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
         <jsp:scriptlet>
         portalsPage.setClassAttr("portalPage");
-
       ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
         </jsp:scriptlet>
     </define:page>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-recent.jsp

@@ -10,6 +10,8 @@
   <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
   <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
+  <!-- ScientificCMS default template for a list of items ordered with most recent first -->
+  
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
     if (age == 0) {

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp

@@ -14,9 +14,6 @@
 
     <jsp:scriptlet>
 
-    defaultItemPage.setClassAttr("welcomePage");
-    
-
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
     if (age == 0) {
       DispatcherHelper.cacheDisable(response);
@@ -36,6 +33,15 @@
                           classname="com.arsdigita.navigation.ui.category.Path"/>
         <define:component name="categoryMenu"
                           classname="com.arsdigita.navigation.ui.category.Menu"/>
+        // Navigation Menu mobile (responsive) version (theme UniHB and others)
+        <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.SimpleObjectList"/>
         <jsp:scriptlet>
@@ -55,6 +61,7 @@
             ((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");
@@ -63,6 +70,7 @@
             ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "imageAttachments.image.id");
             ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "pageDescription");
         </jsp:scriptlet>
+        
         <define:component name="eventList"
                           classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
         <jsp:scriptlet>
@@ -104,13 +112,14 @@
             ((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");
-      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate");
             ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate");
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate");
             ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate");
             ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate");
             ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute( "imageAttachments.caption");
             ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute( "imageAttachments.image.id");
         </jsp:scriptlet>
+ 
         <define:component name="newsList"
                           classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
         <jsp:scriptlet>

ccm-sci-bundle/web/themes/scicms-custom/aREADME.custom

@@ -0,0 +1,6 @@
+ScientificCMS theme with single entry point (e.g. Foundry) 
+unmanaged optional custom specific default.
+It is used if there is no managed theme (managed by themedirector) configured 
+or if themedirector is not installed.
+If there is no custom theme installed, a bundle specific unmanged default
+(scicms-default) is used.

ccm-sci-bundle/web/themes/scicms-default/aREADME.scicms-default

@@ -0,0 +1,6 @@
+ScientificCMS bundle default unmanaged theme (with single entry point as of
+Foundry).
+It is used if there is no managed theme (managed by themedirector) configured 
+(or if themedirector is not installed) and no custom theme (see scicms-custom)
+installed.
+It is part of ScientificCMS basic distribution.