Nachführen zes bundle und kleine Korrekturen.

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

ccm-gen-aplaws/bundles/nsh/cfg/integration.properties

@@ -1,4 +1,7 @@
+# NSH bundle integration.properties
+#
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+#
 ; dhtml editor to use (system wide)
 ; waf.bebop.dhtml_editor=FCKeditor
 waf.bebop.dhtml_editor=Xinha
@@ -20,14 +23,15 @@ waf.auto_registration_on=false
 #waf.pagemap.root=portal/
 #waf.pagemap.workspace=portal/
 #waf.pagemap.login_redirect=content/content-center-redirect.jsp
-core.ui.pagemap.root_page_url=navigation/
-core.ui.pagemap.workspace_url=navigation/
-core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
 
 ; Searches for localized style sheet (among others)
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
 
+core.ui.pagemap.root_page_url=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
+
 ; Configures the xml processing
 waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true

ccm-zes-aplaws/bundles/devel/cfg/applications.cfg

@@ -48,6 +48,7 @@ ccm-cms-types-xmlfeed
 # -- ccm-formbuilder-pdf
 ccm-forum
 ccm-simplesurvey
+ccm-themedirector
 ccm-user-preferences
 # -- ccm-weblog
 # -- ccm-webpage
@@ -68,7 +69,6 @@ ccm-ldn-search
 ccm-ldn-shortcuts
 ccm-ldn-subsite
 ccm-ldn-terms
-ccm-ldn-theme
 ccm-ldn-util
 
 # sci extensions

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

@@ -49,7 +49,7 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.d
 
 ; Configure dhtml editor for use in cms content-center
 ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
-com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 com.arsdigita.cms.dhtml_editor_plugins=
@@ -110,11 +110,11 @@ com.arsdigita.london.search.show_sponsored_links=true
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-ldn-subsite application
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
-com.arsdigita.london.theme.file_extensions=bmp css gif jpeg jpg js png xsl xml
+# ccm-ldn-themedirector application
+themedirector.default_theme_context=
+themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
+themedirector.default_theme_path=__ccm__/themes/aplaws-generic
+themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 
 # =============================================================================================

ccm-zes-aplaws/bundles/standard/cfg/applications.cfg

@@ -48,6 +48,7 @@ ccm-cms-types-xmlfeed
 # -- ccm-formbuilder-pdf
 ccm-forum
 ccm-simplesurvey
+ccm-themedirector
 ccm-user-preferences
 # -- ccm-weblog
 # -- ccm-webpage
@@ -68,7 +69,6 @@ ccm-ldn-search
 ccm-ldn-shortcuts
 ccm-ldn-subsite
 ccm-ldn-terms
-ccm-ldn-theme
 ccm-ldn-util
 
 # sci extensions

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

@@ -49,7 +49,7 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.d
 
 ; Configure dhtml editor for use in cms content-center
 ;com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
-com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
 ;com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ;com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 com.arsdigita.cms.dhtml_editor_plugins=
@@ -110,11 +110,11 @@ com.arsdigita.london.search.show_sponsored_links=true
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-ldn-subsite application
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
-com.arsdigita.london.theme.file_extensions=bmp css gif jpeg jpg js png xsl xml
+# ccm-ldn-themedirector application
+themedirector.default_theme_context=
+themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
+themedirector.default_theme_path=__ccm__/themes/aplaws-generic
+themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 
 # =============================================================================================

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

@@ -35,3 +35,7 @@ http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::ur
 # Global default, from application's own web app
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl
+
+# Global default, from application's own web app - relocated version >= 6.6.1
+http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl

ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl

@@ -29,7 +29,7 @@
     </xsl:variable>
     
     <a href="{@url}" title="{$title}">
-      <img src="/STATIC/portal/{@name}.gif"  border="1" alt="{$title}"/>
+      <img src="{$theme-prefix}/portal/{@name}.gif"  border="1" alt="{$title}"/>
     </a>
   </xsl:template>
   

environment/project.xml.zes

@@ -65,6 +65,7 @@
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
         <ccm:application name="ccm-forum"/>
         <ccm:application name="ccm-simplesurvey"/>
+        <ccm:application name="ccm-themedirector"/>
         <ccm:application name="ccm-user-preferences"/>
 <!--    <ccm:application name="ccm-weblog"/>                         -->
 <!--    <ccm:application name="ccm-webpage"/>                        -->
@@ -84,7 +85,6 @@
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
         <ccm:application name="ccm-ldn-util"/>