From 33b91fe6658399793e9b76e6337b30ff238b7d94 Mon Sep 17 00:00:00 2001 From: pb Date: Wed, 30 Mar 2011 16:12:51 +0000 Subject: [PATCH] ZeS Bundle complet angepasst, damit funktioniert alles mit themedirector, auch publish, aber noch nicht die Anzeige der Dateien im devel Directory (sie sind aber da). git-svn-id: https://svn.libreccm.org/ccm/trunk@811 8810af33-2d31-482b-a856-94f89814c4df --- .../aplaws/ui/HomepageWorkspace.java | 12 ++-- .../templates/ccm-ldn-portal/portal/index.jsp | 59 +++++++++--------- .../london/portal/WorkspaceConfig.java | 12 ++-- .../ui/DefaultPortalSelectionModel.java | 4 +- .../london/portal/ui/DefaultWorkspace.java | 11 +++- .../london/portal/ui/PortalList.java | 33 ++++++++-- .../portal/ui/PortletSelectionModel.java | 6 ++ .../web/WEB-INF/web.ccm-ldn-portal.xml | 22 +++---- .../web/templates/ccm-ldn-portal/index.jsp | 46 ++++++++------ .../themedirector/ThemeDirectorConfig.java | 1 - .../themedirector/ThemeDirectorConstants.java | 3 +- .../themedirector/ui/ThemeFilesList.java | 2 + .../ui/ThemeValidationPanel.java | 2 +- .../listeners/ApproveThemeActionListener.java | 2 +- .../bundles/devel/cfg/integration.properties | 2 +- .../resources/aplaws-stylesheet-paths.txt | 16 +++-- .../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 | 0 .../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/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/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 116 files changed, 149 insertions(+), 93 deletions(-) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/admin-index.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/admin-index.xsl (84%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/atoz-admin.css.NotUsedForNow (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/atoz-admin.xsl.NotUsedForNow (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/atoz-index.css.NotUsedForNow (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/atoz-index.xsl.NotUsedForNow (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/category-step.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/consultations-index.xsl (98%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/content-center-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/content-section-admin.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/content-section-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/css/main.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/css/wysiwyg.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/categorised-forum/forum-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/forum-index.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/forum-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/archived-16x16.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/back-to-16x16.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/delete-16x16.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/edit-16x16.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/info-16x16.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/post-16x16.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/read.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/reply-16x16.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-example/images/forum/watch-16x16.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-index.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/forum-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/aplaws-logo-small.png (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/aplaws-logo.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/aplawsplus.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/arrowSitemap.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/customize.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/delete.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/display.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/moveDown.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/moveLeft.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/moveRight.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/portal/moveUp.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/spacer.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/tlcArrow-s.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/tlcArrow.gif (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/w3c-css.bmp (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/w3c-css.png (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/w3c-xhtml.bmp (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/images/w3c-xhtml.png (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/body.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/head.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/header.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/leftNav.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/lib.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/lib.xsl~ (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/page.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/lib/user-banner.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-admin.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-admin.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-directory.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-services.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-sitemap.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/navigation-summary.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/application-directory-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/content-item-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/content-sections-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/directory-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/freeform-html-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/lib.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/login-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/portlets.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/rss-feed-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/tasklist-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/time-of-day-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/portal/workspace-directory-portlet.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/search-admin.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/search-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/shortcuts-index.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/shortcuts-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/subsite-index.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/subsite-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/terms-index.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/terms-index.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/theme-index.css (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/theme-index.xsl (87%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Address.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Agenda.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Article.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/ContentTypes.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Event.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/FileStorageItem.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/InlineSite.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Job.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/LegalNotice.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Minutes.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/MultiPartArticle.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/NewsItem.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/PressRelease.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/Service.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/types/SiteProxy.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/workspace-admin.xsl (100%) rename ccm-zes-aplaws/web/{__ccm__/themes => themes/static}/aplaws-generic/workspace-index.xsl (100%) diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java index e4c44173b..fa3836d0f 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java @@ -18,18 +18,18 @@ package com.arsdigita.aplaws.ui; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.ActionLink; import com.arsdigita.bebop.Page; +import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.ActionEvent; import com.arsdigita.bebop.event.ActionListener; -import com.arsdigita.london.portal.ui.PersistentPortal; -import com.arsdigita.london.portal.Workspace; -import com.arsdigita.bebop.PageState; -import com.arsdigita.xml.Element; -import com.arsdigita.london.portal.ui.PortalConstants; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PrivilegeDescriptor; import com.arsdigita.kernel.Party; import com.arsdigita.kernel.Kernel; +import com.arsdigita.london.portal.ui.PersistentPortal; +import com.arsdigita.london.portal.ui.PortalConstants; +import com.arsdigita.london.portal.Workspace; +import com.arsdigita.xml.Element; public class HomepageWorkspace extends SimpleContainer { @@ -121,6 +121,7 @@ public class HomepageWorkspace extends SimpleContainer { m_editor.setVisible(state, !browse); } + @Override public void register(Page page) { super.register(page); @@ -131,6 +132,7 @@ public class HomepageWorkspace extends SimpleContainer { page.setVisibleDefault(m_editor, false); } + @Override public void generateXML(PageState state, Element parent) { Party party = Kernel.getContext().getParty(); diff --git a/ccm-ldn-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp b/ccm-ldn-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp index 00ae948a8..be25d901d 100755 --- a/ccm-ldn-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp +++ b/ccm-ldn-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp @@ -1,39 +1,40 @@ + xmlns:define="/WEB-INF/bebop-define.tld" + xmlns:show="/WEB-INF/bebop-show.tld" + version="1.2"> - - - DispatcherHelper.cacheForWorld(response,900); - - - - - - - - -HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel(); -((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0)); -((HomepageWorkspace)left).setReadOnly(true); -((HomepageWorkspace)left).setName("left"); -((HomepageWorkspace)left).addWidgets(); -((HomepageWorkspace)middle).setModel(new HomepagePortalSelectionModel(workspace, 1)); -((HomepageWorkspace)middle).setReadOnly(true); -((HomepageWorkspace)middle).setName("middle"); -((HomepageWorkspace)middle).addWidgets(); -((HomepageWorkspace)right).setModel(new HomepagePortalSelectionModel(workspace, 2)); -((HomepageWorkspace)right).setReadOnly(true); -((HomepageWorkspace)right).setName("right"); -((HomepageWorkspace)right).addWidgets(); + DispatcherHelper.cacheForWorld(response,900); - - + + + + + + + + HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel(); + + ((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0)); + ((HomepageWorkspace)left).setReadOnly(true); + ((HomepageWorkspace)left).setName("left"); + ((HomepageWorkspace)left).addWidgets(); + ((HomepageWorkspace)middle).setModel(new HomepagePortalSelectionModel(workspace, 1)); + ((HomepageWorkspace)middle).setReadOnly(true); + ((HomepageWorkspace)middle).setName("middle"); + ((HomepageWorkspace)middle).addWidgets(); + ((HomepageWorkspace)right).setModel(new HomepagePortalSelectionModel(workspace, 2)); + ((HomepageWorkspace)right).setReadOnly(true); + ((HomepageWorkspace)right).setName("right"); + ((HomepageWorkspace)right).addWidgets(); + + + + diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java index 349278fb3..df62dd49c 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java @@ -145,9 +145,9 @@ public class WorkspaceConfig extends AbstractConfig { return Arrays.asList(adminTypes); } - public boolean useWysiwygEditor() { - return ((Boolean) get(m_htmlPortletWysiwygEditor)).booleanValue(); - } + public boolean useWysiwygEditor() { + return ((Boolean) get(m_htmlPortletWysiwygEditor)).booleanValue(); + } private PrivilegeDescriptor workspacePartyPrivilegeDescriptor = null; @@ -172,7 +172,7 @@ public class WorkspaceConfig extends AbstractConfig { return workspacePartyPrivilegeDescriptor; } - public boolean getCheckWorkspaceReadPermissions() { - return ((Boolean) get(m_checkWorkspaceReadPermissions)).booleanValue(); - } + public boolean getCheckWorkspaceReadPermissions() { + return ((Boolean) get(m_checkWorkspaceReadPermissions)).booleanValue(); + } } diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultPortalSelectionModel.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultPortalSelectionModel.java index e5d8554f2..50a0fa486 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultPortalSelectionModel.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultPortalSelectionModel.java @@ -35,7 +35,7 @@ public class DefaultPortalSelectionModel extends ACSObjectSelectionModel } public DefaultPortalSelectionModel(WorkspaceSelectionModel workspace, - BigDecimalParameter param) { + BigDecimalParameter param) { super(WorkspacePage.class.getName(), WorkspacePage.BASE_DATA_OBJECT_TYPE, param); @@ -50,6 +50,7 @@ public class DefaultPortalSelectionModel extends ACSObjectSelectionModel return m_workspace.getSelectedWorkspace(state); } + @Override public Object getSelectedKey(PageState state) { BigDecimal key = (BigDecimal) super.getSelectedKey(state); if (key == null) { @@ -59,6 +60,7 @@ public class DefaultPortalSelectionModel extends ACSObjectSelectionModel return super.getSelectedKey(state); } + @Override public DomainObject getSelectedObject(PageState state) { BigDecimal key = (BigDecimal) super.getSelectedKey(state); if (key == null) { diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspace.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspace.java index b57d51ffd..3f5e3c6c5 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspace.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspace.java @@ -42,13 +42,20 @@ public class DefaultWorkspace extends WorkspaceComponent implements private static final Logger s_log = Logger .getLogger(DefaultWorkspace.class); - public DefaultWorkspace() { + /** + * Constructor + */ + public DefaultWorkspace() { super(new DefaultWorkspaceSelectionModel()); addCustomizeListener(this); } - public void actionPerformed(ActionEvent e) { + /** + * + * @param e + */ + public void actionPerformed(ActionEvent e) { PageState state = e.getPageState(); Workspace workspace = getWorkspaceModel().getSelectedWorkspace(state); diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalList.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalList.java index 12197ce80..72dae0ddf 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalList.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalList.java @@ -32,6 +32,10 @@ import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; import com.arsdigita.xml.XML; +/** + * + * + */ public abstract class PortalList extends SimpleContainer { private WorkspaceSelectionModel m_workspace; @@ -40,12 +44,22 @@ public abstract class PortalList extends SimpleContainer { private Map m_actions = new HashMap(); - public PortalList(PortalSelectionModel portal) { + /** + * Constructor. + * + * @param portal + */ + public PortalList(PortalSelectionModel portal) { this(null, portal); } - public PortalList(WorkspaceSelectionModel workspace, - PortalSelectionModel portal) { + /** + * Constructor + * @param workspace + * @param portal + */ + public PortalList(WorkspaceSelectionModel workspace, + PortalSelectionModel portal) { super("portal:portalList", PortalConstants.PORTAL_XML_NS); m_workspace = workspace; @@ -85,6 +99,12 @@ public abstract class PortalList extends SimpleContainer { return m_workspace.getSelectedWorkspace(state); } + /** + * + * @param state + * @param parent + */ + @Override public void generateXML(PageState state, Element parent) { if (!isVisible(state)) { return; @@ -97,7 +117,12 @@ public abstract class PortalList extends SimpleContainer { generatePortalListXML(state, content); } - protected void generatePortalListXML(PageState state, Element parent) { + /** + * + * @param state + * @param parent + */ + protected void generatePortalListXML(PageState state, Element parent) { WorkspacePage current = m_portal.getSelectedPortal(state); Workspace workspace = getSelectedWorkspace(state); diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletSelectionModel.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletSelectionModel.java index 0c8f8ff25..f2598d5d6 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletSelectionModel.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletSelectionModel.java @@ -20,6 +20,12 @@ import com.arsdigita.bebop.parameters.BigDecimalParameter; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.portal.Portlet; +/** + * . + * + * ACSObjectSelectionModel loads a subclass of an ACSObject from the database. + * + */ public class PortletSelectionModel extends ACSObjectSelectionModel { public PortletSelectionModel(BigDecimalParameter p) { diff --git a/ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml b/ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml index b53e037dd..fcfbb692f 100644 --- a/ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml +++ b/ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml @@ -1,17 +1,13 @@ - + - files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-ldn-portal - - - + portal-files com.arsdigita.web.ApplicationFileServlet @@ -19,6 +15,7 @@ /templates/ccm-ldn-portal + portlet-type-xsl com.arsdigita.dispatcher.PortletTypeXSLServlet @@ -26,14 +23,11 @@ - - files - /files/* - portal-files /ccm-ldn-portal/files/* + portlet-type-xsl /__ccm__/servlet/portlet-type/* diff --git a/ccm-ldn-portal/web/templates/ccm-ldn-portal/index.jsp b/ccm-ldn-portal/web/templates/ccm-ldn-portal/index.jsp index 819b156b1..0e8cb7000 100755 --- a/ccm-ldn-portal/web/templates/ccm-ldn-portal/index.jsp +++ b/ccm-ldn-portal/web/templates/ccm-ldn-portal/index.jsp @@ -1,30 +1,36 @@ + xmlns:define="/WEB-INF/bebop-define.tld" + xmlns:show="/WEB-INF/bebop-show.tld" + version="1.2"> - - - - - - + + + + + + - + DispatcherHelper.cacheDisable(response); - + - - + + if (Workspace.getConfig().getCheckWorkspaceReadPermissions()) { - viewWorkspace.addRequestListener(new ApplicationAuthenticationListener(PrivilegeDescriptor.READ)); + viewWorkspace.addRequestListener( + new ApplicationAuthenticationListener(PrivilegeDescriptor.READ)); } - - - ((AbstractWorkspaceComponent) view).setWorkspaceModel(new DefaultWorkspaceSelectionModel()); - - - + + + ((AbstractWorkspaceComponent) view).setWorkspaceModel( + new DefaultWorkspaceSelectionModel()); + + + + + diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java index 03b582e60..9326e20be 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java @@ -69,7 +69,6 @@ public class ThemeDirectorConfig extends AbstractConfig { new StringParameter ("themedirector.default_theme_path", Parameter.OPTIONAL, "/themes/master/"); - // Parameter.OPTIONAL, "/__ccm__/themes/default/"); /** Servlet context path containing the theme. */ private final Parameter m_defaultThemeContext = diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java index c5d23535c..90bd55d1f 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java @@ -30,7 +30,8 @@ public interface ThemeDirectorConstants { public final static String DEV_DIR_STUB = "devel-themedir"; // TODO: it would be nice if this value in com.arsdigita.web.URL // was public - public final static String CCM_PREFIX = "__ccm__"; + // public final static String CCM_PREFIX = "__ccm__"; + public final static String CCM_PREFIX = "themes"; public final static String WEB_APP_NAME = "ROOT"; // The location of the sync jsp used to sync up the multiple servers. diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeFilesList.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeFilesList.java index b4d6eb226..f9f69dbd5 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeFilesList.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeFilesList.java @@ -63,10 +63,12 @@ class ThemeFilesList extends SimpleContainer implements ThemeDirectorConstants { add(heading); } + @Override public void register(Page page) { page.addRequestListener(new FileRemovalRequestListener()); } + @Override public void generateChildrenXML(PageState state, Element root) { super.generateChildrenXML(state, root); File currentRoot = new File(Web.getServletContext().getRealPath("/")); diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java index 2307c1f54..ff36a046a 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java @@ -44,7 +44,6 @@ import com.arsdigita.templating.XSLTemplate; import com.arsdigita.templating.WrappedTransformerException; import javax.xml.transform.ErrorListener; -import org.apache.log4j.Logger; import javax.xml.transform.TransformerException; import org.apache.log4j.Logger; @@ -272,6 +271,7 @@ class ThemeValidationPanel extends GridPanel implements ThemeDirectorConstants { (GlobalizationUtil.globalize("themes.validation_errors")); } + @Override public void generateXML(PageState state, Element p) { if ( isVisible(state) ) { diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/ApproveThemeActionListener.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/ApproveThemeActionListener.java index 416e65bd9..2a430bcfa 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/ApproveThemeActionListener.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/ApproveThemeActionListener.java @@ -102,7 +102,7 @@ public class ApproveThemeActionListener implements ThemeDirectorConstants, Actio // but before we do that, we copy is_deleted flag from // development to published files DataOperation op = SessionManager.getSession().retrieveDataOperation( - "com.arsdigita.london.theme.bulkFileUpdate"); + "com.arsdigita.themedirector.bulkFileUpdate"); op.setParameter("themeID", theme.getID()); op.setParameter("timestamp", new Date()); op.execute(); diff --git a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties index 2aeee46c7..79ba3934d 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties @@ -114,7 +114,7 @@ com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui. # ccm-ldn-themedirector application themedirector.default_theme_context= themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf -themedirector.default_theme_path=__ccm__/themes/aplaws-generic +themedirector.default_theme_path=themes/static/aplaws-generic themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl diff --git a/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt index bf5a09a50..df964c308 100644 --- a/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt +++ b/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt @@ -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-zes-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/admin-index.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/admin-index.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/admin-index.xsl similarity index 84% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/admin-index.xsl index 2d9d2dcc5..fa0b5ad35 100644 --- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl +++ b/ccm-zes-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-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.css.NotUsedForNow b/ccm-zes-aplaws/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.css.NotUsedForNow rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.xsl.NotUsedForNow b/ccm-zes-aplaws/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.xsl.NotUsedForNow rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.css.NotUsedForNow b/ccm-zes-aplaws/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.css.NotUsedForNow rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow b/ccm-zes-aplaws/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/category-step.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/category-step.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/category-step.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/category-step.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/consultations-index.xsl similarity index 98% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/consultations-index.xsl index 75fe0ebdd..2d47ea5e1 100644 --- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl +++ b/ccm-zes-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-zes-aplaws/web/__ccm__/themes/aplaws-generic/content-center-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/content-center-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/content-center-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/content-center-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/content-section-admin.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/content-section-admin.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/content-section-admin.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/content-section-admin.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/content-section-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/content-section-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/content-section-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/content-section-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/css/main.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/css/main.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/css/main.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/css/main.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/css/wysiwyg.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/css/wysiwyg.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/css/wysiwyg.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/css/wysiwyg.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/archived-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/archived-16x16.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/back-to-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/back-to-16x16.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/delete-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/delete-16x16.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/edit-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/edit-16x16.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/info-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/info-16x16.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/post-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/post-16x16.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/read.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/read.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/reply-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/reply-16x16.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/watch-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/watch-16x16.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo-small.png b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo-small.png similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo-small.png rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo-small.png diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/aplawsplus.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/aplawsplus.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/aplawsplus.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/aplawsplus.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/arrowSitemap.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/arrowSitemap.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/arrowSitemap.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/arrowSitemap.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/customize.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/customize.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/delete.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/delete.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/display.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/display.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/moveDown.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/moveDown.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/moveLeft.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/moveLeft.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/moveRight.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/moveRight.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/moveUp.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/portal/moveUp.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/spacer.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/spacer.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/spacer.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/spacer.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow-s.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/tlcArrow-s.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow-s.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/tlcArrow-s.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/tlcArrow.gif similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow.gif rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/tlcArrow.gif diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.bmp b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/w3c-css.bmp similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.bmp rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/w3c-css.bmp diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.png b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/w3c-css.png similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.png rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/w3c-css.png diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.bmp b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.bmp rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.png b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.png similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.png rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.png diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/body.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/body.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/body.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/body.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/head.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/head.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/head.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/head.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/header.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/header.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/header.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/header.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/leftNav.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/leftNav.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/leftNav.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/leftNav.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/lib.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/lib.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/lib.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/lib.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/lib.xsl~ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/lib.xsl~ similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/lib.xsl~ rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/lib.xsl~ diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/page.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/page.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/page.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/page.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/user-banner.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/user-banner.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/lib/user-banner.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/user-banner.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-admin.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-admin.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-admin.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-admin.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-directory.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-directory.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-services.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-services.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-sitemap.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-sitemap.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-summary.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/navigation-summary.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/application-directory-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/application-directory-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-item-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-item-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-sections-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-sections-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/directory-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/directory-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/directory-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/directory-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/freeform-html-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/freeform-html-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/lib.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/lib.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/login-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/login-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/login-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/login-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/portlets.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/portlets.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/portlets.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/portlets.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/rss-feed-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/rss-feed-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/tasklist-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/tasklist-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/time-of-day-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/time-of-day-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/workspace-directory-portlet.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/workspace-directory-portlet.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/search-admin.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/search-admin.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/search-admin.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/search-admin.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/search-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/search-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/search-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/search-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/shortcuts-index.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/shortcuts-index.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/shortcuts-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/shortcuts-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/subsite-index.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/subsite-index.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/subsite-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/subsite-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/terms-index.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/terms-index.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/terms-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/terms-index.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/theme-index.css similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.css rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/theme-index.css diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/theme-index.xsl similarity index 87% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/theme-index.xsl index 44121cbda..3f85303aa 100644 --- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.xsl +++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/theme-index.xsl @@ -9,7 +9,7 @@ --> - + diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Address.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Address.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Address.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Address.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Agenda.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Agenda.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Agenda.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Agenda.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Article.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Article.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Article.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Article.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/ContentTypes.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/ContentTypes.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/ContentTypes.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/ContentTypes.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Event.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Event.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Event.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Event.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/FileStorageItem.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/FileStorageItem.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/FileStorageItem.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/FileStorageItem.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/InlineSite.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/InlineSite.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/InlineSite.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/InlineSite.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Job.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Job.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Job.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Job.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/LegalNotice.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/LegalNotice.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/LegalNotice.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/LegalNotice.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Minutes.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Minutes.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Minutes.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Minutes.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/MultiPartArticle.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/MultiPartArticle.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/NewsItem.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/NewsItem.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/NewsItem.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/NewsItem.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/PressRelease.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/PressRelease.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/PressRelease.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/PressRelease.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Service.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Service.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/Service.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/Service.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/SiteProxy.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/types/SiteProxy.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/types/SiteProxy.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/types/SiteProxy.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/workspace-admin.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/workspace-admin.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/workspace-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl similarity index 100% rename from ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/workspace-index.xsl rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl