From f821d63d39528e26e3db5c382b0bddc1a1cf1188 Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 21 Oct 2012 06:04:42 +0000 Subject: [PATCH] Korrektur Pfadangaben git-svn-id: https://svn.libreccm.org/ccm/trunk@1888 8810af33-2d31-482b-a856-94f89814c4df --- .../navigation/gen-portal-welcome.jsp | 4 ++-- .../ccm-navigation/navigation/gen-portal.jsp | 2 +- .../navigation/aplaws-portal.jsp | 2 +- .../ui}/CategoryPortalSelectionModel.java | 20 +++++++++---------- .../navigation/sci-portal-welcome.jsp | 4 ++-- .../ccm-navigation/navigation/sci-portal.jsp | 2 +- 6 files changed, 16 insertions(+), 18 deletions(-) rename {ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage => ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui}/CategoryPortalSelectionModel.java (90%) diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp index fa67f6b0e..24d9bd135 100644 --- a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp +++ b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp @@ -4,12 +4,12 @@ xmlns:show="/WEB-INF/bebop-show.tld" version="1.2"> - <%-- JSP template to use a portal page as index page in navigation --%> + - + long age = Navigation.getConfig().getIndexPageCacheLifetime(); diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp index 4269924c3..d2d453b86 100644 --- a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp +++ b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp @@ -9,7 +9,7 @@ - + long age = Navigation.getConfig().getIndexPageCacheLifetime(); diff --git a/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp index 87905bd56..06056aa8e 100644 --- a/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp +++ b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp @@ -7,7 +7,7 @@ - + long age = Navigation.getConfig().getIndexPageCacheLifetime(); diff --git a/ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/CategoryPortalSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/CategoryPortalSelectionModel.java similarity index 90% rename from ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/CategoryPortalSelectionModel.java rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/CategoryPortalSelectionModel.java index 9be661c3b..8762dc75d 100644 --- a/ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/CategoryPortalSelectionModel.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/CategoryPortalSelectionModel.java @@ -16,25 +16,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.portalworkspace.ui.homepage; +package com.arsdigita.portalworkspace.ui; +import com.arsdigita.bebop.PageState; +import com.arsdigita.categorization.Category; +import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.navigation.Navigation; import com.arsdigita.navigation.NavigationModel; - -import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.DataCollection; - -import com.arsdigita.domain.DomainObjectFactory; - -import com.arsdigita.categorization.Category; -import com.arsdigita.util.Assert; -import com.arsdigita.bebop.PageState; - +import com.arsdigita.persistence.SessionManager; import com.arsdigita.portalworkspace.Workspace; -import com.arsdigita.portalworkspace.ui.WorkspaceSelectionModel; +import com.arsdigita.util.Assert; /** + * (Short description) * + * Purpose: Service class to use in a Navigation jsp index page to enable + * the inclusion of a portal workspace as a leaf page into a navigation tree. * */ public class CategoryPortalSelectionModel extends WorkspaceSelectionModel { diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp index fa67f6b0e..24d9bd135 100644 --- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp @@ -4,12 +4,12 @@ xmlns:show="/WEB-INF/bebop-show.tld" version="1.2"> - <%-- JSP template to use a portal page as index page in navigation --%> + - + long age = Navigation.getConfig().getIndexPageCacheLifetime(); diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp index bd78893d6..24d9bd135 100644 --- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp @@ -9,7 +9,7 @@ - + long age = Navigation.getConfig().getIndexPageCacheLifetime();