Synchronized with release 2.3.5 final

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

ccm-ldn-aplaws/bundles/compatible/cfg/integration.properties

@@ -58,6 +58,11 @@ waf.search.indexer=lucene
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
 ; For new installations and Foundry default theme
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
+; For updates and existing Mandalay based themes:
+#waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-mandalay-stylesheet-paths.txt
+; For updates from 1.0.4 multientry based themes:
+#waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-multientry-stylesheet-paths.txt
+
 
 # CORE UI configuration parameters
 # ##############################################################################
@@ -90,7 +95,7 @@ waf.workflow.simple.alerts_sender=root@localhost.localdomain
 # ##############################################################################
 waf.xml.activate_full_date_formatter=true
 ; For new installations and Foundry default theme
-waf.xml.xsl_transformer=saxonhe
+#waf.xml.xsl_transformer=saxonhe
 ; For updates and existing Mandalay based themes:
 waf.xml.xsl_transformer=xalan
 
@@ -168,6 +173,7 @@ com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 # ##############################################################################
 
 
+
 # AtoZ configuration parameters
 # ##############################################################################
 com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker

ccm-ldn-aplaws/bundles/compatible/cfg/project.xml

@@ -16,9 +16,9 @@
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
                ccmVersion="6.1" 
                name="aplaws" 
-               prettyName="APLAWS plus Standard compatible Spin"
+               prettyName="APLAWS plus 1.0.4 Standard compatible Spin"
                version="2.3.99" 
-               release="stdcomp-r5397"
+               release="stdcomp"
                webxml="web.xml" 
                portletxml="portlet.xml" 
                webapp="ROOT"

ccm-ldn-aplaws/bundles/complete/cfg/project.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- ======================================================================
-     project.xml - COMPLETE - containing a nearly complete set of modules
+     project.xml - (ldn)COMPLETE - containing a complete set of modules
-     of the current aplaws repository.
+     of the current aplaws repository compatible to trhe 1.0.4 complete set.
      DEPRECATED!  DON'T USE for new installations!
      Last checked: 2018-12
      ======================================================================= -->
@@ -11,9 +11,9 @@
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
                ccmVersion="6.1" 
                name="aplaws" 
-               prettyName="APLAWS plus Complete Bundle" 
+               prettyName="APLAWS plus Complete backwards compatible Bundle" 
                version="2.3.99" 
-               release="compl-r5397"
+               release="compl-rxxxx"
                webxml="web.xml" 
                portletxml="portlet.xml" 
                webapp="ROOT" 

ccm-ldn-aplaws/bundles/devel/cfg/integration.properties

@@ -1,5 +1,5 @@
 # ##############################################################################
-# APLAWS+ devel bundle integration.properties, version 2.3.x
+# APLAWS+ devel bundle integration.properties, version 2.3.99
 # Main purpose is to ensure compatibility among all CCM packages and to provide
 # Add On packages.
 # ##############################################################################
@@ -59,15 +59,23 @@ waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetRes
 ; For new installations and Foundry default theme
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
 ; For updates and existing Mandalay based themes:
-#waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-Mandalay-stylesheet-paths.txt
+#waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-mandalay-stylesheet-paths.txt
+; For updates from 1.0.4 multientry based themes:
+#waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-multientry-stylesheet-paths.txt
 
 
 # CORE UI configuration parameters
 # ##############################################################################
-core.ui.pagemap.root_page_url=/portal/
+# portal is not supported by the current Foundry theme. Use navigation insted
+# and select navigation-welcome for the landing page.
+#core.ui.pagemap.root_page_url=/portal/
+core.ui.pagemap.root_page_url=/navigation/
+core.ui.pagemap.workspace_url=/navigation/
+#
+# modified!
 #core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
 core.ui.pagemap.user_redirect_url=/content-center/
-core.ui.pagemap.workspace_url=/portal/
+;core.ui.pagemap.workspace_url=/portal/
 # 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.
@@ -95,7 +103,7 @@ 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:
-#waf.xml.xsl_transformer=
+#waf.xml.xsl_transformer=xalan
 
 
 # CMS configuration parameters
@@ -212,6 +220,8 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 themedirector.default_theme_manifest=ccm-ldn-aplaws.web.mf
 # Required to denote the dir containing the default theme!
 themedirector.default_theme_path=themes/aplaws-default
+# For version 1.0.4 compatible theme:
+;themedirector.default_theme_path=themes/static/aplaws
 
 # LDN-SEARCH application
 # ##############################################################################
@@ -228,6 +238,7 @@ auth.http.admin_identifier=webmaster
 # ##############################################################################
 com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
+
 # LDN bundle integration package configuration parameters
 # ##############################################################################
 # ccm-ldn-aplaws (Loader only)

ccm-ldn-aplaws/bundles/devel/cfg/project.xml

@@ -5,6 +5,7 @@
      repository. It is specifically for developers to help them to make
      every module deployable and to create the distribution.
      It is NOT a production grade bundle!
+     Additionallyitis used to create the itmes of the ADD ONS packages
      ======================================================================= -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -13,7 +14,7 @@
                     name="aplaws"
               prettyName="APLAWS plus (devel)"
                  version="2.3.99" 
