From d8623936889d00c9f5c092bd15ac9b895de58d00 Mon Sep 17 00:00:00 2001 From: pb Date: Thu, 10 Nov 2011 23:10:52 +0000 Subject: [PATCH] =?UTF-8?q?Anpassen=20unserer=20bundles=20an=20=C3=84nderu?= =?UTF-8?q?ngen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1240 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/aplaws/Loader.java | 2 +- .../aplaws/ui/AssignedIndexItemTerms.java | 2 +- .../ui/CategoryPortalSelectionModel.java | 4 ++-- .../aplaws/ui/CategoryTermDetails.java | 2 +- .../SciOrganizationDescription.jsp | 18 +++++++++--------- .../cms/contenttypes/scidepartment-item.jsp | 16 ++++++++-------- .../cms/contenttypes/sciorganization-item.jsp | 16 ++++++++-------- .../cms/contenttypes/sciproject-item.jsp | 16 ++++++++-------- .../scidepartment-with-publications-item.jsp | 16 ++++++++-------- .../sciproject-with-publications-item.jsp | 16 ++++++++-------- .../src/com/arsdigita/aplaws/Loader.java | 2 +- .../aplaws/ui/AssignedIndexItemTerms.java | 2 +- .../ui/CategoryPortalSelectionModel.java | 4 ++-- .../aplaws/ui/CategoryTermDetails.java | 2 +- 14 files changed, 59 insertions(+), 59 deletions(-) diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java index 5d2d4ffea..6a4f0a1f6 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -18,7 +18,7 @@ package com.arsdigita.aplaws; -import com.arsdigita.london.navigation.Template; +import com.arsdigita.navigation.Template; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.importer.Parser; // import com.arsdigita.portalworkspace.PageLayout; diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java index 38efa6beb..56e2985d2 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java @@ -24,7 +24,7 @@ import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; import com.arsdigita.kernel.ACSObject; -import com.arsdigita.london.navigation.Navigation; +import com.arsdigita.navigation.Navigation; import com.arsdigita.london.terms.ui.AbstractAssignedTerms; import org.apache.log4j.Logger; diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java index 5aecfcebe..93e06af4a 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java @@ -18,8 +18,8 @@ package com.arsdigita.aplaws.ui; -import com.arsdigita.london.navigation.Navigation; -import com.arsdigita.london.navigation.NavigationModel; +import com.arsdigita.navigation.Navigation; +import com.arsdigita.navigation.NavigationModel; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.DataCollection; diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java index 4c8bf00ff..146e4c9e7 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java @@ -22,7 +22,7 @@ import com.arsdigita.london.terms.Term; import com.arsdigita.london.terms.ui.AbstractTermDetails; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.london.navigation.Navigation; +import com.arsdigita.navigation.Navigation; import com.arsdigita.categorization.Category; import com.arsdigita.bebop.PageState; import com.arsdigita.domain.DomainObjectFactory; diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganizationDescription.jsp b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganizationDescription.jsp index f230b8493..36bd83a39 100644 --- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganizationDescription.jsp +++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganizationDescription.jsp @@ -6,9 +6,9 @@ - - - + + + @@ -24,22 +24,22 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.GreetingItem"/> + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-item.jsp b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-item.jsp index 243a5eecf..c53ce0e63 100644 --- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-item.jsp +++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-item.jsp @@ -4,8 +4,8 @@ version="1.2"> + import="com.arsdigita.navigation.NavigationModel, + com.arsdigita.navigation.cms.CMSNavigationModel"/> NavigationModel model = new CMSNavigationModel(); @@ -15,15 +15,15 @@ title="APLAWS" cache="false"> + classname="com.arsdigita.navigation.ui.category.Path"/> - ((com.arsdigita.london.navigation.ui.category.Path)categoryPath) + ((com.arsdigita.navigation.ui.category.Path)categoryPath) .setModel(model); + classname="com.arsdigita.navigation.ui.category.Menu"/> - ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu) + ((com.arsdigita.navigation.ui.category.Menu)categoryMenu) .setModel(model); + classname="com.arsdigita.lnavigation.ui.RelatedItems"/> + classname="com.arsdigita.bundle.ui.AssignedItemTerms"/> diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-item.jsp b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-item.jsp index 62af26a79..8ef611dd3 100644 --- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-item.jsp +++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-item.jsp @@ -4,8 +4,8 @@ version="1.2"> + import="com.arsdigita.navigation.NavigationModel, + com.arsdigita.navigation.cms.CMSNavigationModel"/> NavigationModel model = new CMSNavigationModel(); @@ -15,15 +15,15 @@ title="APLAWS" cache="false"> + classname="com.arsdigita.navigation.ui.category.Path"/> - ((com.arsdigita.london.navigation.ui.category.Path)categoryPath) + ((com.arsdigita.navigation.ui.category.Path)categoryPath) .setModel(model); + classname="com.arsdigita.navigation.ui.category.Menu"/> - ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu) + ((com.arsdigita.navigation.ui.category.Menu)categoryMenu) .setModel(model); + classname="com.arsdigita.navigation.ui.RelatedItems"/> + classname="com.arsdigita.bundle.ui.AssignedItemTerms"/> diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-item.jsp b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-item.jsp index 7fdea09ed..c7f8a2d93 100644 --- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-item.jsp +++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-item.jsp @@ -4,8 +4,8 @@ version="1.2"> + import="com.arsdigita.navigation.NavigationModel, + com.arsdigita.navigation.cms.CMSNavigationModel"/> NavigationModel model = new CMSNavigationModel(); @@ -15,15 +15,15 @@ title="APLAWS" cache="false"> + classname="com.arsdigita.navigation.ui.category.Path"/> - ((com.arsdigita.london.navigation.ui.category.Path)categoryPath) + ((com.arsdigita.navigation.ui.category.Path)categoryPath) .setModel(model); + classname="com.arsdigita.navigation.ui.category.Menu"/> - ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu) + ((com.arsdigita.navigation.ui.category.Menu)categoryMenu) .setModel(model); + classname="com.arsdigita.navigation.ui.RelatedItems"/> + classname="com.arsdigita.bundle.ui.AssignedItemTerms"/> diff --git a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-with-publications-item.jsp b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-with-publications-item.jsp index 8e3e4cb3c..b8003537c 100644 --- a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-with-publications-item.jsp +++ b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-with-publications-item.jsp @@ -4,8 +4,8 @@ version="1.2"> + import="com.arsdigita.navigation.NavigationModel, + com.arsdigita.navigation.cms.CMSNavigationModel"/> NavigationModel model = new CMSNavigationModel(); @@ -15,15 +15,15 @@ title="APLAWS" cache="false"> + classname="com.arsdigita.navigation.ui.category.Path"/> - ((com.arsdigita.london.navigation.ui.category.Path)categoryPath) + ((com.arsdigita.navigation.ui.category.Path)categoryPath) .setModel(model); + classname="com.arsdigita.navigation.ui.category.Menu"/> - ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu) + ((com.arsdigita.navigation.ui.category.Menu)categoryMenu) .setModel(model); + classname="com.arsdigita.navigation.ui.RelatedItems"/> + classname="com.arsdigita.bundle.ui.AssignedItemTerms"/> diff --git a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-with-publications-item.jsp b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-with-publications-item.jsp index 739de1477..a5f875fe1 100644 --- a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-with-publications-item.jsp +++ b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-with-publications-item.jsp @@ -4,8 +4,8 @@ version="1.2"> + import="com.arsdigita.navigation.NavigationModel, + com.arsdigita.navigation.cms.CMSNavigationModel"/> NavigationModel model = new CMSNavigationModel(); @@ -15,15 +15,15 @@ title="APLAWS" cache="false"> + classname="com.arsdigita.navigation.ui.category.Path"/> - ((com.arsdigita.london.navigation.ui.category.Path)categoryPath) + ((com.arsdigita.navigation.ui.category.Path)categoryPath) .setModel(model); + classname="com.arsdigita.navigation.ui.category.Menu"/> - ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu) + ((com.arsdigita.navigation.ui.category.Menu)categoryMenu) .setModel(model); + classname="com.arsdigita.navigation.ui.RelatedItems"/> + classname="com.arsdigita.bundle.ui.AssignedItemTerms"/> diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java index 938abe73a..7816c34ff 100644 --- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -18,7 +18,7 @@ package com.arsdigita.aplaws; -import com.arsdigita.london.navigation.Template; +import com.arsdigita.navigation.Template; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.importer.Parser; import com.arsdigita.portalworkspace.PageLayout; diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java index 38efa6beb..56e2985d2 100644 --- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java +++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java @@ -24,7 +24,7 @@ import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; import com.arsdigita.kernel.ACSObject; -import com.arsdigita.london.navigation.Navigation; +import com.arsdigita.navigation.Navigation; import com.arsdigita.london.terms.ui.AbstractAssignedTerms; import org.apache.log4j.Logger; diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java index 5aecfcebe..93e06af4a 100644 --- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java +++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java @@ -18,8 +18,8 @@ package com.arsdigita.aplaws.ui; -import com.arsdigita.london.navigation.Navigation; -import com.arsdigita.london.navigation.NavigationModel; +import com.arsdigita.navigation.Navigation; +import com.arsdigita.navigation.NavigationModel; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.DataCollection; diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java index 4c8bf00ff..146e4c9e7 100644 --- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java +++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java @@ -22,7 +22,7 @@ import com.arsdigita.london.terms.Term; import com.arsdigita.london.terms.ui.AbstractTermDetails; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.london.navigation.Navigation; +import com.arsdigita.navigation.Navigation; import com.arsdigita.categorization.Category; import com.arsdigita.bebop.PageState; import com.arsdigita.domain.DomainObjectFactory;