From bb1f289953d532b61aa76f44c30bb9ebdf43d661 Mon Sep 17 00:00:00 2001 From: pb Date: Wed, 30 Mar 2011 19:18:09 +0000 Subject: [PATCH] =?UTF-8?q?Nachf=C3=BChren=20ccm-gen-aplaws=20an=20=C3=84n?= =?UTF-8?q?derungen=20ccm-themedirector,=20verschiedene=20Kleinigkeiten=20?= =?UTF-8?q?bei=20ccm-zes-aplaws,=20Kleinkram.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@812 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/bebop/SimpleContainer.java | 1 + .../bundles/devel/cfg/applications.cfg | 10 +- .../bundles/devel/cfg/integration.properties | 65 +- ccm-gen-aplaws/bundles/devel/cfg/web.xml | 14 +- .../bundles/nsh/cfg/applications.cfg | 4 + .../bundles/nsh/cfg/integration.properties | 64 +- ccm-gen-aplaws/bundles/nsh/cfg/web.xml | 311 +++- .../resources/aplaws-stylesheet-paths.txt | 16 +- .../src/com/arsdigita/aplaws/Loader.java | 15 +- .../aplaws/ObjectTypeSchemaGenerator.java | 1 + .../ccm-ldn-navigation/navigation/sitemap.jsp | 2 +- .../static}/aplaws-generic/admin-index.css | 0 .../static}/aplaws-generic/admin-index.xsl | 4 +- .../atoz-admin.css.NotUsedForNow | 0 .../atoz-admin.xsl.NotUsedForNow | 0 .../atoz-index.css.NotUsedForNow | 0 .../atoz-index.xsl.NotUsedForNow | 0 .../static}/aplaws-generic/category-step.xsl | 0 .../aplaws-generic/consultations-index.xsl | 3 + .../aplaws-generic/content-center-index.xsl | 0 .../aplaws-generic/content-section-admin.xsl | 0 .../aplaws-generic/content-section-index.xsl | 0 .../static}/aplaws-generic/css/main.css | 0 .../static}/aplaws-generic/css/wysiwyg.css | 0 .../categorised-forum/forum-categories.xsl | 0 .../categorised-forum/forum-index.xsl | 0 .../forum-example/forum-index.css | 0 .../forum-example/forum-index.xsl | 0 .../images/forum/archived-16x16.gif | Bin .../images/forum/back-to-16x16.gif | Bin .../images/forum/delete-16x16.gif | Bin .../forum-example/images/forum/edit-16x16.gif | Bin .../forum-example/images/forum/info-16x16.gif | Bin .../forum-example/images/forum/post-16x16.gif | Bin .../forum-example/images/forum/read.gif | Bin .../images/forum/reply-16x16.gif | Bin .../images/forum/watch-16x16.gif | Bin .../static}/aplaws-generic/forum-index.css | 0 .../static}/aplaws-generic/forum-index.xsl | 1 - .../images/aplaws-logo-small.png | Bin .../aplaws-generic/images/aplaws-logo.gif | Bin .../aplaws-generic/images/aplawsplus.gif | Bin .../aplaws-generic/images/arrowSitemap.gif | Bin .../images/forum/archived-16x16.gif | Bin .../images/forum/back-to-16x16.gif | Bin .../images/forum/delete-16x16.gif | Bin .../images/forum/edit-16x16.gif | Bin .../images/forum/info-16x16.gif | Bin .../images/forum/post-16x16.gif | Bin .../aplaws-generic/images/forum/read.gif | Bin .../images/forum/reply-16x16.gif | Bin .../images/forum/watch-16x16.gif | Bin .../images/portal/customize.gif | Bin .../aplaws-generic/images/portal/delete.gif | Bin .../aplaws-generic/images/portal/display.gif | Bin .../aplaws-generic/images/portal/moveDown.gif | Bin .../aplaws-generic/images/portal/moveLeft.gif | Bin .../images/portal/moveRight.gif | Bin .../aplaws-generic/images/portal/moveUp.gif | Bin .../static}/aplaws-generic/images/spacer.gif | Bin .../aplaws-generic/images/tlcArrow-s.gif | Bin .../aplaws-generic/images/tlcArrow.gif | Bin .../static}/aplaws-generic/images/w3c-css.bmp | Bin .../static}/aplaws-generic/images/w3c-css.png | Bin .../aplaws-generic/images/w3c-xhtml.bmp | Bin .../aplaws-generic/images/w3c-xhtml.png | Bin .../static}/aplaws-generic/lib/body.xsl | 0 .../static}/aplaws-generic/lib/head.xsl | 0 .../static}/aplaws-generic/lib/header.xsl | 0 .../static}/aplaws-generic/lib/leftNav.xsl | 0 .../static}/aplaws-generic/lib/lib.xsl | 0 .../static}/aplaws-generic/lib/page.xsl | 0 .../aplaws-generic/lib/user-banner.xsl | 0 .../aplaws-generic/navigation-admin.css | 0 .../aplaws-generic/navigation-admin.xsl | 0 .../aplaws-generic/navigation-directory.xsl | 0 .../aplaws-generic/navigation-index.xsl | 0 .../aplaws-generic/navigation-services.xsl | 0 .../aplaws-generic/navigation-sitemap.xsl | 0 .../aplaws-generic/navigation-summary.xsl | 0 .../portal/application-directory-portlet.xsl | 0 .../portal/content-item-portlet.xsl | 0 .../portal/content-sections-portlet.xsl | 0 .../portal/directory-portlet.xsl | 0 .../portal/freeform-html-portlet.xsl | 0 .../static}/aplaws-generic/portal/lib.xsl | 0 .../aplaws-generic/portal/login-portlet.xsl | 0 .../aplaws-generic/portal/portlets.xsl | 0 .../portal/rss-feed-portlet.xsl | 0 .../portal/tasklist-portlet.xsl | 0 .../portal/time-of-day-portlet.xsl | 0 .../portal/workspace-directory-portlet.xsl | 0 .../static}/aplaws-generic/search-admin.xsl | 0 .../static}/aplaws-generic/search-index.xsl | 0 .../aplaws-generic/shortcuts-index.css | 0 .../aplaws-generic/shortcuts-index.xsl | 0 .../static}/aplaws-generic/subsite-index.css | 0 .../static}/aplaws-generic/subsite-index.xsl | 0 .../static}/aplaws-generic/terms-index.css | 0 .../static}/aplaws-generic/terms-index.xsl | 0 .../static}/aplaws-generic/theme-index.css | 0 .../static}/aplaws-generic/theme-index.xsl | 2 +- .../static}/aplaws-generic/types/Address.xsl | 0 .../static}/aplaws-generic/types/Agenda.xsl | 0 .../static}/aplaws-generic/types/Article.xsl | 0 .../aplaws-generic/types/ContentTypes.xsl | 0 .../static}/aplaws-generic/types/Event.xsl | 0 .../aplaws-generic/types/FileStorageItem.xsl | 0 .../aplaws-generic/types/InlineSite.xsl | 0 .../static}/aplaws-generic/types/Job.xsl | 0 .../aplaws-generic/types/LegalNotice.xsl | 0 .../static}/aplaws-generic/types/Minutes.xsl | 0 .../aplaws-generic/types/MultiPartArticle.xsl | 0 .../static}/aplaws-generic/types/NewsItem.xsl | 0 .../aplaws-generic/types/PressRelease.xsl | 0 .../static}/aplaws-generic/types/Service.xsl | 0 .../aplaws-generic/types/SiteProxy.xsl | 0 .../aplaws-generic/workspace-admin.xsl | 0 .../aplaws-generic/workspace-index.xsl | 0 .../web/WEB-INF/web.ccm-ldn-navigation.xml | 13 +- .../bundles/devel/cfg/applications.cfg | 3 +- .../bundles/devel/cfg/integration.properties | 9 + ccm-zes-aplaws/bundles/devel/cfg/web.xml | 14 +- .../src/com/arsdigita/aplaws/Initializer.java | 6 + .../src/com/arsdigita/aplaws/Loader.java | 44 +- .../ui/HomepagePortalSelectionModel.java | 13 + .../aplaws/ui/HomepageWorkspace.java | 20 +- .../ui/HomepageWorkspaceSelectionModel.java | 2 +- .../ccm-ldn-navigation/navigation/sitemap.jsp | 2 +- .../static/aplaws-generic/forum-index.css | 405 ++++- .../static/aplaws-generic/forum-index.xsl | 1317 ++++++++++++++++- .../images/forum/archived-16x16.gif | Bin 0 -> 561 bytes .../images/forum/back-to-16x16.gif | Bin 0 -> 552 bytes .../images/forum/delete-16x16.gif | Bin 0 -> 581 bytes .../images/forum/edit-16x16.gif | Bin 0 -> 551 bytes .../images/forum/info-16x16.gif | Bin 0 -> 619 bytes .../images/forum/post-16x16.gif | Bin 0 -> 1010 bytes .../aplaws-generic/images/forum/read.gif | Bin 0 -> 296 bytes .../images/forum/reply-16x16.gif | Bin 0 -> 1024 bytes .../images/forum/watch-16x16.gif | Bin 0 -> 1039 bytes 140 files changed, 2216 insertions(+), 145 deletions(-) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/admin-index.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/admin-index.xsl (84%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/atoz-admin.css.NotUsedForNow (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/atoz-admin.xsl.NotUsedForNow (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/atoz-index.css.NotUsedForNow (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/atoz-index.xsl.NotUsedForNow (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/category-step.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/consultations-index.xsl (98%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/content-center-index.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/content-section-admin.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/content-section-index.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/css/main.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/css/wysiwyg.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/categorised-forum/forum-index.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/forum-index.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/forum-index.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/archived-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/back-to-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/delete-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/edit-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/info-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/post-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/read.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/reply-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/watch-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-index.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-index.xsl (96%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/aplaws-logo-small.png (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/aplaws-logo.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/aplawsplus.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/arrowSitemap.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/forum/archived-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/forum/back-to-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/forum/delete-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/forum/edit-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/forum/info-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/forum/post-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/forum/read.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/forum/reply-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/forum/watch-16x16.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/customize.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/delete.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/display.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/moveDown.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/moveLeft.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/moveRight.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/moveUp.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/spacer.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/tlcArrow-s.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/tlcArrow.gif (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/w3c-css.bmp (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/w3c-css.png (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/w3c-xhtml.bmp (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/w3c-xhtml.png (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/body.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/head.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/header.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/leftNav.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/lib.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/page.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/user-banner.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-admin.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-admin.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-directory.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-index.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-services.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-sitemap.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-summary.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/application-directory-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/content-item-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/content-sections-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/directory-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/freeform-html-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/lib.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/login-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/portlets.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/rss-feed-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/tasklist-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/time-of-day-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/workspace-directory-portlet.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/search-admin.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/search-index.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/shortcuts-index.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/shortcuts-index.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/subsite-index.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/subsite-index.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/terms-index.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/terms-index.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/theme-index.css (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/theme-index.xsl (87%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Address.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Agenda.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Article.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/ContentTypes.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Event.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/FileStorageItem.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/InlineSite.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Job.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/LegalNotice.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Minutes.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/MultiPartArticle.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/NewsItem.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/PressRelease.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Service.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/SiteProxy.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/workspace-admin.xsl (100%) rename ccm-gen-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/workspace-index.xsl (100%) create mode 100644 ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif create mode 100644 ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif create mode 100644 ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif create mode 100644 ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif create mode 100644 ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/info-16x16.gif create mode 100644 ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif create mode 100644 ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/read.gif create mode 100644 ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif create mode 100644 ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif diff --git a/ccm-core/src/com/arsdigita/bebop/SimpleContainer.java b/ccm-core/src/com/arsdigita/bebop/SimpleContainer.java index 679b9b030..c035defb5 100755 --- a/ccm-core/src/com/arsdigita/bebop/SimpleContainer.java +++ b/ccm-core/src/com/arsdigita/bebop/SimpleContainer.java @@ -256,6 +256,7 @@ public class SimpleContainer extends BlockStylable implements Container { * @see #setTag(String) * @see #setNamespace(String) */ + @Override public void generateXML(PageState state, Element p) { if ( isVisible(state) ) { Element parent = generateParent(p); diff --git a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg index 98c6f1d78..f38cb3385 100755 --- a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg @@ -1,3 +1,4 @@ +# Generic devel application.cfg # Main apps ccm-core ccm-cms @@ -7,7 +8,8 @@ ccm-cms-assets-fileattachment ccm-cms-assets-imagestep ccm-cms-assets-notes ccm-cms-assets-relatedlink -## -- ccm-ldn-dublin ist das eigentlich ein asset? +# is ccm-ldn-dublin really an asset? +## -- ccm-ldn-dublin # Content types # -- ccm-cms-types-address @@ -15,7 +17,6 @@ ccm-cms-assets-relatedlink ccm-cms-types-article ccm-cms-types-bookmark # -- ccm-cms-types-contact -# -- ccm-cms-types-esdservice ccm-cms-types-event ccm-cms-types-faqitem ccm-cms-types-filestorageitem @@ -32,13 +33,14 @@ ccm-cms-types-member ccm-cms-types-mparticle ccm-cms-types-newsitem # -- ccm-cms-types-organization +ccm-cms-types-person # -- ccm-cms-types-pressrelease +# -- ccm-cms-types-researchnetwork # -- ccm-cms-types-service # ## Fuer OpenCCM aktivieren: # -- ccm-cms-types-siteproxy # -- ccm-cms-types-xmlfeed - # Applications # ------------ # -- ccm-auth-http @@ -48,6 +50,7 @@ ccm-cms-types-newsitem ccm-forum ccm-forum-categorised # -- ccm-simplesurvey +ccm-themedirector ccm-user-preferences # -- ccm-weblog # -- ccm-webpage @@ -67,7 +70,6 @@ ccm-ldn-search ccm-ldn-shortcuts ccm-ldn-subsite ccm-ldn-terms -ccm-ldn-theme ccm-ldn-util # integration layer diff --git a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties index 2ab71738f..c89e3db1d 100755 --- a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties @@ -1,4 +1,7 @@ +# Generic devel bundle integration.properties +# waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage +# ; dhtml editor to use (system wide) ; Xinha is default ; waf.bebop.dhtml_editor=Xinha @@ -13,6 +16,7 @@ waf.kernel.data_permission_check_enabled=false waf.kernel.primary_user_identifier=email ; if you activate screen_name, forum loader doesn't work. ; waf.kernel.primary_user_identifier=screen_name +waf.kernel.supported_languages=de,en ; security.properties: waf.auto_registration_on=false @@ -21,22 +25,29 @@ 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 + +; workflow configuration +waf.workflow.simple.alerts_enabled=true +waf.workflow.simple.alerts_sender=root@localhost.localdomain + ; Configures the xml processing waf.xml.xsl_transformer=xalan waf.xml.activate_full_date_formatter=true +# ccm-cms parameters + com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker -com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp +com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver ; Configure dhtml editor for use in cms content-center @@ -48,6 +59,7 @@ com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfi ; to use FCKeditor: ; 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_plugins= @@ -70,21 +82,30 @@ com.arsdigita.cms.use_section_categories=false com.arsdigita.cms.use_streamlined_creation=true +# 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 com.arsdigita.cms.contenttypes.event.hide_link_to_map=true com.arsdigita.cms.contenttypes.event.hide_main_contributor=true com.arsdigita.cms.contenttypes.event.use_html_date_description=false +com.arsdigita.cms.contenttypes.event.start_year=2000 +com.arsdigita.cms.contenttypes.event.end_year_delta=5 +# ccm-cms-types-newsitem parameters com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true +com.arsdigita.cms.contenttypes.newsitem.start_year=2000 +com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5 + +# ?? Where are these used? com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp ; com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp -; Forum application + +# Forum application com.arsdigita.forum.show_new_tabs=true com.arsdigita.forum.use_wysiwyg_editor=true com.arsdigita.forum.allow_quick_finish=true @@ -93,6 +114,7 @@ com.arsdigita.forum.disable_page_caching=true ; atoz currently not in use ; com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker +# ccm-ldn-navigation application ; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 ; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive ; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 @@ -100,24 +122,29 @@ com.arsdigita.forum.disable_page_caching=true com.arsdigita.london.navigation.category_menu_show_grand_children=false ; com.arsdigita.london.navigation.category_menu_show_nephews=false com.arsdigita.london.navigation.default_cat_root_path=/navigation/ -com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp +com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp + + +# ccm-ldn-search application com.arsdigita.london.search.show_sponsored_links=true + + +# ccm-ldn-subsite application com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -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 gif jpeg jpg png css 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=themes/static/aplaws-generic +themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl -; ============================================================================================= -; devel specific configurations -waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm -waf.runtime.jdbc_pool_size=80 +# com.arsdigita.london.cms.dublin.audience_domain=LGAL -waf.web.server=localhost\:8080 +# ============================================================================================= +# runtime specific configurations waf.admin.email=webmaster@openccm.org waf.admin.name.given=aplaws @@ -126,6 +153,14 @@ waf.admin.password=123456 waf.admin.password.question=12345 waf.admin.password.answer=6 +waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm +waf.runtime.jdbc_pool_size=60 + +waf.web.server=localhost\:8080 + + +# ============================================================================================= +# devel specific configurations waf.debug=true waf.bebop.fancy_xsl_errors=true diff --git a/ccm-gen-aplaws/bundles/devel/cfg/web.xml b/ccm-gen-aplaws/bundles/devel/cfg/web.xml index fba76fbd2..cd35301a1 100755 --- a/ccm-gen-aplaws/bundles/devel/cfg/web.xml +++ b/ccm-gen-aplaws/bundles/devel/cfg/web.xml @@ -303,33 +303,33 @@ - + theme-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-theme + /templates/ccm-themedirector ThemeDownload - com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet + com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet ThemePreviewServlet Servlet to allow admins to preview look/feel - com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet + com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet prefix /theme - + - + theme-files /theme-files/* @@ -418,7 +418,7 @@ ThemePreviewServlet /theme/* - + + + log4j-conf-file + WEB-INF/conf/log4j.properties + + + + + + shortcuts com.arsdigita.london.shortcuts.ShortcutFilter @@ -24,6 +50,20 @@ /* + + + com.arsdigita.web.CCMApplicationContextListener + + + + reg com.arsdigita.web.ContextRegistrationServlet @@ -80,7 +120,10 @@ com.arsdigita.web.ResourceServlet - + content-section @@ -126,19 +169,28 @@ - - ThemePreviewServlet - Servlet to allow admins to preview look/feel - - com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet - - - prefix - /theme - - + - + + + + + forum-main + com.arsdigita.forum.ForumServlet + + portal-files @@ -166,17 +218,131 @@ portlet-type-xsl com.arsdigita.dispatcher.PortletTypeXSLServlet + + + + rss-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-ldn-rss + + + file-resolver + com.arsdigita.london.rss.RSSFileResolver + + + + + + + worker + com.arsdigita.london.search.SearchWorkerServlet + 4 + + + + search-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-ldn-search + + + + + AxisServlet + Apache-Axis Servlet + + org.apache.axis.transport.http.AxisServlet + + + + + + + shortcuts-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-ldn-shortcuts + + + + + + subsite-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-ldn-subsite + + + + + + + terms-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-ldn-terms + + + + + + + theme-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-themedirector + + + + + ThemeDownload + com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet + + + + ThemePreviewServlet + Servlet to allow admins to preview look/feel + + com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet + + + prefix + /theme + + + + + + + + + + + forum-main + /forum-main/main/* + + portlet-type-xsl /__ccm__/servlet/portlet-type/* - - reg - /__ccm__/null/reg/* - - portal-files /ccm-ldn-portal/files/* @@ -187,7 +353,71 @@ /ccm-ldn-navigation/files/* - + + + rss-files + /ccm-ldn-rss/files/* + + + + + search-files + /ccm-ldn-search/files/* + + + + AxisServlet + /services/* + + + + + + shortcuts-files + /ccm-ldn-shortcuts/files/* + + + + + subsite-files + /ccm-ldn-subsite/files/* + + + + + + terms-files + /ccm-ldn-terms/files/* + + + + + + theme-files + /theme-files/* + + + + ThemeDownload + /theme-files/download/* + + + + ThemePreviewServlet + /theme/* + + + + + + + + reg + /__ccm__/null/reg/* + ccm-dispatcher @@ -224,7 +454,10 @@ /resource/* - + content-section @@ -232,13 +465,13 @@ - content-type-xsl - /__ccm__/servlet/content-type/* + content-item-xsl + /__ccm__/servlet/content-item/* - content-item-xsl - /__ccm__/servlet/content-item/* + content-type-xsl + /__ccm__/servlet/content-type/* @@ -256,13 +489,9 @@ /print/* - - ThemePreviewServlet - /theme/* - - - - + com.arsdigita.dispatcher.AccessDeniedException @@ -289,10 +518,28 @@ /error/db-not-available.jsp - java.lang.Exception /error/general.jsp + + java.lang.Error + /error/general.jsp + + + + + + /WEB-INF/bebop-show.tld + /WEB-INF/bebop-show.tld + + + + /WEB-INF/bebop-define.tld + /WEB-INF/bebop-define.tld + + diff --git a/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt index bf5a09a50..df964c308 100755 --- a/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt +++ b/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt @@ -12,23 +12,27 @@ http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid:: # added by Quasimodo # Theme with single entry point (e.g Mandalay) -http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/start.xsl +http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl # Theme, with optional locale & prefix -http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl -http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl +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::/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl -http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::.xsl +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 # XXX change ROOT -> ccm-ldn-aplaws +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 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl # APLAWS generic default, with locale # XXX change ROOT -> ccm-ldn-aplaws +http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl +http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.xsl http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl @@ -37,5 +41,7 @@ http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::l 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/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl +http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::.xsl 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-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java index 4f8b7a247..827a88f7d 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -102,7 +102,7 @@ public class Loader extends PackageLoader { * You may add more catagory domains by adding resources * according the following schema */ - + /* currently not used m_subjectDomain = new StringParameter( "com.arsdigita.aplaws.subject_domain", @@ -110,7 +110,7 @@ public class Loader extends PackageLoader { "LGCL"); register(m_subjectDomain); */ - + /* currently not used m_interactionDomain = new StringParameter( "com.arsdigita.aplaws.subject_domain", @@ -126,7 +126,7 @@ public class Loader extends PackageLoader { "APLAWS-RSS"); register(m_rssDomain); */ - + } @@ -142,12 +142,11 @@ public class Loader extends PackageLoader { if (s_log.isInfoEnabled()) { s_log.info("Process " + file); } - parser.parse(Thread.currentThread().getContextClassLoader - ().getResourceAsStream - (file)); + parser.parse(Thread.currentThread().getContextClassLoader(). + getResourceAsStream(file)); } - String navigationKey = (String)get(m_navigationDomain); + String navigationKey = (String) get(m_navigationDomain); registerDomain(navigationKey, "/navigation/", null); registerDomain(navigationKey, "/content/", null); registerDomain(navigationKey, "/portal/", null); @@ -175,7 +174,7 @@ public class Loader extends PackageLoader { // registerDomain(interactionKey, "/content/", "interaction"); - + // register new / addidional JSP templates (index pages) in Navigation // registerServicesTemplate("/services/"); wird nicht gebraucht registerNavigationTemplates(); diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java index 56da85a78..dfc8cd519 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + package com.arsdigita.aplaws; import com.arsdigita.xml.Element; diff --git a/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp b/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp index e87172fb1..b3e5f5a01 100755 --- a/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp +++ b/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp @@ -23,7 +23,7 @@ + classname="com.arsdigita.london.navigation.ui.category.Hierarchy"> ((com.arsdigita.london.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false); diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.xsl similarity index 84% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.xsl index 2d9d2dcc5..fa0b5ad35 100644 --- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.xsl @@ -3,8 +3,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" version="1.0"> - + + diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.css.NotUsedForNow b/ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.css.NotUsedForNow rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.xsl.NotUsedForNow b/ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.xsl.NotUsedForNow rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.css.NotUsedForNow b/ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.css.NotUsedForNow rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow b/ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/category-step.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/category-step.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/category-step.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/category-step.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/consultations-index.xsl similarity index 98% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/consultations-index.xsl index 75fe0ebdd..2d47ea5e1 100644 --- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/consultations-index.xsl @@ -8,7 +8,10 @@ xmlns:nav="http://ccm.redhat.com/london/navigation" version="1.0"> + + diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-center-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/content-center-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-center-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/content-center-index.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-section-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/content-section-admin.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-section-admin.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/content-section-admin.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-section-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/content-section-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-section-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/content-section-index.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/css/main.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/css/main.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/css/main.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/css/main.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/css/wysiwyg.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/css/wysiwyg.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/css/wysiwyg.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/css/wysiwyg.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/archived-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/archived-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/back-to-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/back-to-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/delete-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/delete-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/edit-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/edit-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/info-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/info-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/post-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/post-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/read.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/read.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/reply-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/reply-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/watch-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/watch-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl similarity index 96% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl index 86e99e146..b68bf25b1 100644 --- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl @@ -31,7 +31,6 @@ - diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo-small.png b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo-small.png similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo-small.png rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo-small.png diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplawsplus.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplawsplus.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplawsplus.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplawsplus.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/arrowSitemap.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/arrowSitemap.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/arrowSitemap.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/arrowSitemap.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/archived-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/archived-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/back-to-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/back-to-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/delete-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/delete-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/edit-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/edit-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/info-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/info-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/info-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/info-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/post-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/post-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/read.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/read.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/read.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/read.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/reply-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/reply-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/watch-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/watch-16x16.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/customize.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/customize.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/delete.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/delete.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/display.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/display.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveDown.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveDown.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveLeft.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveLeft.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveRight.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveRight.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveUp.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveUp.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/spacer.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/spacer.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/spacer.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/spacer.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow-s.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/tlcArrow-s.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow-s.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/tlcArrow-s.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/tlcArrow.gif similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow.gif rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/tlcArrow.gif diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.bmp b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-css.bmp similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.bmp rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-css.bmp diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.png b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-css.png similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.png rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-css.png diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.bmp b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.bmp rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.png b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.png similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.png rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.png diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/body.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/body.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/body.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/body.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/head.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/head.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/head.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/head.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/header.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/header.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/header.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/header.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/leftNav.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/leftNav.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/leftNav.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/leftNav.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/lib.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/lib.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/lib.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/lib.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/page.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/page.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/page.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/page.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/user-banner.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/user-banner.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/user-banner.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/user-banner.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-directory.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-directory.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-services.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-services.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-sitemap.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-sitemap.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-summary.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-summary.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/application-directory-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/application-directory-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-item-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-item-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-sections-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-sections-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/directory-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/directory-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/directory-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/directory-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/freeform-html-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/freeform-html-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/lib.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/lib.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/login-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/login-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/login-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/login-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/portlets.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/portlets.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/portlets.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/portlets.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/rss-feed-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/rss-feed-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/tasklist-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/tasklist-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/time-of-day-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/time-of-day-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/workspace-directory-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/workspace-directory-portlet.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/search-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/search-admin.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/search-admin.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/search-admin.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/search-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/search-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/search-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/search-index.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.css similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.css rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.css diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.xsl similarity index 87% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.xsl index 44121cbda..3f85303aa 100644 --- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.xsl @@ -9,7 +9,7 @@ --> - + diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Address.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Address.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Address.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Address.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Agenda.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Agenda.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Agenda.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Agenda.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Article.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Article.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Article.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Article.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/ContentTypes.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/ContentTypes.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/ContentTypes.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/ContentTypes.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Event.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Event.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Event.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Event.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/FileStorageItem.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/FileStorageItem.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/FileStorageItem.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/FileStorageItem.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/InlineSite.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/InlineSite.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/InlineSite.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/InlineSite.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Job.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Job.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Job.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Job.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/LegalNotice.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/LegalNotice.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/LegalNotice.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/LegalNotice.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Minutes.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Minutes.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Minutes.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Minutes.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/MultiPartArticle.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/MultiPartArticle.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/NewsItem.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/NewsItem.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/NewsItem.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/NewsItem.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/PressRelease.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/PressRelease.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/PressRelease.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/PressRelease.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Service.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Service.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Service.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Service.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/SiteProxy.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/SiteProxy.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/SiteProxy.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/SiteProxy.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/workspace-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/workspace-admin.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/workspace-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl similarity index 100% rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/workspace-index.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl diff --git a/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml b/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml index a1f6cabaa..7f604343b 100644 --- a/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml +++ b/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml @@ -1,7 +1,11 @@ + - + navigation-files com.arsdigita.web.ApplicationFileServlet @@ -14,8 +18,13 @@ com.arsdigita.london.navigation.NavigationFileResolver + + + navigation-files /ccm-ldn-navigation/files/* + + diff --git a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg index 8dde7ea18..23de591bd 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg +++ b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg @@ -28,7 +28,6 @@ ccm-cms-types-formsectionitem # -- ccm-cms-types-member # -- ccm-cms-types-minutes # -- ccm-cms-types-motditem - ccm-cms-types-mparticle ccm-cms-types-newsitem # -- ccm-cms-types-organization @@ -47,6 +46,7 @@ ccm-cms-types-xmlfeed # -- ccm-docmngr ## temp., produces errors in build # -- ccm-formbuilder-pdf ccm-forum +# ccm-forum-categorised ccm-simplesurvey ccm-themedirector ccm-user-preferences @@ -61,7 +61,6 @@ ccm-user-preferences # -- ccm-ldn-exporter # -- ccm-ldn-freeform # -- ccm-ldn-importer - ccm-ldn-navigation ccm-ldn-portal ccm-ldn-rss diff --git a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties index 79ba3934d..08b90fc8c 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties @@ -3,6 +3,7 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage # ; dhtml editor to use (system wide) +; Xinha is default ; default: Xinha editor & src=/assets/xinha/XinhaLoader.js #waf.bebop.dhtml_editor=FCKeditor @@ -19,6 +20,7 @@ waf.kernel.supported_languages=de,en ; security.properties: waf.auto_registration_on=false + # MOVED to ui.Config #waf.pagemap.root=navigation/ #waf.pagemap.workspace=navigation/ @@ -49,6 +51,13 @@ com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver ; Configure dhtml editor for use in cms content-center +; Xinha is default and should work out of the box +;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js +; as a temporary measure a different configuration file which includes a link selection box for CCM items +; and CCM images should be specified: +com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js + +; to use FCKeditor: ; 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= diff --git a/ccm-zes-aplaws/bundles/devel/cfg/web.xml b/ccm-zes-aplaws/bundles/devel/cfg/web.xml index 2e0b80c57..0b7af1767 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/web.xml +++ b/ccm-zes-aplaws/bundles/devel/cfg/web.xml @@ -304,33 +304,33 @@ - + theme-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-theme + /templates/ccm-themedirector ThemeDownload - com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet + com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet ThemePreviewServlet Servlet to allow admins to preview look/feel - com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet + com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet prefix /theme - + - + theme-files /theme-files/* @@ -419,7 +419,7 @@ ThemePreviewServlet /theme/* - + */ +/* <--@import url("/css/tabbed-pane/tabbed-pane.css");--> */ + + +body { + margin: 0; + background-color: #FFF; + color: #000; + font-family: Verdana, Arial, Helvetica, sans-serif; +} + +.forum { + font-size: 0.8em; + margin: 8px 0 10px 2px; +} + +.content { + margin-left: 10px; +} + + +/*form submission*/ + +.forumSelect { + margin-top: 0.2em; + float:left; +} +.forumButton input { + float:left; + margin-top: 0.2em; + margin-right: 5px; + padding-left: 2px; + padding-right: 2px; + color: #000; + background-color: #CCC; + vertical-align: middle; + border: 1px solid #000; + +} + +.submit { + clear: both; + margin-left: 100px; +} + +/* +view all threads + +*/ + +#selectLabel { + float:left; + color: white; + padding-top: 0.2em; + padding-left: 0.2em; +} +#selectCategory { + background-color: #999; + height: 2.2em; + +} + +#threadHead { + background-color: #E5F3FC; + font-weight: bold; + height: 1.5em; + padding-left: 0.2em; + margin-bottom: 0.3em; + +} +#noMessages { + clear:both; + float:left; + width: 100%; + +} +.subject { + clear: both; + float:left; + width: 190px; + padding: 4px 0 4px 22px; + background-position: 4px 0.7em; + background-repeat: no-repeat; + background-image: url("images/forum/read.gif"); +} + +.topic { + clear:both; + float:left; + width: 212px; + padding: 4px 0 4px 0px; +} + +.threadSubject { + clear:both; + float:left; + width: 140px; + padding: 4px 0 4px 0px; +} + +.author { + float:left; + width: 100px; + padding: 4px 0 4px 0px; + text-align: center; +} + +.replies { + float:left; + text-align: center; + width: 60px; + padding: 4px 0 4px 0px; +} + +.threads { + float:left; + text-align: center; + width: 75px; + padding: 4px 0 4px 0px; +} + +.status { + float:left; + width: 75px; + padding: 4px 0 4px 0px; +} + +.delete { + float:left; + text-align: center; + width: 50px; + padding: 4px 0 4px 0px; +} + +.lastPost { + float: left; + text-align: center; + width: 150px; + padding: 4px 0 4px 0px; +} + +#newTopicLink a { + padding: 4px 0 4px 22px; + background-position: 0px 0.3em; + background-repeat: no-repeat; + background-image: url("images/forum/post-16x16.gif"); +} + +#viewAllTopicsLink a { + float: left; + padding: 4px 15px 4px 22px; + background-position: 0px 0.3em; + background-repeat: no-repeat; + background-image: url("images/forum/back-to-16x16.gif"); + +} + +#watchTopicLink a { + float: left; + padding: 4px 0 4px 22px; + background-position: 0px 0.3em; + background-repeat: no-repeat; + background-image: url("images/forum/watch-16x16.gif"); + margin-left: 0.8em; + margin-bottom: 0.8em; +} + +#info { + clear:both; + padding: 4px 0 4px 22px; + background-position: 0px 0.6em; + background-repeat: no-repeat; + background-image: url("images/forum/info-16x16.gif"); + color: green; + margin-left: 0.8em; +} + +.post { + clear: both; + margin-bottom: 0.8em; + font-size: 1em; +} + +.postOdd { + background-color: #EFEFEF; + +} + +.postEven { + background-color: #FFFFFF; +} + +#topic { + margin-bottom: 0.8em; + font-weight: bold; +} + +.actions { + float: right; + margin-right: 0.3em; +} + +.header { + float: left; + margin-left: 0.3em; + font-weight: bold; +} + +.message { + clear: both; + float: left; + width:98%; + margin-left: 0.3em; + margin-bottom: 0.5em; +} + +.postDetails { + clear: both; + float: left; + margin-bottom: 0.5em; + margin-left: 0.3em; +} + +.bar { + clear:both; + float:left; + width: 98%; + padding-left: 0.3em; + padding-right: 0.3em; + padding-top: 0.5em; + padding-bottom: 0.5em; +} + +.replyBar { + clear:both; + padding-right: 0.3em; + padding-top: 0.5em; + padding-bottom: 0.5em; +} + + +.clearGroup { + clear:both; + margin-bottom: 0.5em; +} + +.columnOne { + float: left; + width: 100px; + font-size: 1em; +} + +.columnOneWide { + float: left; + width: 130px; + font-size: 1em; +} + +.columnTwo { + display: inline; + font-size: 1em; + margin: 0; +} + + +.columnTwo input { + width: 300px; +} + +.columnTwo select { + width: 300px; +} + + +.columnTwo textArea { + width: 300px; +} + +.columnThree { + font-size: 1em; +} + +#title { + float:left; + width: 100%; + + font-size: 1.2em; +} + + +fieldset { + padding: 0.3em 0.3em 0.3em 0.3em; +} + +.fileLink { + margin-left: 0.5em; + clear: both; + float:left; +} + + +textarea { + width: 450px; +} + +.validationError { + color: red; + margin-left: 100px; +} + +#images { + clear: both; + float:left; + margin-left: 0.3em; +} + +#plainText { + clear: both; + font-size: 1em; + margin-bottom: 0.5em; +} + +li { + list-style-position: inside; +} + +.expiry input { + width: 50px; +} + +.fileTable { + width: 100%; +} + + +pre { + + font-size: 1em; +} + + +/* Contents of tabbed-pane.css - forum tabs */ + +div.tabbed-pane div, div.tabbed-pane table.tab-set, div.tabbed-pane table.tab-set td { + margin: 0; + border: 0; + padding: 0; +} + +div.tabbed-pane table { + border-collapse: collapse; +} + +div.tabbed-pane table.tab-set { + margin-left: 10px; +} + +div.tabbed-pane table.tab-set a { + text-decoration: none; + color: rgb(63,63,63); +} + +div.tabbed-pane table.tab-set td.tab-label { + margin-left: 4px; + padding: 5px 0 3px 10px; + + background: rgb(225,225,225) url(/css/tabbed-pane/tab-unselected.png) no-repeat; +} + +div.tabbed-pane table.tab-set td.tab-end { + width: 10px; + background: url(/css/tabbed-pane/tab-unselected-end.png) no-repeat; +} + +div.tabbed-pane table.tab-set td.current-tab-label { + margin-left: 4px; + padding: 5px 0 3px 10px; + background: rgb(162,30,30) url(/css/tabbed-pane/tab-selected.png) no-repeat; + color: white; +} + +div.tabbed-pane table.tab-set td.current-tab-end { + width: 10px; + background: url(/css/tabbed-pane/tab-selected-end.png) no-repeat; +} + +div.tabbed-pane table.tab-set td.tab-spacer { + width: 4px; +} + +div.tabbed-pane table.rule { + margin-left: 10px; + width: 100%; + background: rgb(162,30,30) url(/css/tabbed-pane/tab-bar.png) repeat-x; + height: 10px; +} + +div.tabbed-pane div.current-pane { + width: 100%; +} + diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl index b7b067338..b68bf25b1 100644 --- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl +++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl @@ -1,22 +1,1307 @@ - - + - - - + + + + + - + + + + + + + - - - - + + + + + + + + + + + + Forum + + + + + + + + + + Skip over navigation + | + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + | + + + + | + +
+

+
+
+ +
+
+ + + + + + + + + + + postOdd + + + postEven + + + + + + + + + + + + + + + + + + + + + + + +
Thread:
+ + + + +
+
+
+
+ + + ( + + ) + +
+ + +
+ + + Approve + + +   + + + + + Reject + + +   + + + + Edit + + +   + + + + Delete + + +   + + +   +   +   + + Reply + +   + Reply +   + +
+ +
+ +
+ Posted:  + +  by  + + + +
+ +
+ + +
+ + + + + + + + + _blank + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ + +
+ {./description} +
+ +
+
+
+ + + + + + +
+ +
+ + + + +
+
+ + + + + + + + + + <<< Previous + +   +   + + Page  +   + of  +   + +   +   + + + + + + + + + Next >>> + + +
+ + + + + +
+
+ +
+
Filter by topic:
+ +
+ +
+
+
+
+ + + + +
+
+
Thread
+
Author
+
Replies
+
Last Post
+
+ +
No messages have been posted yet
+ + + +
+ + + + odd + + + even + + + + + +
+ + + +
+
+ +
+
+ +
+
+ +
+ +
+ +
+ + + + + + +
+
+
Subject
+
Replies
+
Author
+
Last Post
+
Status
+
Delete
+
+
+ +
+ You are not subscribed to any threads +
+ + + + + + postOdd + + + postEven + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + + +
+ + + + false + + + +
+ + + + + +
+
+
Topic
+
Threads
+
Last Post
+
+ + + + + + postOdd + + + postEven + + + +
+
+ + + + + + + + + + + + + + + + + +
+
+ +
+
+ + + + + + n/a + + +
+
+ + + + + + postOdd + + + postEven + + + +
+
+ + + + + + + + + + + None + + + + None + + +
+
+ +
+
+ + + + + + n/a + + +
+
+ +
+ + + +
+
Forum Alerts
+
+ +
+ + + + + +
+
Thread Alerts
+
+ +
+ + + + +
+ + + + +
+ + + + +
+
+
+   +
+ +
+
+ + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + forum member list +
+
+ + + +
+
+
+ + + + +
+ +
+
+   +
+ + + +
+ +
+
+   +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + post + + + + + + + +
+

+ +
+ +
+
+ + + + + +
+
+ +
+
+ +
+
+
+ + + + +
+
+
+
+
+ +
+ + + + +
+
Subject:
+
+ +
+ +
+
+
+
+
Message:
+
+ +
+ +
+
+
+ + + +
+
Topic:
+
+ +
+
+ + +
+ Original Message: +
+
+
+ +
+
+ + + + + + + + + + +
+
+ + + +
+
+ +
+ Posted + +
+
+
+ +
+
+ + + + + + + + + + + + + +
+
Image:
+
+ +
+ +
+
+
+
+
Description:
+
+ +
+ +
+
+
+
+
+ +
+
+ + + + + + + +
+ No images attached to this post +
+ + + + + + + + postOdd + + + postEven + + + +
+
+
+ {@caption} +
+
+ +
+
+ Remove +
+
+
+ + + + + + + + + + +
+ +
+ +
+
File:
+
+ +
+ +
+
+
+
+
Description:
+
+ +
+ +
+
+
+
+
+ +
+
+ + + + + +
+ No files attached to this post +
+ + +
+ + + + + + + + + + + + +
File
Description
 +
+ + + + + + + + + + + Remove
+
+
+ + + + + + + +
+ +
+ + + + + + + + Post New Message + + + Add Images (optional) + + + Add Files (optional) + + + Preview New Message + + + + + + + + + + + + Edit Message + + + Edit Images + + + Edit Files + + + Preview Changes + + + + + + + + + + + + Post reply + + + Add Images (optional) + + + Add Files (optional) + + + Preview Reply + + + + + + + + +
+
+ + + +
+

+
+
+ +
+
Name:
+
+ +
+ +
+
+
+
+
Description:
+
+ +
+ +
+
+
+
+
+ +
+
+
+ +
+ + + + + +
+ + + + + +
+

+
+
+
+ + +
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+ + + +
+ + + + + +
+ + + + +
+
+
+ +
+
+
+
+ +
+ + +
+
+ + + +
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+ + +
+
+ +
+
+ +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + +
+ You are watching this thread. To stop watching this thread, click "Stop Watching Thread" below. +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif new file mode 100644 index 0000000000000000000000000000000000000000..2d3db34c246ef61ee3d3fc6c07a12964c04b1949 GIT binary patch literal 561 zcmZ?wbhEHb6krfwc;?K|(9m%C^5vsPkADCDy}rKw_U+r}&!6w_?|<;%!SUnAr%#{$ z=FOYs%a`Zm^_wQe_WXY{tw{mlHH8nN!^YbezD%#uIeSCa;eSL$2 zgJoo7TwGjs?%Ww29sTIhqnkHxwzjr5H#cWyW}ZEJcFL3~PEJl~X=zDGNr{Px=H}*h zc6Rpm_TAmxN=iy=*RFMNaHy%NDJ?Da^YeT0;zeL!;D!wwGBPs4!otMF#AeN!6&o8H zA0Pkv^=m6DtHp~KPna-a>(;IR|NmzgfiZfb66Z4tDP zHnFtP6cKD=mzCh+;b&sxP-1D-nKEq#haI;-tNzsKGZ!mpw~DH(EnF-oWz{OCsHY*q zt0HM8Zr>^+%xuTX>Ez(ZaHvH~fR|5*@6?%d&C;gK=2xzrU8j8P#QhshVg|g%wnk4| mC669Id0Jezl}*Z8^$EMYAzNFUgoVR`2aFAj!eU%34Aub6l$;X) literal 0 HcmV?d00001 diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif new file mode 100644 index 0000000000000000000000000000000000000000..95d374a3280ecf58fb62b2c8e8800e79f422c122 GIT binary patch literal 552 zcmZ?wbhEHb6krfwc*e-Uz`*eT|9?q&33eGK$7hmm&*gQ~<)y5Jn%`$e=Z0H8;+f^|g!N1~X9|{+tWJogWI^E3Au_r)>B-zjH^e zy1wenHB-3NnPpQsxYd}g&Inqa5H#N-V0}c$`k;`(Y<^)&Hr+0Memz#(Euyv?MU_%` zRJ4?=XNZZ&2=d6Yh#0erND01w|Nj2{`{&P}-@kwV`t|GQ&!6Al-(O!}Urh0O)cMcS3hYv1r=2_Hg-KfkLExDE)g*nNf}vrMI~i_S4J-bQ6WJ- zUhb{p60A~wO&*RG=4K{_LBjkec$k~r0_|*VEZyCFj7*IUT9!IHI5m4&Tlu$n+6S}* QxVZQIXJF>yVqvfb01o|uAOHXW literal 0 HcmV?d00001 diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif new file mode 100644 index 0000000000000000000000000000000000000000..867d48eee6caeea85238454b80e532be132f9fdd GIT binary patch literal 581 zcmZ?wbhEHb6krfwc$Us^;`s58A3v^Hz54Ov#}oVeZy4!B`uLO;mxSBd?b^9B)X?y0 zQQXs+Jx^!#K3zWVW`O$c0Xm>B5e>2Yp8kK+dpwOdzumuYH4<} zuW@Cld#H)g6E};e)4SY_4G*|k-i+})V5psAYZhu@`ZUDp>4b)-)#*>ml5Pe%gc=)V zq^8Y@_Rm&VeHvi@#L@I=Z%weO%E1_)oBsB562l{XeV*n=M}i_@$8K?vlf3h$#Fr+i+fXoBM2?P70hV-W9 zme#h`G!3R!Mh1o!Mqk!|{-!jp*f_SdrU>VtWR_+QR-Hf>vov-)Z4cvwW)=%W&B%Dc zXgO|q1;!Qz_fRioVWGqnH_kR@bA5Fs0Y|6q_H!lI&@_yxVW~9%FSWhF(J^o+uV`EY>G#EW`m+}(worR J85#l%)&Nc6#e)C< literal 0 HcmV?d00001 diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif new file mode 100644 index 0000000000000000000000000000000000000000..3e9a90a47b4e878e4e07b38bb6725623614de543 GIT binary patch literal 551 zcmZ?wbhEHb6krfwc;?RV>ydFuf_Y80`QPV;Z%&&%o7?m0lKHwr|-&5j1KlbvB)$k$Zb}={>z-_qflAM&-Fps&_<*{aZ zH};r3ymkIqR@j}14TTwTrC~ufrUnN#Er<;ZxOVmG|Ns9Ph6qsn$->CM;Le}}axW-O z7}#4H+?$$PTH9LOxCQvyJ2d%OdBuC(-Lw>JcqaC=xjEZA2#U=Tn9FFOEN^VB&d=TI z#>l~*eNMmNxy98(vTE#F@4y=#U*R$`f~~s8xw;y09mMPfox2`X+UC=Aw&B=bm41@WElXXm^(=*NG>lTzz$| z{YbZigTu=&uey)*U3qoYKHR?ZXs_Rb;K?Va$@wcZ9&Ek&=JwZLU*COyC*vo-@y6y$ zFE1Nsndye<-+%vL*WEqee}A`kus`+mjA^i0{)Xb6cXn6rtDkdjUh%H-v(L`0zPdJY zY3$y6`+xlYQM$WQJ50|e%uYR6>*t@Jk3T-S{`yAS;m%)wew{vh`rP?*M;;wDFfd5Z z$$0(swL^jP@4vtK`1#b5HGBJdb^P@H{r~sz$Hx!fKYaM{(aP3ZKfv(Bm6NZ&zTR+S zlX0Z!&p*F@|NWDfpO>1IYHx4qTlH80oz7|&D z40f*k>iSJ0f=Wzg&OG=0+_+d}n*`L@f)p6uFc>juaV6X-N+z#P% literal 0 HcmV?d00001 diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif new file mode 100644 index 0000000000000000000000000000000000000000..07b98d107693a2eb17be50bb0d6177accdd1ea64 GIT binary patch literal 1010 zcmZ?wbhEHb6krfw_|C|{z`*eT|9@X!m+b6>Ei0K_9GGIGw88@!rgSlPHL?YIv#eXp zy=Q|!UkmT73H*JneETJj4pWUy1 z?tn&+ufX|(n&%H`T{@z>eYN_X=?3t3O7%g-a2h|`;7UWvzB+yS>3;2bML(M!%KD#F51U86z!}IH|&#$|^xat1tmgmcx9+?T<72!E^3vYFe}De``ThI%uV24@{`~p<{r&az^#uh54h{~W=otmH1d2ad7#SEC z8FWCFfbs+b$9V>34jG9B0dn>%!fXO1FZ{Yi^;k4{3{LpTo8&%Pk#Nxc;Q}V!Z8esQ zpZRuKHVVB`e2~yJ%^>y0j)~104;h*G=h!SflzL{SX@Lsgn*|N+0?J;iVqQA6`Oclf zBz$tiMr98{wZJtMf|JwEJ2)#QTsZMC*<+Gg(1r#>W{(96c;w=ySS(~dF;O*eQ^m_- zj|Gg}(k>HLG(Kh*R0;SeAXVYP#L6S@c4o)LX1|3kjXn-D3L2R^B$yVc*-UA0Y~hmn X^U0M-8h^YQO!Qbt`$KX6)2Z&^);Z((|5ScY(9jdyElVqS4- zW{!u0rJkC-wzAU8$Ii#YZdFKmVN`%;T5eiUjdyI3dvK6^a+!sDpp1g6qo2UQ!0ztu z>gwv~=;-C;<>ch#;^N}o-rn5Y+}YXL*Vot8)z#6_(az4!%*@Qo%ge~f$i~LT!otG9 zz`(t|y}7x$wzjsjv$L_Wv9GVMtgNi3r>CT(q@kgqot>SUnwpiBm6DQ@kB^Uvii(DY zhJAf~A^8LW000^QEC2ui00{sI000I>Kn(yxxl}L!p`-!oY#fDQ22~P$I1h{==31Rd uArE45qrqA#)5tR5$1C8JH#j literal 0 HcmV?d00001 diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif new file mode 100644 index 0000000000000000000000000000000000000000..0395fca0fee64473a7f5f22abd26f2e523bf4977 GIT binary patch literal 1024 zcmZ?wbhEHb6krfw_|C|{z`*eT|Nofu=+wPY_GK2v@w(~zVlwu{r0f*>?VRI9n9c#3v z^(vL-NoOQUY+RIK>-cAK8sYt~Sq?BgzKtj~A;kk!S**2i{Q?p$kj^@RQP zla9B}IG^5Ucl)gCy$kMl&$~Ui==t!nSE#?tldC?f=373y=J(=e!1EgcFK-3Cz7w)& zhSl49VdeSS@9&3yco6yVVbqr=F`phqAKl^g^ji40XYpU3#{GPm^y5WhPqVp?yWFo= zDSJ2i)Rr3kd6V}0b?V!D31<%k`+Ca%dzbO|ZTkQBng8Es{r{N#|5MKXt$_`d_6adY z39-%z@nJbBn%|!#{Ctu0`&G)Xm&t!#r@p(F`2Ss|jI^-3tLgjq@6Vq;PsT<}Q{;z+;2g_}Zx3#K%viKo-1x!@!xZ=Pyb8j#8#t2G&Pq9zfBN7! zBY>4#GU3Ps!4M6;MRq+x>nxg5y{8+bUgDWl{G#8bamoUpm6KXePd7}zv11`~#)2iP zev1NjE;`EH$)a>Wq)24JL_t;Gc^(^?4mvOzH+rRTD1LCCsN&-j(ec57v5}QeDMmmd zlS5EN*&<}d1BQbQ%)BNXF<08$dWDtD0wx?#Xl!ufRNUF2c!aHkPeRHzv||x#kJTi* TiWxHuS{E(o)zIYOV6X-NxMD=V literal 0 HcmV?d00001 diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif new file mode 100644 index 0000000000000000000000000000000000000000..01e001924f00a51e59f388663cba80bf56e2711c GIT binary patch literal 1039 zcmZ?wbhEHb6krfw_|C|{z`*eT|9=@7O;uGhMMVQ`Z98RUBL|0QBO`Znb6;EAPz41Y zd;2g&MO_Dna6>~U9UW^mHDeEt1a);2MMWJ4hY)LPUlkSo#KhX@=+gN33OzlmjEttV zw1&*grktGCtgL1uBip>ZwzRaG!orS%g7)I#uA-vO;^NNI((dZ&33YXoYHKIf)J&+Z z?l(5JZfKZXUq7j?Zlal)U1Q_q=H{s#9Wy&SXZH5a>F%CoU|>3F(gIss=c!W{O_{QA z`t-%KXD^#KZ-tkapSQRFvSsU*E?v8N^``afx2{{aB{Vc*!-lQv*KgUhY5UHddqYFR zH*VU#VdJ(fTX*i*x##Gq3rEjfK6?7%;p3-|p1pGP^o1j*&L2K;=KcHk_wV07fByXb z{rlIiU%zm-cIBCRss*BUl=!wB0mX1zIeTz2{i;f)cP>C_i rC=gtHq*Xs&qar~u*@Z(-X|Br*gCpGz`c7&-9!wV(d~Rf9WUvMRH2V@K literal 0 HcmV?d00001