-                 release="dev-SNAPSHOT-r5758" 
+                 release="dev-SNAPSHOT-rxxxx" 
                   webxml="web.xml"
               portletxml="portlet.xml"
                   webapp="ROOT"
@@ -42,12 +43,10 @@
         <ccm:application name="ccm-cms-types-article"/>
 
 <!--   Applications   -->
-        <ccm:application name="ccm-atoz"/>  <!-- part of (default) theme -->
         <ccm:application name="ccm-navigation"/>
         <!-- ccm-portalworkspace depends on ccm-subsite  -
              in class ui.PortletTypeForm                 -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-rssfeed"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>
         <ccm:application name="ccm-themedirector"/>
@@ -78,20 +77,25 @@
 
 <!--   Standard Bundle's  Content Types   -->
         <ccm:application name="ccm-cms-types-bookmark"/>
+        <ccm:application name="ccm-cms-types-decisiontree"/>
         <ccm:application name="ccm-cms-types-event"/>
+        <ccm:application name="ccm-cms-types-externallink"/>
         <ccm:application name="ccm-cms-types-faqitem"/>
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
        <ccm:application name="ccm-cms-types-glossaryitem"/>
-         <ccm:application name="ccm-cms-types-inlinesite"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
+        <ccm:application name="ccm-cms-types-person"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 
 <!--   Standard Bundle's  Applications   -->
         <ccm:application name="ccm-forum"/>     
+        <ccm:application name="ccm-cms-personalcontentcomponent"/>
+        <ccm:application name="ccm-cms-publicpersonalprofile"/>
+        <ccm:application name="ccm-rssfeed"/>
 
 <!--   Standard Bundle's  LDN extensions  -->
         <ccm:application name="ccm-ldn-atoz"/> 

ccm-ldn-aplaws/bundles/standard/cfg/integration.properties

@@ -55,6 +55,10 @@ waf.search.indexer=lucene
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
 ; For new installations and Foundry default theme
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
+; For updates and existing Mandalay based themes:
+#waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-mandalay-stylesheet-paths.txt
+; For updates from 1.0.4 multientry based themes:
+#waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-multientry-stylesheet-paths.txt
 
 
 # CORE UI configuration parameters
@@ -89,7 +93,7 @@ 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:
-waf.xml.xsl_transformer=xalan
+#waf.xml.xsl_transformer=xalan
 
 
 # CMS configuration parameters
@@ -165,6 +169,7 @@ com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 # ##############################################################################
 
 
+
 # AtoZ configuration parameters
 # ##############################################################################
 com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
@@ -205,7 +210,9 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 # a new theme! (In addition to default_theme_path. Otherwise no files are copied!
 themedirector.default_theme_manifest=ccm-ldn-aplaws.web.mf
 # Required to denote the dir containing the default theme!
-themedirector.default_theme_path=themes/static/aplaws
+themedirector.default_theme_path=themes/aplaws-default
+# For version 1.0.4 compatible theme:
+;themedirector.default_theme_path=themes/static/aplaws
 
 # LDN-SEARCH application
 # ##############################################################################

ccm-ldn-aplaws/bundles/standard/cfg/project.xml

@@ -83,7 +83,7 @@
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
-        <ccm:application name="ccm-cms-types-inlinesite"/>
+        <ccm:application name="ccm-cms-types-glossaryitem"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
         <ccm:application name="ccm-cms-types-person"/>
@@ -94,7 +94,6 @@
         <ccm:application name="ccm-atoz"/>  <!-- part of (default) theme -->
         <ccm:application name="ccm-cms-personalcontentcomponent"/>
         <ccm:application name="ccm-cms-publicpersonalprofile"/>
-        <ccm:application name="ccm-forum"/>     
         <ccm:application name="ccm-rssfeed"/>
 
 <!--   Standard Bundle's  LDN extensions  -->
@@ -119,8 +118,8 @@
 <!--    <ccm:application name="ccm-cms-types-agenda"/>                -->
 <!--    <ccm:application name="ccm-cms-types-bookmark"/>              -->
 <!--    <ccm:application name="ccm-cms-types-faqitem"/>               -->
-<!--    <ccm:application name="ccm-cms-types-glossaryitem"/>          -->
 <!--    <ccm:application name="ccm-cms-types-image"/>                 -->
+<!--    <ccm:application name="ccm-cms-types-inlinesite"/>            -->
 <!--    <ccm:application name="ccm-cms-types-job"/>                   -->
 <!--    <ccm:application name="ccm-cms-types-legalnotice"/>           -->
 <!--    <ccm:application name="ccm-cms-types-minutes"/>               -->
@@ -133,11 +132,12 @@
 <!--    Add-On  Applications                                                 -->
 <!--    <ccm:application name="ccm-atoz-siteproxy"/>                  -->
 <!--    <ccm:application name="ccm-auth-http"/>                       -->
-<!--    <ccm:application name="ccm-forum-categorised"/>               -->
         <!--
         <ccm:application name="ccm-bookmarks"/>
         <ccm:application name="ccm-docrepo"/>
         <ccm:application name="ccm-faq"/>
