diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties index 0fb81f5ba..f6f3d8ccc 100755 --- a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties +++ b/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 diff --git a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg index 84ddc687f..8dde7ea18 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg +++ b/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 diff --git a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties index 34fa46367..38e0a76df 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties @@ -49,8 +49,8 @@ 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_hidden_buttons= +; 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 # ============================================================================================= diff --git a/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg b/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg index 0cada0acc..ef83a81b5 100644 --- a/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg +++ b/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 diff --git a/ccm-zes-aplaws/bundles/standard/cfg/integration.properties b/ccm-zes-aplaws/bundles/standard/cfg/integration.properties index f2e89ef6c..9341a846b 100644 --- a/ccm-zes-aplaws/bundles/standard/cfg/integration.properties +++ b/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 # ============================================================================================= diff --git a/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt index 73c1cb5bf..bf5a09a50 100644 --- a/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt +++ b/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 diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif new file mode 100644 index 000000000..1fc3b9048 Binary files /dev/null and b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif differ diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif new file mode 100644 index 000000000..0a685ae48 Binary files /dev/null and b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif differ diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif new file mode 100644 index 000000000..820295a58 Binary files /dev/null and b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif differ diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif new file mode 100644 index 000000000..9c631a238 Binary files /dev/null and b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif differ diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif new file mode 100644 index 000000000..09a282b51 Binary files /dev/null and b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif differ diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif new file mode 100644 index 000000000..ef767a035 Binary files /dev/null and b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif differ diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif new file mode 100644 index 000000000..accc954a2 Binary files /dev/null and b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif differ diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl index 856679e83..7e181bdd4 100644 --- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl +++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl @@ -29,7 +29,7 @@ - {$title} + {$title} diff --git a/environment/project.xml.zes b/environment/project.xml.zes index c7859b8ef..fab84684b 100644 --- a/environment/project.xml.zes +++ b/environment/project.xml.zes @@ -65,6 +65,7 @@ + @@ -84,7 +85,6 @@ -