From a1a7e209dc0d4407ecc77b6c54ebaa8e49dff163 Mon Sep 17 00:00:00 2001 From: pb Date: Tue, 29 Mar 2011 18:25:22 +0000 Subject: [PATCH] =?UTF-8?q?Nachf=C3=BChren=20zes=20bundle=20und=20kleine?= =?UTF-8?q?=20Korrekturen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@809 8810af33-2d31-482b-a856-94f89814c4df --- .../bundles/nsh/cfg/integration.properties | 10 +++++++--- ccm-zes-aplaws/bundles/devel/cfg/applications.cfg | 2 +- .../bundles/devel/cfg/integration.properties | 14 +++++++------- .../bundles/standard/cfg/applications.cfg | 2 +- .../bundles/standard/cfg/integration.properties | 12 ++++++------ .../WEB-INF/resources/aplaws-stylesheet-paths.txt | 4 ++++ .../aplaws-generic/images/portal/customize.gif | Bin 0 -> 624 bytes .../aplaws-generic/images/portal/delete.gif | Bin 0 -> 122 bytes .../aplaws-generic/images/portal/display.gif | Bin 0 -> 357 bytes .../aplaws-generic/images/portal/moveDown.gif | Bin 0 -> 100 bytes .../aplaws-generic/images/portal/moveLeft.gif | Bin 0 -> 99 bytes .../aplaws-generic/images/portal/moveRight.gif | Bin 0 -> 99 bytes .../aplaws-generic/images/portal/moveUp.gif | Bin 0 -> 100 bytes .../__ccm__/themes/aplaws-generic/portal/lib.xsl | 2 +- environment/project.xml.zes | 2 +- 15 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif create mode 100644 ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif create mode 100644 ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif create mode 100644 ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif create mode 100644 ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif create mode 100644 ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif create mode 100644 ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif 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 0000000000000000000000000000000000000000..1fc3b90488231500610a0d3a3fa6c205939348c2 GIT binary patch literal 624 zcmV-$0+0PiNk%w1VGsZi0LB0S|NsC0|Mvg?@Av=z|NrRr{r2(y|Nr{w|Mm9u`TYO( z@Avoj=<@UK^5pLB?%na`=jZ3(FIfFO#97r<#hNnWOcCBCnE!nVFf~ zh)DN;4w;gQkdB<~c?jWq8Pk3%iinGWgo}ZJfqs5|w{j$fb7_Bdb8~lqesO4aa&N0) z7;bT9cWG&*Un62|f9xbWCS$Bq=E+QZ`_BkAHSoLtz#Gq&7DWVr!2z zV;w7aA_M|7I|B`7RF6VREkRQZ11vxi5D{>lT1zHTL<2BoY;kFIoiB4fE?zwY2neKm zoquF%GBRo>1L*^N;aNOiF*tY>0|5bg?Ep|#Ge}h&9u(vWx5dDLBt}$VfkBF0rz`+I zu)tHK%a{oO26o~?3IGZ@a`s?!_y}SM5E@3H(BUBgzK0zF*b6}F<)bHP-lRd}#tj-Y Kd5-)E1OPjy8UaWE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0a685ae4846169094b7293b9836f753ff56625ab GIT binary patch literal 122 zcmZ?wbhEHbZ_5Us_HA)|J9hspQGdApsaNR) SVWF1Fgvj-i-Y7CMSOWkZGcz{; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..820295a5856f5c697211afb50e6d610fb59061dd GIT binary patch literal 357 zcmZ?wbhEHb6krfwSjqqb*4EZb*DResbMf-!%RN0k8yg#SbaXg5IsgCvUsqT6?%g{T z6%`2yiU0p!{Qv*HtE0QPyy5%*|L;CMQBV?f_Husl>GRB)Gs`nGpWnap{Q2_-Paca4 z@$J~LW9QDJ6Z+;DOG>B<@$w1DN{FjVaIydY`i-4|L0nbu#Nqv0S4`i(_t5|U-x$~# z{(pPVz`?F&>GARZe`90guRs5UgoH>*$_Wb#i%AHlrKSDH0Th3-Fp4nPGw6VP0`e0B zThoF0AJ{dd7#kN((vaZcU_H#ZQG`k8MvLRd1d~oA!nC;gX4WBkT?zFJ1dB?&CJAuR2G~Zcb$w!@`+{XGT#uF - {$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 @@ -