+        <ccm:application name="ccm-forum"/>
+        <ccm:application name="ccm-forum-categorised"/>
         -->
 
 
@@ -157,7 +157,7 @@
 <!--    compatibility.                                                       -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
-        <!--  Without known funcionality                                    
+        <!--  Without known functionality
                DON't use it in a new installation!                           -->
         <!-- <ccm:application name="ccm-formbuilder-pdf"/>       -->
 

ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-mandalay-stylesheet-paths.txt

@@ -0,0 +1,58 @@
+# -*- 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/aplaws-mandalay/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 APLAWS version 2 and newer
+# ===============================================================================
+
+# 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-ldn-aplaws/src/WEB-INF/resources/aplaws-multientry-stylesheet-paths.txt

@@ -0,0 +1,88 @@
+# -*- 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/Mandaly) 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 distribution default
+# Provides optionally a distribution / bundle specific default theme. It it
+# is empty foundry-base is used as fall-back.
+#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+http://::host::/::webapp::/themes/aplaws-default/start.xsl
+
+# Theme with single entry point (e.g Foundry) unmanaged fallback
+# Provides a very basic Foundry theme
+#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+http://::host::/::webapp::/themes/foundry-base/start.xsl
+
+# ===========================================================
+# Entry point for new theme only for content center and admin
+# ===========================================================
+
+http://::host::/::webapp::/themes/foundry-base/::application::-::url::.xsl
+
+
+
+# ==============================================================================
+# The following is for multi-entry themes, the traditional way in APLAWS
+# Deprecated, retained for backwards compatibility to old existing custom themes.
+# ==============================================================================
+
+# Output type is for things such as text/javascript stored in tradition default theme
+#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
+http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
+http://::host::/::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, managed by themedirector, 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
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+
+# Theme managed by themedirector, with optional locale (without prefix)
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+
+# APLAWS default, with locale and prefix
+#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl
+#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::-::prefix::.xsl
+#http://::host::/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host:://ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl
+
+# APLAWS generic default, with locale (without prefix)
+#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::locale::.xsl
+#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::.xsl
+#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::-::locale::.xsl
+#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::.xsl
+#http://::host::/::webapp::/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl
+#http://::host::/::webapp::/__ccm__/themes/aplaws/::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
+http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
+

ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt

@@ -32,57 +32,3 @@ http://::host::/::webapp::/themes/foundry-base/start.xsl
 
 http://::host::/::webapp::/themes/foundry-base/::application::-::url::.xsl
 
-
-
-# ==============================================================================
-# The following is for multi-entry themes, the traditional way in APLAWS
-# Deprecated, retained for backwards compatibility to old existing custom themes.
-# ==============================================================================
-
-# Output type is for things such as text/javascript stored in tradition default theme
-#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
-#http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
-#http://::host::/::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, managed by themedirector, 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
-#http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-#http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
-
-# Theme managed by themedirector, with optional locale (without prefix)
-#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
-#http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-#http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
-
-# APLAWS default, with locale and prefix
-#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::-::locale::.xsl
-#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::.xsl
-#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl
-#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl
-#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::-::prefix::-::locale::.xsl
-#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::-::prefix::.xsl
-#http://::host::/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl
-#http://::host:://ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl
-
-# APLAWS generic default, with locale (without prefix)
-#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::locale::.xsl
-#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::.xsl
-#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl
-#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::.xsl
-#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::-::locale::.xsl
-#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::.xsl
-#http://::host::/::webapp::/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl
-#http://::host::/::webapp::/__ccm__/themes/aplaws/::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
-#http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
-#http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
-

ccm-ldn-aplaws/web/themes/aplaws-default/README.txt

@@ -3,7 +3,7 @@ This theme is structured as follows:
 Directories
 -----------
 
