diff --git a/ccm-gen-aplaws/CHANGE_LOG b/ccm-gen-aplaws/CHANGE_LOG new file mode 100644 index 000000000..7e21e3f96 --- /dev/null +++ b/ccm-gen-aplaws/CHANGE_LOG @@ -0,0 +1,10 @@ +2011-05-12 +Adaptation in web to the relocation of default theme files (from __ccm__ to +themes) and new names of modules ccm-ldn-portal and ccm-ldn-themes. + +2007-08-06: +./ccm-shp-aplaws/src/WEB-INF/content-types/c...types/aplaws-mparticle-item.jsp + - + + + log4j-conf-file + WEB-INF/conf/log4j.properties + + + + + + + + shortcuts + com.arsdigita.london.shortcuts.ShortcutFilter + + + + subsite + com.arsdigita.london.subsite.SubsiteFilter + + + + + + subsite + /* + + + + shortcuts + /* + + + + + com.arsdigita.web.CCMApplicationContextListener + + + + + + reg + com.arsdigita.web.ContextRegistrationServlet + + uri + / + + 1 + + + + legacy-dispatcher + com.arsdigita.sitenode.SiteNodeDispatcher + 3 + + + + ccm-dispatcher + com.arsdigita.web.DispatcherServlet + + fallback-servlet + legacy-dispatcher + + 2 + + + + legacy-adapter + com.arsdigita.web.LegacyAdapterServlet + + + + cache-manager + com.arsdigita.caching.CacheServlet + + + + db-test + com.arsdigita.web.monitoring.DBTestServlet + + + + versioning-log + com.arsdigita.versioning.VersioningServlet + + + + oid-redirect + com.arsdigita.web.OIDRedirectServlet + + + + resource-resolver + com.arsdigita.web.ResourceServlet + + + + + + content-section + com.arsdigita.cms.ContentSectionServlet + + + + content-type-xsl + com.arsdigita.cms.dispatcher.ContentTypeXSLServlet + + + + content-item-xsl + com.arsdigita.cms.dispatcher.ContentItemXSLServlet + + + + template-xsl + com.arsdigita.cms.dispatcher.TemplateXSLServlet + + + + TextOnlyServlet + Text Only Servlet + + com.arsdigita.web.InternalPrefixerServlet + + + prefix + /text + + + + + PrintFriendlyServlet + Printer Friendly Output Servlet + + com.arsdigita.web.InternalPrefixerServlet + + + prefix + /print + + + + + + + + + + forum-main + com.arsdigita.forum.ForumServlet + + + + + portal-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-ldn-portal + + + + + navigation-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-ldn-navigation + + + file-resolver + com.arsdigita.london.navigation.NavigationFileResolver + + + + + 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/* + + + + portal-files + /ccm-ldn-portal/files/* + + + + navigation-files + /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 + /ccm/* + + + + legacy-adapter + /__ccm__/servlet/legacy-adapter/* + + + + cache-manager + /expireCache/* + + + + db-test + /dbtest + + + + versioning-log + /versioning/* + + + + oid-redirect + /redirect/* + + + + resource-resolver + /resource/* + + + + + + content-section + /__ccm__/servlet/content-section/* + + + + content-item-xsl + /__ccm__/servlet/content-item/* + + + + content-type-xsl + /__ccm__/servlet/content-type/* + + + + template-xsl + /__ccm__/servlet/template/* + + + + TextOnlyServlet + /text/* + + + + PrintFriendlyServlet + /print/* + + + + + + com.arsdigita.dispatcher.AccessDeniedException + /error/access-denied.jsp + + + + com.arsdigita.dispatcher.ObjectNotFoundException + /error/object-not-found.jsp + + + + com.arsdigita.kernel.permissions.PermissionException + /error/permission-denied.jsp + + + + com.arsdigita.persistence.DbNotAvailableException + /error/db-not-available.jsp + + + + com.arsdigita.db.DbNotAvailableException + /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/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java index 0c0003463..faa437fc7 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -132,7 +132,7 @@ public class Loader extends PackageLoader { public void run(final ScriptContext ctx) { - + String[] files = categoryFiles; final Parser parser = new Parser(); @@ -180,10 +180,18 @@ public class Loader extends PackageLoader { registerNavigationTemplates(); // Switch /portal/ to use 1 column layout for funky aplaws stuff. - Workspace portal = (Workspace)Application + // pboy: This will have no effect at all. A portal page created at + // url /portal/ (and beneath) will always use the homepage jsp's which + // are hardcoded to create a three column design and ignore any + // column configuration. All portal pages at other urls are not + // affect by this setting which touches only the one application (portal) + // at url /portal/. Portal pages at other urls use the corresponding + // configuration parameter for its initial value and number of columns + // may be modified at any time using configuration ui. +/* Workspace portal = (Workspace)Application .retrieveApplicationForPath("/portal/"); portal.setDefaultLayout(PageLayout - .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN)); + .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN)); */ } // end run method // public void registerServicesTemplate(String appURL) { @@ -242,6 +250,19 @@ public class Loader extends PackageLoader { "Generic Welcome Page for navigation", "/packages/navigation/templates/gen-welcome.jsp"); + + template = + Template.create( + "MultiPartArticle as Index Item", + "Display a MultiPartArticle as index item", + "/packages/navigation/templates/mparticle-index.jsp"); + + + template = + Template.create( + "Specializing list", + "Displays a list of items as the ordinary template, but specializes the objects in the list.", + "/packages/navigation/templates/SpecializingList.jsp"); } /** @@ -252,18 +273,16 @@ public class Loader extends PackageLoader { * delivered. */ // -- public void registerDefaultNavigationDomain() { - - // -- private StringParameter m_customNavKey; + // -- private StringParameter m_customNavKey; // -- private URLParameter m_customNavDomainURL; // -- private StringParameter m_customNavPath; // -- private StringParameter m_customNavUseContext; // -- private StringParameter m_customNavTitle; // -- private StringParameter m_customNavDesc; - - // -- m_customNavKey = new StringParameter( - // -- "com.arsdigita.aplaws.custom_nav_key", - // -- Parameter.REQUIRED, - // -- "APLAWS-NAVIGATION"); + // -- m_customNavKey = new StringParameter( + // -- "com.arsdigita.aplaws.custom_nav_key", + // -- Parameter.REQUIRED, + // -- "APLAWS-NAVIGATION"); /* Zugriff auf Website wird nicht benötigt, aber der Parameter bei Einrichtung * der Kategorien. Funktion URL prüft auf korrekte Syntax, nicht auf Existenz @@ -278,57 +297,17 @@ public class Loader extends PackageLoader { // -- throw new UncheckedWrapperException("Cannot parse url", ex); // -- } - - // -- m_customNavPath = new StringParameter( - // -- "com.arsdigita.aplaws.custom_nav_path", - // -- Parameter.REQUIRED, - // -- "local"); - - // -- m_customNavUseContext = new StringParameter( - // -- "com.arsdigita.aplaws.custom_nav_use_context", - // -- Parameter.REQUIRED, - // -- "local"); - - // -- m_customNavTitle = new StringParameter( - // -- "com.arsdigita.aplaws.custom_nav_title", - // -- Parameter.REQUIRED, - // -- "APLAWS Custom Navigation"); - - // -- m_customNavDesc = new StringParameter( - // -- "com.arsdigita.aplaws.custom_nav_desc", - // -- Parameter.REQUIRED, - // -- "Installation specific navigation tree"); - - - // -- register(m_customNavDesc); - // -- register(m_customNavDomainURL); - // -- register(m_customNavKey); - // -- register(m_customNavPath); - // -- register(m_customNavTitle); - // -- register(m_customNavUseContext); - - // -- String customNavPath = (String)get(m_customNavPath); - // -- String customNavTitle = (String)get(m_customNavTitle); - - // Package com.arsdigita.web - // Application.createApplication(Navigation.BASE_DATA_OBJECT_TYPE, - // customNavPath, - // customNavTitle, - // null); - - - - // -- String customNavDesc = (String)get(m_customNavDesc); - // -- String customNavKey = (String)get(m_customNavKey); - // -- String customNavUseContext = (String)get(m_customNavUseContext); - // -- URL customNavDomainURL = (URL)get(m_customNavDomainURL); - - // -- Domain.create(customNavKey, customNavDomainURL, - // -- customNavTitle, customNavDesc, "1.0.0", new Date()); - - // registerDomain(customNavKey, '/'+customNavPath+'/', null); - // -- registerDomain(customNavKey, "/content/", customNavUseContext); - + /* Zugriff auf Website wird nicht benötigt, aber der Parameter bei Einrichtung + * der Kategorien. Funktion URL prüft auf korrekte Syntax, nicht auf Existenz + */ + // -- try { + // -- m_customNavDomainURL = new URLParameter( + // -- "com.arsdigita.aplaws.custom_nav_domain_url", + // -- Parameter.REQUIRED, + // -- new URL("http://www.aplaws.org.uk/" + + // -- "standards/custom/1.00/termslist.xml")); + // -- } catch (MalformedURLException ex) { + // -- throw new UncheckedWrapperException("Cannot parse url", ex); // -- } /** @@ -339,9 +318,8 @@ public class Loader extends PackageLoader { String appURL, String context) { if (s_log.isDebugEnabled()) { - s_log.debug("Mapping domain " + domainKey + - " to app " + appURL + - " in context " + context); + s_log.debug("Mapping domain " + domainKey + " to app " + appURL + + " in context " + context); } Domain domain = Domain.retrieve(domainKey); // package com.arsdigita.london.terms @@ -353,8 +331,8 @@ public class Loader extends PackageLoader { Set categorizeRoles = new HashSet(); while (coll.next()) { Role role = coll.getRole(); - final DataQuery privs = RoleFactory.getRolePrivileges - (app.getID(), role.getGroup().getID()); + final DataQuery privs = RoleFactory.getRolePrivileges( + app.getID(), role.getGroup().getID()); while (privs.next()) { String priv = (String) privs.get(RoleFactory.PRIVILEGE); if (priv.equals(SecurityManager.CMS_CATEGORY_ADMIN)) { @@ -363,7 +341,7 @@ public class Loader extends PackageLoader { categorizeRoles.add(role); } } - + } RootCategoryCollection catCollection = Category.getRootCategories(((ContentSection) app)); while (catCollection.next()) { diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java index dfc8cd519..ad36940b4 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java @@ -370,4 +370,5 @@ public class ObjectTypeSchemaGenerator extends ObjectTypeTraversal { } m_property = (Property) m_properties.pop(); } + } diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java index b9665941a..1b9365278 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java @@ -71,8 +71,8 @@ public class ItemCategoryPicker extends ACSObjectCategoryPicker { * @see com.arsdigita.aplaws.ui.ACSObjectCategoryPicker#getObject() */ protected ACSObject getObject(PageState state) { - ContentItem item = CMS.getContext().getContentItem(); - return item.getParent(); + ContentItem item = CMS.getContext().getContentItem(); + return item.getParent(); } diff --git a/ccm-gen-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-gen-aplaws/web/WEB-INF/web.xml-aplaws index d56eee455..4a55dc1c1 100755 --- a/ccm-gen-aplaws/web/WEB-INF/web.xml-aplaws +++ b/ccm-gen-aplaws/web/WEB-INF/web.xml-aplaws @@ -210,11 +210,11 @@ - portal-files + portalworkspace-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-portal + /templates/ccm-portalworkspace @@ -361,8 +361,8 @@ - portal-files - /ccm-ldn-portal/files/* + portalworkspace-files + /ccm-portalworkspace/files/* diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/SpecializingList.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/SpecializingList.jsp new file mode 100644 index 000000000..58d0d11ed --- /dev/null +++ b/ccm-gen-aplaws/web/packages/navigation/templates/SpecializingList.jsp @@ -0,0 +1,46 @@ + + + + + + + + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); + if (age == 0) { + DispatcherHelper.cacheDisable(response); + } else { + DispatcherHelper.cacheForWorld(response, (int)age); + } + + + + + + + + + ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); + ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey"); + ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20); + ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true); + + + + + + \ No newline at end of file diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/mparticle-index.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/mparticle-index.jsp new file mode 100644 index 000000000..70e1e089a --- /dev/null +++ b/ccm-gen-aplaws/web/packages/navigation/templates/mparticle-index.jsp @@ -0,0 +1,65 @@ + + + + + + + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); + if (age == 0) { + DispatcherHelper.cacheDisable(response); + } else { + DispatcherHelper.cacheForWorld(response, (int)age); + } + + + + + + + + com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject(); + ((com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel) sectionXML).setContentItem(item); + + + + + + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); + + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey"); + + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title"); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition"); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary"); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead"); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description"); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate"); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" ); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate"); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate"); + + + + + + + + diff --git a/ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/README.txt b/ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/README.txt deleted file mode 100644 index 8db7e6319..000000000 --- a/ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -jsp files replace files provided by ccm-ldn-portal. - -goal: Make the portal homepage read-only and cached for 15min. EXPERIMENTAL - -Dynamic no-cache version is available at /ccm/portal/custom.jsp for admins to get the 'customize area' links. -see r1082 diff --git a/ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/custom.jsp b/ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/custom.jsp deleted file mode 100755 index fef11cc49..000000000 --- a/ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/custom.jsp +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - DispatcherHelper.cacheDisable(response); - - - - - - - - - -HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel(); -((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0)); -((HomepageWorkspace)left).setName("left"); -((HomepageWorkspace)left).addWidgets(); -((HomepageWorkspace)middle).setModel(new HomepagePortalSelectionModel(workspace, 1)); -((HomepageWorkspace)middle).setName("middle"); -((HomepageWorkspace)middle).addWidgets(); -((HomepageWorkspace)right).setModel(new HomepagePortalSelectionModel(workspace, 2)); -((HomepageWorkspace)right).setCustomizable(true); -((HomepageWorkspace)right).setName("right"); -((HomepageWorkspace)right).addWidgets(); - - - - - - diff --git a/ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp b/ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp deleted file mode 100755 index 2000fb99d..000000000 --- a/ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - 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-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.css index 278ecd8e6..49dd80c4e 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.css +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.css @@ -1,2 +1,2 @@ @import url("/css/acs-master.css"); -@import url("/__ccm__/apps/navigation/xsl/admin.css"); +@import url("/themes/heirloom/apps/navigation/xsl/admin.css"); diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl index 6a8c818af..3e6a59603 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl @@ -4,8 +4,8 @@ xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" version="1.0"> - - + + diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl index b18a3896b..eb23cb5ff 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl @@ -1,18 +1,15 @@ - + exclude-result-prefixes="xsl bebop aplaws ui cms nav" + version="1.0"> - - - - + + diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl index 6a8c818af..db3673ea0 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl @@ -1,11 +1,10 @@ - + - - + + diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl index aae53c18b..c9ea11519 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl @@ -1,21 +1,20 @@ - + - + diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl index f88dd0c97..362666eb8 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl @@ -1,11 +1,10 @@ - + - + diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl index 68d5d7448..cbf12b36b 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl @@ -126,9 +126,13 @@ -back to user's view -delete area -customise area +back to user's view +delete area +customise area @@ -176,15 +180,15 @@ All rights reserved. + externalpreview="no" url="..\XML\newHomepagePortal.xml" + htmlbaseurl="http://194.202.210.43:9005/theme/ibm-generic/" + outputurl="" processortype="internal" profilemode="0" urlprofilexml="" + commandline="" additionalpath="" additionalclasspath="" + postprocessortype="none" postprocesscommandline="" + postprocessadditionalpath="" + postprocessgeneratedext=""/> -->