diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
index c3a3968a0..b94594323 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -18,9 +18,7 @@
package com.arsdigita.aplaws;
-import com.arsdigita.london.navigation.Navigation;
import com.arsdigita.london.navigation.Template;
-import com.arsdigita.london.navigation.TemplateMapping;
import com.arsdigita.london.terms.Domain;
import com.arsdigita.london.terms.importer.Parser;
import com.arsdigita.portalworkspace.PageLayout;
@@ -37,19 +35,19 @@ import com.arsdigita.kernel.RoleCollection;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.runtime.ScriptContext;
-import com.arsdigita.util.Assert;
-import com.arsdigita.util.UncheckedWrapperException;
-import com.arsdigita.util.parameter.BooleanParameter;
+// import com.arsdigita.util.Assert;
+// import com.arsdigita.util.UncheckedWrapperException;
+// import com.arsdigita.util.parameter.BooleanParameter;
import com.arsdigita.util.parameter.Parameter;
import com.arsdigita.util.parameter.StringParameter;
-import com.arsdigita.util.parameter.URLParameter;
+// import com.arsdigita.util.parameter.URLParameter;
import com.arsdigita.web.Application;
import org.apache.log4j.Logger;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.util.Date;
+// import java.net.URL;
+// import java.net.MalformedURLException;
+// import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -138,7 +136,8 @@ public class Loader extends PackageLoader {
String[] files = categoryFiles;
final Parser parser = new Parser();
- for (int i = 0; i < files.length; i++) {
+ // for each filename in the array of files containing categories
+ for (int i = 0 ; i < files.length ; i++) {
final String file = files[i];
if (s_log.isInfoEnabled()) {
s_log.info("Process " + file);
@@ -181,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) {
@@ -288,6 +295,7 @@ public class Loader extends PackageLoader {
// -- "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
*/
@@ -354,8 +362,7 @@ public class Loader extends PackageLoader {
Application app = Application.retrieveApplicationForPath(appURL);
domain.setAsRootForObject(app, context);
if (app instanceof ContentSection) {
- RoleCollection coll = ((ContentSection) app).getStaffGroup().
- getOrderedRoles();
+ RoleCollection coll = ((ContentSection) app).getStaffGroup().getOrderedRoles();
Set adminRoles = new HashSet();
Set categorizeRoles = new HashSet();
while (coll.next()) {
@@ -366,26 +373,22 @@ public class Loader extends PackageLoader {
String priv = (String) privs.get(RoleFactory.PRIVILEGE);
if (priv.equals(SecurityManager.CMS_CATEGORY_ADMIN)) {
adminRoles.add(role);
- } else if (priv.equals(
- SecurityManager.CMS_CATEGORIZE_ITEMS)) {
+ } else if (priv.equals(SecurityManager.CMS_CATEGORIZE_ITEMS)) {
categorizeRoles.add(role);
}
}
}
- RootCategoryCollection catCollection = Category.getRootCategories(
- ((ContentSection) app));
+ RootCategoryCollection catCollection = Category.getRootCategories(((ContentSection) app));
while (catCollection.next()) {
Iterator adminIter = adminRoles.iterator();
while (adminIter.hasNext()) {
- ((Role) adminIter.next()).grantPermission(catCollection.
- getCategory(),
+ ((Role) adminIter.next()).grantPermission(catCollection.getCategory(),
PrivilegeDescriptor.ADMIN);
}
Iterator categorizeIter = categorizeRoles.iterator();
while (categorizeIter.hasNext()) {
- ((Role) categorizeIter.next()).grantPermission(catCollection.
- getCategory(),
+ ((Role) categorizeIter.next()).grantPermission(catCollection.getCategory(),
Category.MAP_DESCRIPTOR);
}
}
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java
index 659f174de..1b9365278 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java
@@ -43,13 +43,14 @@ import com.arsdigita.london.terms.ui.TermWidget;
public class ItemCategoryPicker extends ACSObjectCategoryPicker {
- private static final Logger s_log = Logger.getLogger(ItemCategoryPicker.class);
+ private static final Logger s_log = Logger.getLogger(ItemCategoryPicker.class);
+ // private static final class s_picker = this ;
public ItemCategoryPicker(BigDecimalParameter root,
StringParameter mode) {
- super(root, mode);
- s_log.debug("instantiating ItemCategoryPicker");
+ super(root, mode);
+ s_log.debug("instantiating ItemCategoryPicker");
}
@@ -59,7 +60,8 @@ public class ItemCategoryPicker extends ACSObjectCategoryPicker {
com.arsdigita.bebop.parameters.BigDecimalParameter,
com.arsdigita.bebop.parameters.StringParameter)
*/
- protected ACSObjectCategoryForm getForm(BigDecimalParameter root, StringParameter mode) {
+ protected ACSObjectCategoryForm getForm(BigDecimalParameter root,
+ StringParameter mode) {
s_log.debug("getForm");
return new ItemCategoryForm(root, mode, new TermWidget(mode, this));
}
diff --git a/ccm-zes-aplaws/web/packages/content-section/www/admin/load-cat.jsp b/ccm-zes-aplaws/web/packages/content-section/www/admin/load-cat.jsp
index c9762b750..6e555992d 100644
--- a/ccm-zes-aplaws/web/packages/content-section/www/admin/load-cat.jsp
+++ b/ccm-zes-aplaws/web/packages/content-section/www/admin/load-cat.jsp
@@ -8,6 +8,13 @@
title="childCategories"
cache="true">
+
+
diff --git a/ccm-zes-aplaws/web/templates/ccm-ldn-portal/portal/README.txt b/ccm-zes-aplaws/web/templates/ccm-portalworkspace/portal/README.txt
similarity index 100%
rename from ccm-zes-aplaws/web/templates/ccm-ldn-portal/portal/README.txt
rename to ccm-zes-aplaws/web/templates/ccm-portalworkspace/portal/README.txt
diff --git a/ccm-zes-aplaws/web/templates/ccm-ldn-portal/portal/custom.jsp b/ccm-zes-aplaws/web/templates/ccm-portalworkspace/portal/custom.jsp
similarity index 100%
rename from ccm-zes-aplaws/web/templates/ccm-ldn-portal/portal/custom.jsp
rename to ccm-zes-aplaws/web/templates/ccm-portalworkspace/portal/custom.jsp
diff --git a/ccm-zes-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp b/ccm-zes-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp
similarity index 100%
rename from ccm-zes-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp
rename to ccm-zes-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/head.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/head.xsl
index d92c8db7e..4eacbf3dc 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/head.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/head.xsl
@@ -23,6 +23,10 @@
+
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/page.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/page.xsl
index 1f8f422cc..9af4bce18 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/page.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/lib/page.xsl
@@ -8,7 +8,8 @@
-
+
+
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-admin.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-admin.css
index 278ecd8e6..49dd80c4e 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-admin.css
+++ b/ccm-zes-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-zes-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl
index 6a8c818af..3e6a59603 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl
+++ b/ccm-zes-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-zes-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl
index b18a3896b..eb23cb5ff 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl
+++ b/ccm-zes-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-zes-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl
index 6a8c818af..db3673ea0 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl
@@ -1,11 +1,10 @@
-
+
-
-
+
+
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl
index aae53c18b..c9ea11519 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl
@@ -1,21 +1,20 @@
-
+
-
+
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl
index f88dd0c97..362666eb8 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl
@@ -1,11 +1,10 @@
-
+
-
+
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl
similarity index 81%
rename from ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl
rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl
index 519b63d70..cbf12b36b 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl
@@ -1,22 +1,25 @@
+ version="1.0">
+
+
+
-
-
+
+
@@ -41,8 +44,9 @@
- Skip over navigation
+ Skip over navigation
|
@@ -52,7 +56,7 @@
-
+
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal-workspace-portal-admin.xsl
similarity index 55%
rename from ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl
rename to ccm-zes-aplaws/web/themes/static/aplaws-generic/portal-workspace-portal-admin.xsl
index e57acfc81..10f65c812 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/portal-workspace-portal-admin.xsl
@@ -1,17 +1,19 @@
+ version="1.0">
-
+
+
-
+