-conf            Configuration files (see README.txt in this directory for more
+conf            Configuration files (see _aREADME_.txt in this directory for more
                 information
 
 fancybox        Files for the Fancybox script (used to display images and image
@@ -36,4 +36,8 @@ ccm-admin-application-index.xsl  |----Entry points for legacy configurations
 content-center-index.xsl         |
 content-section-admin.xsl       -+
 
+Before you can use this theme, you have to do some preparatory measures. It
+supports several variants and you have to select and to prepare a specific
+variant to use. See the README files in conf, images, and texts!
+
 

ccm-ldn-aplaws/web/themes/aplaws-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-ldn-aplaws/web/themes/aplaws-default/conf/_aREADME_.txt

@@ -0,0 +1,16 @@
+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.
+
+Usually, you don't need to make any adjustments here!
+
+
+The css-files.xml file controls which CSS files are used. The theme supports
+different graphical (in terms of color, fonts, etc) variants.
+
+For this theme, these variants are configured in the style directory!
+
+So, usually you will not made any adjustments in this directory! 

ccm-ldn-aplaws/web/themes/aplaws-default/conf/css-files-aplaws.xml

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file controls which CSS files are included for which application.
-    For more details please refer to the Foundry documentation which should
-    available at $address-of-your-ccm-installation/themes/foundry/doc/index.jsp
-    
-    If you only provide a file (a path without a slash in it) Foundry expects
-    the css file to be found in the styles directory. If you provide a path
-    with at least one slash in it Foundry uses that relative to the themes root
-    directory.
-    
-    For example the file public.css is expected to be found at 
-    styles/public.css. The file /bootstrap/css/bootstrap.min.css is expected to
-    be found at bootstrap/css/bootstrap.min.css.
-    
-    If you want to limit the CSS file to a specific media type you can use the 
-    media attribute. In that case, the file is expected in the sub folder
-    of the styles folder with the name of the media type. For example
-    
-    <css-file media="screen">portal.css</css-file>
-    
-    In this case Foundry expects to find the portal.css file at 
-    styles/screen/portal.css.
-    
-    If you want to use the Less style language you can also set the attribute
-    less to true. If the also set the setting less-onthefly in conf/global.xml
-    to true, Foundry will include the Less JavaScript file and transform the
-    Less file on the fly to CSS if your are in the debug/development mode. If 
-    you enable this feature you have to provide the filename without the 
-    extension. Foundry will add the extension depending if the theme is viewed
-    in development or producation mode. In development mode, .less is added, in 
-    producation mode .css.
-    
-    The last attribute is the origin attribute. If set to internal the CSS
-    file is not loaded from the theme but from Foundry itself. In this theme
-    this feature is used for the CSS file for the admin applications.
--->
-<css-files>
-    <!-- CSS file used for admin applications like the Content Centre -->
-    <application name="admin">
-        <css-file origin="internal">admin.css</css-file>
-    </application>
-    <application name="login">
-        <!-- CSS file used for the Login application -->
-        <css-file origin="internal">admin.css</css-file>
-    </application>
-    <application name="navigation">
-        <!-- 
-            Include CSS files for the navigation application. For our own
-            CSS file we are using the Less stylesheet language as described 
-            above.
-        -->
-        <css-file>fancybox/jquery.fancybox.css?v=2.1.5</css-file>
-        <css-file>fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.5</css-file>
-        <css-file>fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7</css-file>
-        <css-file>font-awesome/css/font-awesome.min.css</css-file>
-        <css-file less="true">aplaws</css-file>
-    </application>
-    <application name="navigation" class="portalGridPage">
-        <!-- 
-            For a portalGridPage we use the same CSS files as for normal 
-            navigation pages, but add the portal.css file.
-        -->
-        <css-file>fancybox/jquery.fancybox.css?v=2.1.5</css-file>
-        <css-file>fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.5</css-file>
-        <css-file>fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7</css-file>
-        <css-file>font-awesome/css/font-awesome.min.css</css-file>
-        <css-file media="screen">portal.css</css-file>
-        <css-file less="true">aplaws</css-file>
-    </application>
-    <application name="none" class="cms-admin">
-        <!-- Other admin applications -->
-        <css-file origin="internal">admin.css</css-file>
-    </application>
-    <application name="portal">
-        <!-- Portal pages -->
-        <css-file>fancybox/jquery.fancybox.css?v=2.1.5</css-file>
-        <css-file>fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.5</css-file>
-        <css-file>fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7</css-file>
-        <css-file>font-awesome/css/font-awesome.min.css</css-file>
-        <css-file origin="internal">portal.css</css-file>
-        <css-file less="true">aplaws</css-file>
-    </application>
-    <default>
-        <!-- 
-            If there is no entry for the current application we load the 
-            default CSS files and our own.
-        -->
-        <css-file>fancybox/jquery.fancybox.css?v=2.1.5</css-file>
-        <css-file>fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.5</css-file>
-        <css-file>fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7</css-file>
-        <css-file>font-awesome/css/font-awesome.min.css</css-file>
-        <css-file less="true">aplaws</css-file>
-    </default>
-</css-files>

ccm-ldn-aplaws/web/themes/aplaws-default/conf/css-files.xml

@@ -54,7 +54,7 @@
         <css-file>fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.5</css-file>
         <css-file>fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7</css-file>
         <css-file>font-awesome/css/font-awesome.min.css</css-file>
-        <css-file less="true">aplaws</css-file>
+        <css-file less="true">style</css-file>
     </application>
     <application name="navigation" class="portalGridPage">
         <!-- 
@@ -66,7 +66,7 @@
         <css-file>fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7</css-file>
         <css-file>font-awesome/css/font-awesome.min.css</css-file>
         <css-file media="screen">portal.css</css-file>
-        <css-file less="true">aplaws</css-file>
+        <css-file less="true">style</css-file>
     </application>
     <application name="none" class="cms-admin">
         <!-- Other admin applications -->
@@ -79,7 +79,7 @@
         <css-file>fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7</css-file>
         <css-file>font-awesome/css/font-awesome.min.css</css-file>
         <css-file origin="internal">portal.css</css-file>
-        <css-file less="true">aplaws</css-file>
+        <css-file less="true">style</css-file>
     </application>
     <default>
         <!-- 
@@ -90,6 +90,6 @@
         <css-file>fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.5</css-file>
         <css-file>fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7</css-file>
         <css-file>font-awesome/css/font-awesome.min.css</css-file>
-        <css-file less="true">aplaws</css-file>
+        <css-file less="true">style</css-file>
     </default>
 </css-files>

ccm-ldn-aplaws/web/themes/aplaws-default/conf/global.xml

@@ -17,6 +17,6 @@
 
     <setting id="log-level">warn</setting>
 
-    <setting id="site-logo">images/cms-logo.png</setting>
+    <setting id="site-logo">images/site-logo.png</setting>
 
 </foundry:configuration>

ccm-ldn-aplaws/web/themes/aplaws-default/conf/templates.xml

@@ -17,7 +17,6 @@
         <application name="login" origin="internal">admin-layout.xml</application>
         <application name="navigation" class="portalPage">portal-workspace.xml</application>
         <application name="navigation" class="portalGridPage">portal-workspace-grid.xml</application>
-        <!--<application name="navigation" class="simplePage">nav-default.xml</application>-->
         <application name="navigation" class="simplePage">navigation.xml</application>
         <application name="navigation" class="sitemapPage">sitemap.xml</application>
         <application name="navigation" class="welcomePage">welcome.xml</application>
@@ -273,8 +272,7 @@
     </content-items>
     
     <!-- 
-        These entries control which template is used to display a which portlet
+        These entries control which xml template is used by the various portlet types.
-        type.
      -->
     <portlets>
         <portlet class="com.arsdigita.cms.ui.portlet.ContentItemPortletRenderer">

ccm-ldn-aplaws/web/themes/aplaws-default/fonts/_README_

@@ -1 +1 @@
-This directory contains fonts used by the theme
+This directory contains fonts used by the theme.

ccm-ldn-aplaws/web/themes/aplaws-default/images/README.txt

@@ -0,0 +1,8 @@
+This directory contains image files actually used by the theme. Subdirectories 
+thereof named like '{name}-def' contain images of a specific theme variant. 
+To use those images they must be copied into this directory in a specifig way
+(see _aREADME_.txt over there).
+
+The file 'site-logo.png' should be replaced by the real loge of the site.
+
+The file 'poweredby.png' is the logo of the web software, i.e. aplaws.

ccm-ldn-aplaws/web/themes/aplaws-default/images/aplaws-def/_aREADME_.txt

@@ -0,0 +1,11 @@
+The files in this directory contain the images for a specific graphical
+variant. 
+
+They are copied to the parent directory (images) and renamed following 
+a specific naming convention.
+
+Site Logo
+The site logo (riverton.png in this case) is copied to site-logo.png
+
+Logo of the Software System
+To honour the software system of the site you may copy the cms logo to poweredby.png

ccm-ldn-aplaws/web/themes/aplaws-default/styles/README.txt

@@ -1,20 +1,26 @@
-This directory contains all CSS files for the theme. We use the Less CSS
+This directory contains all CSS files for all of the theme variants.
-precompiler (http://lesscss.org/) for creating our CSS files. The source Less
-files are also included. 
 
-If you want to customise the stylesheet we strongly recommanded to use Less. 
+The conf/css-files.xml file points invariably to a file named "style.less"
+in this directory. This naming must not be modified, otherwise the theme 
+publishing process will fail!
 
-to customise to styles make a copy of the Less file(s) you want to customize
+The theme is based on the Less CSS precompiler (http://lesscss.org/) for 
-and create a new configuration file pointing to your files in conf.
+creating the CSS files and we provide the source Less files. These files 
+are automatically compiled into the approprioate css file(s) when you use 
+the theme.  In preview /development mode these files are compiled on the fly. 
+When you publish a theme the css files are stored in the directory and 
+copied into the published-themedir subdirectory. 
 
-To make editing of the Less file(s) 
+The file 'style.less' is a starter file which just includes the less files
-easier this theme also includes the Less compiler in the development mode. For
+containing the concrete styling.
-production mode you have to compile the Less files to CSS as described in the 
-iLess documentation. 
 
-The styles for this theme have been split into two Less files. The styles.less
+The distribution provides a default variant of the theme in the file
-file contains all styles for the layout. The aplaws.less file contains several 
+libre-blue.less file. It provides a set of configuration parameters and 
-variables which define several properties for the theme. Most of them are
+its default values. The theme details are defined in the less subdir.
-colours. At the end, the file includes the style.less file. 
 
+To customise the theme make a copy of the default theme file and name it
+appropriately, e.g. 'libre-blue-mytheme'. Make your customizations in
+'libre-blue-mytheme'. Modify the style.less file to include your
+customization instead of the default one by commenting in / out the
+appropriate files. 
 

ccm-ldn-aplaws/web/themes/aplaws-default/styles/aplaws.less

@@ -1,3 +1,8 @@
+/*
+    This file contains definitions of parameters which define a graphical variant
+    of the default libre-blue theme.
+    See readme for details.
+*/
 
 /*
     Colour definitions. This is a LESS feature called variables which
@@ -19,8 +24,10 @@
 @color-footer: #fff;
 @color-footer-link: @color-footer;
 @color-footer-link-hover: #ff9840;
+
 /*@color-gradient1: #8191c5;*/
 @color-gradient1: #59699d;
+
 @color-gradient2: @color-brand;
 @color-main-background: #f2f2f2;
 @color-main-link: @color-nav-background2;
@@ -31,8 +38,10 @@
 @color-item-list-border: #ddd;
 @color-nav: #fff;
 @color-nav-active: #ff9840;
+
 /*@color-nav-background1: @color-brand + #502b1d;*/
 @color-nav-background1: #8191c5;
+
 @color-nav-background2: @color-brand;
 @color-nav-shadow: #4a4a4a;
 @color-navbar-link: #77767e;
@@ -51,4 +60,5 @@
 @dim-gradient-light: 5%;
 @dim-gradient-dark: 100% - @dim-gradient-light;
 
-@import "styles.less";
+/* IMPORTANT! Don't modify unless you what you are doing! */
+@import "less/common-styles.less";

ccm-ldn-aplaws/web/themes/aplaws-default/styles/less/media-breaks.less

@@ -0,0 +1,300 @@
+/*  Common styles are "mobile first" and arrange the site elements one
+ *  underneath each other and display the mobile navigation and selection
+ *  boxes. */
+
+/* For large displays we rearrange a desktop design with 2 columns and
+ * traditional navigation menue                                               */
+@media(min-width: 780px) {    //oder 1024?
+
+    header {
+        #service-panel {
+
+            #service-panel-wrapper {
+                display: flex;
+
+                div {
+                    padding-top: 0.8em;
+
+                    &#language-switcher {
+                        flex: 1;
+
+                        button {
+                            display: none;
+                        }
+
+                        ul {
+                            background-color: transparent;
+                            display         : block;
+                            margin-left     : 0;
+                            padding-left    : 0;
+
+                            li {
+                                margin-left: 1em;
+                            }
+                        }
+                    }
+
+                    &#shortcuts {
+                        flex      : 1;
+                        text-align: right;
+
+                        button {
+                            display: none;
+                        }
+
+                        ul {
+                            display      : block;
+                            margin-right : 0;
+                            padding-right: 0;
+
+                            li {
+                                margin-right: 1em;
+                            }
+                        }
+                    }
+
+                    ul {
+                        li {
+                            display: inline-block;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    nav#main-navigation {
+        button {
+            display: none;
+        }
+
+        div#nav-wrapper {
+            display       : table;
+            height        : 100%;
+            margin-left   : auto;
+            margin-right  : auto;
+            padding-bottom: 0;
+            text-align    : center;
+            vertical-align: middle;
+
+            ul {
+                display       : table-cell;
+                height        : 100%;
+                vertical-align: middle;
+
+                li {
+                    display       : table-cell;
+                    height        : 100%;
+                    vertical-align: middle;
+
+                    &.active {
+                        border: none;
+                    }
+                }
+
+                ul {   //submenu items
+                    display: none;
+                }
+            }
+        }
+
+        ul {                           // eigentlich ueberfluessig
+            margin-left  : 0;
+            margin-right : 0;
+            padding-left : 0;
+            padding-right: 0;
+            list-style   : none;
+
+            li {
+                display: inline;
+            }
+        }
+    }
+
+    div#breadcrumbs-top {
+        font-size   : 1em;
+        padding-left: 0;
+    }
+
+    div#main-wrapper {
+        display     : -webkit-flex;
+        display     : flex;
+        max-width   : @dim-page-width;
+        margin-left : auto;
+        margin-right: auto;
+
+        main {
+            -webkit-flex: 3;
+            flex        : 3;
+            /*max-width: 60em;*/
+            /*margin-left: auto;*/
+            /*margin-right: auto;*/
+            div.related-links-file-attachments {
+                display: -webkit-flex;
+                display: flex;
+
+                ul {
+                    -webkit-flex: 1;
+                    flex        : 1;
+                }
+            }
+        }
+
+        nav.subnav {
+            -webkit-flex: 1;
+            flex        : 1;
+            display:block   //testweise
+        }
+    }
+
+    main {
+        dl.event-details {
+            -moz-column-count   : 2;
+            -webkit-column-count: 2;
+            column-count        : 2;
+        }
+
+        div.scipublication {
+            div.data {
+                display: -webkit-flex;
+                display: flex;
+
+                dl {
+                    -webkit-flex        : 3;
+                    flex                : 3;
+                    -moz-column-count   : 2;
+                    -webkit-column-count: 2;
+                    column-count        : 2;
+                }
+
+                div.export-links {
+                    -webkit-flex: 1;
+                    flex        : 1;
+                    order       : 2;
+                    margin-left : 2em;
+                }
+            }
+        }
+    }
+
+    main.welcome {
+        display: -webkit-flex;
+        display: flex;
+
+        div#left {
+            -webkit-flex: 3;
+            flex        : 3;
+        }
+
+        aside {
+            margin-top  : 1em;
+            margin-left : 2em;
+            -webkit-flex: 1;
+            flex        : 1;
+        }
+    }
+}  // media(min-width: 780px)
+
+
+
+/*  With display width smaller as the @dim-page-width restriction we add a bit
+    of padding  @dim-page-width currently 1280px  */
+@media(max-width: @dim-page-width) {
+
+        div#breadcrumbs-top {
+            padding-left : 0.3em;
+            padding-right: 0.3em;
+        }
+
+        div#main-wrapper {
+            padding-left : 0.3em;
+            padding-right: 0.3em;
+        }
+
+        div.nav-quicklinks {
+            padding-left : +0.3em;
+            padding-right: +0.3em;
+
+            dl {
+                padding      : +0 +0.3em;
+            }
+        }
+
+        footer {
+            #footer-wrapper {
+               padding-left : 0.3em;
+               padding-right: 0.3em;
+
+               #breadcrumbs-bottom {
+                //   margin-left : 1em;
+                //   margin-right: 1em;
+               }
+
+               div#footer-logo-wrapper {
+                //   margin-left : 1em;
+               }
+
+               ul#footer-links {
+                 right: 0.3 em;
+               }
+            }
+
+            ul#footer-links {
+              right: 0.3 em;
+            }
+        }
+}
+
+
+/* mobile displays */
+@media(max-width: 480px) {
+
+    header {
+        #service-panel {
+          height: 30%;
+
+          #service-panel-wrapper {
+
+            div#language-switcher {
+
+              button {
+                  font-size       : 0.85em;
+              }
+            }
+          }
+        }
+
+        .header-logo {
+            height: 60%;
+
+            img {
+                width: 22%;
+            }
+
+            p {
+                display: none;
+            }
+        }
+        //#shortcuts {
+        //    display: none;
+        //}
+    }
+
+    nav#main-navigation {
+      min-height: 30%;
+
+        div#nav-wrapper {
+            height: 30%;
+
+            button {
+              font-size   : 1.4em;
+              margin-top  : 0.08em;
+              margin-left : 0.35em;
+            }
+        }
+    }
+
+    div#breadcrumbs-top {
+        display: none;
+    }
+}

ccm-ldn-aplaws/web/themes/aplaws-default/styles/style.less

@@ -0,0 +1,17 @@
+/* This file is just a starter for the less compiler. Is is used by the
+   javascript based onthefly compiler during development as well as the
+   java based compiler during the theme publication.
+
+   It contains just an import statement which refers to
+   the less file which defines the file for the selected
+   theme variant.
+
+   Modify the import statement accordingly!
+*/
+// @import "libre-blue.less";  // the default graphical variant
+
+@import "aplaws.less";     // aplaws project site
+// @import "libreccm.less";   // Libre Foundation site
+// @import "librecms.less";   // librecms project site
+// @import "scicms-def.less"; // ScientificCMS distribution default theme
+// @import "scicms.less";     // ScientificCMS project site

ccm-ldn-aplaws/web/themes/aplaws-default/templates/content-items/sciproject-list.xml

@@ -46,12 +46,18 @@
             </div>
             <div class="members">
                 <members>
-                    <project-member separator="; ">
+                    <!--<project-member separator="; ">
                         <span class="member">
                             <surname after=", "/>
                             <givenName/>
                         </span>
-                    </project.member>
+                    </project.member>-->
+                    <member separator="; ">
+                        <span class="member">
+                            <surname after=", "/>
+                            <givenname/>
+                        </span>
+                    </member>
                 </members>
             </div>
             <div class="lead">

ccm-ldn-aplaws/web/themes/aplaws-default/templates/fragments/navigation-quick-links.xml

@@ -3,13 +3,13 @@
     This file defines the HTML for Navigation quicklinks
 -->
 <fragment-layout>
-    <!--<div class="navigation-quicklinks">-->
 
         <nav-quicklinks>
+            <div class="nav-quicklinks">
                 <h2 class="subheading">
                     <show-text>page/layout/nav-quicklinks</show-text>
                 </h2>
-            <div class="nav-quicklinks">
+
                 <dl>
                     <nav-quicklink>
                         <dt>
@@ -24,5 +24,5 @@
                 </dl>
             </div>
         </nav-quicklinks>
-    <!--</div>-->
+
 </fragment-layout>

ccm-ldn-aplaws/web/themes/aplaws-default/templates/layout.xml

@@ -181,19 +181,6 @@
 
                             The second points to /ccm/contact is indented to
                             point to a page with contact informations.
-                            
-                            The third link is something which is required
-                            by german law. It should point to page 
-                            describing what data is captured about the 
-                            visitors about the site. For example if tools
-                            like Google Analytics or Piwik are used this
-                            has to be stated on that site. Also the site 
-                            must provide some form for a visitor to object
-                            to this data capture (Opt-out). There is still
-                            some discussion between the jurists in germany
-                            if has the be a separate page and where to place
-                            the link to it, but at the moment the safest 
-                            thing is put the link at the top of the page.
                         -->
                         <div id="shortcuts">
                             <ul id="shortcuts">
@@ -211,13 +198,6 @@
                                         </show-text>
                                     </a>
                                 </li>
-                                <li role="presentation">
-                                    <a href-static="/ccm/privacy">
-                                        <show-text>
-                                            layout/service-links/privacy
-                                        </show-text>
-                                    </a>
-                                </li>
                                 <li role="presentation">
                                     <a href-static="/ccm/help">
                                         <show-text>
@@ -319,6 +299,9 @@
             <insert-block name="content"/>
        </div>
 
+       <!-- Optional page (navigation category) related Links -->
+       <include file="fragments/navigation-quick-links.xml"/>
+
         <!-- The footer part -->
         <footer>
             <div id="footer-wrapper">
@@ -363,7 +346,7 @@
                     <a href-static="http://www.librecms.org">
                         <img id="footer-logo"
                              class="img-responsive"
-                             src-static="images/logo.png"/>
+                             src-static="images/poweredby.png"/>
                     </a>
                 </div>
                 <ul id="footer-links">
@@ -374,6 +357,13 @@
                             </show-text>
                         </a>
                     </li>
+                    <li>
+                        <a href-static="/ccm/privacy">
+                            <show-text>
+                                layout/service-links/privacy
+                            </show-text>
+                        </a>
+                    </li>
                     <li>
                         <a href-static="/ccm/impressum">
                             <show-text>

ccm-ldn-aplaws/web/themes/aplaws-default/templates/navigation.xml

@@ -17,6 +17,12 @@
             <content-item mode="detail"/>
 
                 <object-list id="itemList">
+
+                  <h2 class="subheading">
+                      <show-text>layout/page/object-list</show-text>
+                  </h2>
+
+
                     <ul class="item-list">
                         <object-list-item>
                             <li>
@@ -54,7 +60,6 @@
                     </paginator>
                 </object-list>
 
-            <include file="fragments/navigation-quick-links.xml" />
         </main>
 
         <navigation min-level="2" max-level="99">
@@ -74,8 +79,6 @@
             </navigation-links>
         </navigation>
 
-        
-        
     </block>
 
 </page-layout>

ccm-ldn-aplaws/web/themes/aplaws-default/templates/welcome.xml

@@ -56,8 +56,6 @@
                             </ul>
                         </paginator>
                     </object-list>
-                
-                <include file="fragments/navigation-quick-links.xml" />
             </div>
 
             <aside>
@@ -88,14 +86,8 @@
                 </object-list>
             </aside>
 
-            
-        
         </main>
 
-        
-        
-        
     </block>
 
-    
 </page-layout>

ccm-ldn-aplaws/web/themes/aplaws-default/texts/_README_

@@ -1 +1,14 @@
-This directory contains static texts in the theme
+This directory contains static texts in the theme.
+
+There are variants for some theme variants:
+
+An example is global.xml. There are variants available:
+
+global-libreblue.xml, for the default variant.
+
+global-aplaws.xml,  for aplaws
+
+
+Copy the respective file into its base name, global.xml 
+(or create a symbolic link it your application containes
+supports this).

ccm-ldn-aplaws/web/themes/aplaws-default/user/user.xsl

@@ -40,7 +40,8 @@
         The path is relative to this file.
     -->
 
-    <xsl:import href="check-for-related-links-and-file-attachments.xsl"/>
+    <xsl:import href="check-for-related-links-and-file-attachments.xsl" />
-    <xsl:import href="image-attachment-gallery-indicators.xsl"/>
+    <xsl:import href="image-attachment-gallery-indicators.xsl" />
+    <!-- <xsl:import href="utils.xsl" /> -->
 
 </xsl:stylesheet>

ccm-ldn-aplaws/web/themes/aplaws-default/user/utils.xsl

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [
+    <!ENTITY nbsp '&#160;'>
+    <!ENTITY shy '&#173;'>
+    <!ENTITY ndash '&#8211;'>
+]>
+
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+    xmlns:foundry="http://foundry.libreccm.org"
+    xmlns:nav="http://ccm.redhat.com/navigation"
+    xmlns:ui="http://www.arsdigita.com/ui/1.0"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="xsl xs bebop foundry ui"
+    version="2.0">
+
+<!--
+      ToDelete!
+
+      The templates object-list-has-content and welcome-aside-has-content 
+      are not used anymore. Their functions to exclude empty lists are
+      now integrated into foundry lib.
+
+      The template have no effect at all.
+
+      As soon as the tags are removed from the theme this file is to be
+      deleted.
+-->
+
+    <xsl:template match="object-list-has-content">
+
+        <xsl:if
+            test="not($data-tree/nav:simpleObjectList[@id=./@id]/nav:noContent)
+                      or not($data-tree/nav:complexObjectList[@id=./@id]/nav:noContent)
+                      or not($data-tree/nav:customizableObjectList[@id=./@id]/nav:noContent)
+                      or not($data-tree/nav:atozObjectList[@id=./@id]/nav:noContent)
+                      or not($data-tree/nav:filterObjectList[@id=./@id]/nav:noContent)">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="welcome-aside-has-content">
+
+        <xsl:if test="not($data-tree/nav:simpleObjectList[@id='itemList']/nav:noContent)
+                      or not($data-tree/nav:complexObjectList[@id='eventList']/nav:noContent)">
+
+            <xsl:apply-templates />
+        </xsl:if>
+    </xsl:template>
+
+</xsl:stylesheet>