diff --git a/ccm-sci-bundle/application.xml b/ccm-sci-bundle/application.xml index 6d14cf3d9..8cfa71acb 100644 --- a/ccm-sci-bundle/application.xml +++ b/ccm-sci-bundle/application.xml @@ -9,12 +9,12 @@ + - diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties index 367634a7e..e172f1d46 100644 --- a/ccm-sci-bundle/bundles/demo/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties @@ -93,12 +93,11 @@ com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# ccm-ldn-navigation application -com.arsdigita.london.navigation.category_menu_show_grand_children=false -com.arsdigita.london.navigation.default_cat_root_path=/navigation/ -# com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp -com.arsdigita.london.navigation.default_template=/templates/ccm-ldn-navigation/navigation/sci-default.jsp -com.arsdigita.london.navigation.templates_file=WEB-INF/navigation/sci-templates.txt +# ccm-navigation application +com.arsdigita.navigation.category_menu_show_grand_children=false +com.arsdigita.navigation.default_cat_root_path=/navigation/ +com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp +com.arsdigita.navigation.templates_file=WEB-INF/navigation/sci-templates.txt # ccm-ldn-search application diff --git a/ccm-sci-bundle/bundles/demo/cfg/project.xml b/ccm-sci-bundle/bundles/demo/cfg/project.xml index 1b6253d3a..e38889f80 100644 --- a/ccm-sci-bundle/bundles/demo/cfg/project.xml +++ b/ccm-sci-bundle/bundles/demo/cfg/project.xml @@ -35,11 +35,11 @@ + - diff --git a/ccm-sci-bundle/bundles/demo/cfg/web.xml-sci b/ccm-sci-bundle/bundles/demo/cfg/web.xml-sci index 390ca7722..5babaffe0 100644 --- a/ccm-sci-bundle/bundles/demo/cfg/web.xml-sci +++ b/ccm-sci-bundle/bundles/demo/cfg/web.xml-sci @@ -208,11 +208,11 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-navigation + /templates/ccm-navigation file-resolver - com.arsdigita.london.navigation.NavigationFileResolver + com.arsdigita.navigation.NavigationFileResolver @@ -345,7 +345,7 @@ navigation-files - /ccm-ldn-navigation/files/* + /ccm-navigation/files/* diff --git a/ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt index 80d8612e5..008184981 100755 --- a/ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt +++ b/ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt @@ -1,9 +1,9 @@ -ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-ldn-navigation/navigation/sci-default.jsp -ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-ldn-navigation/navigation/sci-recent.jsp -ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp -ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-ldn-navigation/navigation/sci-events.jsp -ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-ldn-navigation/navigation/sci-portal.jsp -ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp -ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp -ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp -ScientificCMS Publications List,Sci publications listing page,/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp +ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp +ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp +ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp +ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp +ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp +ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp +ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp +ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp +ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp diff --git a/ccm-sci-bundle/bundles/demo/templates/placeholder.info b/ccm-sci-bundle/bundles/demo/templates/placeholder.info index 38db9a8ae..c78cf06e6 100644 --- a/ccm-sci-bundle/bundles/demo/templates/placeholder.info +++ b/ccm-sci-bundle/bundles/demo/templates/placeholder.info @@ -9,4 +9,4 @@ to the default template files. In the later case a developer must provide a customised template.txt file replacing the default file /src/WEB-INF/navigation/sci-templates.txt This file must be specified in parameter - com.arsdigita.london.navigation.templates_file \ No newline at end of file + com.arsdigita.navigation.templates_file \ No newline at end of file diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties index d1ecee462..f9900fd56 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties @@ -93,12 +93,11 @@ com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# ccm-ldn-navigation application -com.arsdigita.london.navigation.category_menu_show_grand_children=false -com.arsdigita.london.navigation.default_cat_root_path=/navigation/ -# com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp -com.arsdigita.london.navigation.default_template=/templates/ccm-ldn-navigation/navigation/sci-default.jsp -com.arsdigita.london.navigation.templates_file=bundle/navigation/sci-templates.txt +# ccm-navigation application +com.arsdigita.navigation.category_menu_show_grand_children=false +com.arsdigita.navigation.default_cat_root_path=/navigation/ +com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp +com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt # ccm-ldn-search application @@ -117,7 +116,7 @@ themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl # ccm-sci-bundle (Loader only) -# com.arsdigita.bundle.category_files=WEB-INF/sci/sci-nav-domain-1.00.xml,WEB-INF/sci/sci-nav-hierarchy-1.00.xml +# com.arsdigita.bundle.category_files=bundle/categories/sci-nav-domain-1.00.xml,WEB-INF/sci/sci-nav-hierarchy-1.00.xml # ============================================================================================= # runtime specific configurations diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml index 1b6253d3a..e38889f80 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/project.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml @@ -35,11 +35,11 @@ + - diff --git a/ccm-sci-bundle/bundles/devel/cfg/web.xml-sci b/ccm-sci-bundle/bundles/devel/cfg/web.xml-sci index 390ca7722..5babaffe0 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/web.xml-sci +++ b/ccm-sci-bundle/bundles/devel/cfg/web.xml-sci @@ -208,11 +208,11 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-navigation + /templates/ccm-navigation file-resolver - com.arsdigita.london.navigation.NavigationFileResolver + com.arsdigita.navigation.NavigationFileResolver @@ -345,7 +345,7 @@ navigation-files - /ccm-ldn-navigation/files/* + /ccm-navigation/files/* diff --git a/ccm-sci-bundle/bundles/devel/templates/placeholder.info b/ccm-sci-bundle/bundles/devel/templates/placeholder.info index 38db9a8ae..c78cf06e6 100644 --- a/ccm-sci-bundle/bundles/devel/templates/placeholder.info +++ b/ccm-sci-bundle/bundles/devel/templates/placeholder.info @@ -9,4 +9,4 @@ to the default template files. In the later case a developer must provide a customised template.txt file replacing the default file /src/WEB-INF/navigation/sci-templates.txt This file must be specified in parameter - com.arsdigita.london.navigation.templates_file \ No newline at end of file + com.arsdigita.navigation.templates_file \ No newline at end of file diff --git a/ccm-sci-bundle/bundles/local/aap/cfg/integration.properties b/ccm-sci-bundle/bundles/local/aap/cfg/integration.properties index 85795d65f..e68d1436e 100644 --- a/ccm-sci-bundle/bundles/local/aap/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/local/aap/cfg/integration.properties @@ -93,10 +93,10 @@ com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# ccm-ldn-navigation application -com.arsdigita.london.navigation.category_menu_show_grand_children=false -com.arsdigita.london.navigation.default_cat_root_path=/navigation/ -com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp +# ccm-navigation application +com.arsdigita.navigation.category_menu_show_grand_children=false +com.arsdigita.navigation.default_cat_root_path=/navigation/ +com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp # ccm-ldn-search application @@ -109,7 +109,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_manifest=ccm-zes-aplaws.web.mf themedirector.default_theme_path=themes/static/aplaws-generic themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl diff --git a/ccm-sci-bundle/bundles/local/aap/cfg/project.xml b/ccm-sci-bundle/bundles/local/aap/cfg/project.xml index c53d2a9cf..ae8fb9458 100644 --- a/ccm-sci-bundle/bundles/local/aap/cfg/project.xml +++ b/ccm-sci-bundle/bundles/local/aap/cfg/project.xml @@ -35,11 +35,11 @@ + - diff --git a/ccm-sci-bundle/bundles/local/aap/cfg/web.xml-sci b/ccm-sci-bundle/bundles/local/aap/cfg/web.xml-sci index 390ca7722..5babaffe0 100644 --- a/ccm-sci-bundle/bundles/local/aap/cfg/web.xml-sci +++ b/ccm-sci-bundle/bundles/local/aap/cfg/web.xml-sci @@ -208,11 +208,11 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-navigation + /templates/ccm-navigation file-resolver - com.arsdigita.london.navigation.NavigationFileResolver + com.arsdigita.navigation.NavigationFileResolver @@ -345,7 +345,7 @@ navigation-files - /ccm-ldn-navigation/files/* + /ccm-navigation/files/* diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties index 85795d65f..682f3f7ec 100644 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties @@ -93,10 +93,10 @@ com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# ccm-ldn-navigation application -com.arsdigita.london.navigation.category_menu_show_grand_children=false -com.arsdigita.london.navigation.default_cat_root_path=/navigation/ -com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp +# ccm-navigation application +com.arsdigita.navigation.category_menu_show_grand_children=false +com.arsdigita.navigation.default_cat_root_path=/navigation/ +com.arsdigita.navigation.default_template=templates/ccm-navigation/navigation/sci-default.jsp # ccm-ldn-search application @@ -107,9 +107,9 @@ com.arsdigita.london.search.show_sponsored_links=true com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-ldn-themedirector application +# ccm-themedirector application themedirector.default_theme_context= -themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf +#themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf themedirector.default_theme_path=themes/static/aplaws-generic themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml index c53d2a9cf..ae8fb9458 100644 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml +++ b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml @@ -35,11 +35,11 @@ + - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci index 390ca7722..5babaffe0 100644 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci +++ b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci @@ -208,11 +208,11 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-navigation + /templates/ccm-navigation file-resolver - com.arsdigita.london.navigation.NavigationFileResolver + com.arsdigita.navigation.NavigationFileResolver @@ -345,7 +345,7 @@ navigation-files - /ccm-ldn-navigation/files/* + /ccm-navigation/files/* diff --git a/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties index 85795d65f..fa3c40f24 100644 --- a/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties @@ -93,10 +93,10 @@ com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# ccm-ldn-navigation application -com.arsdigita.london.navigation.category_menu_show_grand_children=false -com.arsdigita.london.navigation.default_cat_root_path=/navigation/ -com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp +# ccm-navigation application +com.arsdigita.navigation.category_menu_show_grand_children=false +com.arsdigita.navigation.default_cat_root_path=/navigation/ +com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/zes-default.jsp # ccm-ldn-search application diff --git a/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml b/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml index c53d2a9cf..ae8fb9458 100644 --- a/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml +++ b/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml @@ -35,11 +35,11 @@ + - diff --git a/ccm-sci-bundle/bundles/local/iaw-std/cfg/web.xml-sci b/ccm-sci-bundle/bundles/local/iaw-std/cfg/web.xml-sci index 390ca7722..5babaffe0 100644 --- a/ccm-sci-bundle/bundles/local/iaw-std/cfg/web.xml-sci +++ b/ccm-sci-bundle/bundles/local/iaw-std/cfg/web.xml-sci @@ -208,11 +208,11 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-navigation + /templates/ccm-navigation file-resolver - com.arsdigita.london.navigation.NavigationFileResolver + com.arsdigita.navigation.NavigationFileResolver @@ -345,7 +345,7 @@ navigation-files - /ccm-ldn-navigation/files/* + /ccm-navigation/files/* diff --git a/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-archive.jsp b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-archive.jsp similarity index 51% rename from ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-archive.jsp rename to ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-archive.jsp index ff2ba858c..a6c4f9273 100644 --- a/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-archive.jsp +++ b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-archive.jsp @@ -12,9 +12,9 @@ - - - + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -29,20 +29,20 @@ 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.ComplexObjectList"/> - ((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.contenttypes.Event"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate <= :today) or (endDate is null and startDate <= :today)"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate <= :today) or (endDate is null and startDate <= :today)"); // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. @@ -60,23 +60,23 @@ now.get(java.util.GregorianCalendar.MINUTE), now.get(java.util.GregorianCalendar.SECOND))).getTime(); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate"); + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-events.jsp b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-events.jsp similarity index 51% rename from ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-events.jsp rename to ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-events.jsp index 821ba9367..0395cb7b6 100644 --- a/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-events.jsp +++ b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-events.jsp @@ -12,9 +12,9 @@ - - - + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -29,20 +29,20 @@ 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.ComplexObjectList"/> - ((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.contenttypes.Event"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate >= :today and (endTime > :time or endTime is null)) or (endDate is null and startDate >= :today)"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate >= :today and (endTime > :time or endTime is null)) or (endDate is null and startDate >= :today)"); // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. @@ -60,23 +60,23 @@ now.get(java.util.GregorianCalendar.MINUTE), now.get(java.util.GregorianCalendar.SECOND))).getTime(); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate"); + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/iaw-std/templates/placeholder.info b/ccm-sci-bundle/bundles/local/iaw-std/templates/placeholder.info index 38db9a8ae..c78cf06e6 100644 --- a/ccm-sci-bundle/bundles/local/iaw-std/templates/placeholder.info +++ b/ccm-sci-bundle/bundles/local/iaw-std/templates/placeholder.info @@ -9,4 +9,4 @@ to the default template files. In the later case a developer must provide a customised template.txt file replacing the default file /src/WEB-INF/navigation/sci-templates.txt This file must be specified in parameter - com.arsdigita.london.navigation.templates_file \ No newline at end of file + com.arsdigita.navigation.templates_file \ No newline at end of file diff --git a/ccm-sci-bundle/bundles/local/zes-dev/cfg/integration.properties b/ccm-sci-bundle/bundles/local/zes-dev/cfg/integration.properties index 79cd57b7e..cb6c2736f 100644 --- a/ccm-sci-bundle/bundles/local/zes-dev/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/local/zes-dev/cfg/integration.properties @@ -21,10 +21,6 @@ waf.kernel.supported_languages=de,en ; security.properties: waf.auto_registration_on=false -# MOVED to ui.Config -#waf.pagemap.root=navigation/ -#waf.pagemap.workspace=navigation/ -#waf.pagemap.login_redirect=content/content-center-redirect.jsp ; Searches for localized style sheet (among others) waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver @@ -104,10 +100,10 @@ com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# ccm-ldn-navigation application -com.arsdigita.london.navigation.category_menu_show_grand_children=false -com.arsdigita.london.navigation.default_cat_root_path=/navigation/ -com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp +# ccm-navigation application +com.arsdigita.navigation.category_menu_show_grand_children=false +com.arsdigita.navigation.default_cat_root_path=/navigation/ +com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/zes-default.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-dev/cfg/project.xml b/ccm-sci-bundle/bundles/local/zes-dev/cfg/project.xml index 91f7927b7..e1d0eb155 100644 --- a/ccm-sci-bundle/bundles/local/zes-dev/cfg/project.xml +++ b/ccm-sci-bundle/bundles/local/zes-dev/cfg/project.xml @@ -64,6 +64,9 @@ --> + + + @@ -77,14 +80,11 @@ - - - diff --git a/ccm-sci-bundle/bundles/local/zes-dev/cfg/web.xml b/ccm-sci-bundle/bundles/local/zes-dev/cfg/web.xml index aafa3183a..cd63b6dd0 100644 --- a/ccm-sci-bundle/bundles/local/zes-dev/cfg/web.xml +++ b/ccm-sci-bundle/bundles/local/zes-dev/cfg/web.xml @@ -219,11 +219,11 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-navigation + /templates/ccm-navigation file-resolver - com.arsdigita.london.navigation.NavigationFileResolver + com.arsdigita.navigation.NavigationFileResolver @@ -363,7 +363,7 @@ navigation-files - /ccm-ldn-navigation/files/* + /ccm-navigation/files/* diff --git a/ccm-sci-bundle/bundles/local/zes-std/cfg/integration.properties b/ccm-sci-bundle/bundles/local/zes-std/cfg/integration.properties index ae649fd49..1a90cef16 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/local/zes-std/cfg/integration.properties @@ -21,10 +21,6 @@ waf.kernel.supported_languages=de,en ; security.properties: waf.auto_registration_on=false -# MOVED to ui.Config -#waf.pagemap.root=navigation/ -#waf.pagemap.workspace=navigation/ -#waf.pagemap.login_redirect=content/content-center-redirect.jsp ; Searches for localized style sheet (among others) waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver @@ -105,10 +101,10 @@ com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# ccm-ldn-navigation application -com.arsdigita.london.navigation.category_menu_show_grand_children=false -com.arsdigita.london.navigation.default_cat_root_path=/navigation/ -com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp +# ccm-navigation application +com.arsdigita.navigation.category_menu_show_grand_children=false +com.arsdigita.navigation.default_cat_root_path=/navigation/ +com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/zes-default.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/cfg/project.xml b/ccm-sci-bundle/bundles/local/zes-std/cfg/project.xml index 84cfe3f94..0ac12a1a2 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/cfg/project.xml +++ b/ccm-sci-bundle/bundles/local/zes-std/cfg/project.xml @@ -46,6 +46,7 @@ + @@ -53,7 +54,6 @@ - diff --git a/ccm-sci-bundle/bundles/local/zes-std/cfg/web.xml b/ccm-sci-bundle/bundles/local/zes-std/cfg/web.xml index aafa3183a..cd63b6dd0 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/cfg/web.xml +++ b/ccm-sci-bundle/bundles/local/zes-std/cfg/web.xml @@ -219,11 +219,11 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-navigation + /templates/ccm-navigation file-resolver - com.arsdigita.london.navigation.NavigationFileResolver + com.arsdigita.navigation.NavigationFileResolver @@ -363,7 +363,7 @@ navigation-files - /ccm-ldn-navigation/files/* + /ccm-navigation/files/* diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartment-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartment-index.jsp deleted file mode 100644 index 335e93ba7..000000000 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartment-index.jsp +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - 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.SciDepartmentPanel) sectionXML).setContentItem(item); - - - - - - ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel)sectionXML).setPageSize(30); - - ((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-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentActiveMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentActiveMembers.jsp deleted file mode 100644 index 6e81f3f34..000000000 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentActiveMembers.jsp +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", - SimpleXMLGenerator.ADAPTER_CONTEXT); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartment-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartment-index.jsp new file mode 100644 index 000000000..2be3aa4be --- /dev/null +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartment-index.jsp @@ -0,0 +1,67 @@ + + + + + + + + + + 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.SciDepartmentPanel) sectionXML).setContentItem(item); + + + + + + ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel)sectionXML).setPageSize(30); + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey"); + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" ); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate"); + + + + + + + + diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentActiveMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentActiveMembers.jsp new file mode 100644 index 000000000..3c7037dd7 --- /dev/null +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentActiveMembers.jsp @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); + if (age == 0) { + DispatcherHelper.cacheDisable(response); + } else { + DispatcherHelper.cacheForWorld(response, (int)age); + } + + + + + + + ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", + SimpleXMLGenerator.ADAPTER_CONTEXT); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentAssociatedMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentAssociatedMembers.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentAssociatedMembers.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentAssociatedMembers.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentDescription.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentDescription.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentDescription.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentDescription.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFinishedProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFinishedProjects.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFinishedProjects.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFinishedProjects.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFormerMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFormerMembers.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFormerMembers.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFormerMembers.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentMembers.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentMembers.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentMembers.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentOngoingProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentOngoingProjects.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentOngoingProjects.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentOngoingProjects.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentProjects.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentProjects.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentProjects.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentSubDepartments.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentSubDepartments.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentSubDepartments.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentSubDepartments.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciMember-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciMember-index.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciMember-index.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciMember-index.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganization-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganization-index.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganization-index.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganization-index.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationActiveMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationActiveMembers.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationActiveMembers.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationActiveMembers.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationAssociatedMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationAssociatedMembers.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationAssociatedMembers.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationAssociatedMembers.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDepartments.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDepartments.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDepartments.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDepartments.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDescription.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDescription.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDescription.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDescription.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFinishedProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFinishedProjects.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFinishedProjects.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFinishedProjects.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFormerMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFormerMembers.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFormerMembers.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFormerMembers.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationMembers.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationMembers.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationMembers.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationOngoingProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationOngoingProjects.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationOngoingProjects.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationOngoingProjects.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationProjects.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationProjects.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationProjects.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciProjectList.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciProjectList.jsp similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciProjectList.jsp rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciProjectList.jsp diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/placeholder.info b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/placeholder.info similarity index 100% rename from ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/placeholder.info rename to ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/placeholder.info diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/placeholder.info b/ccm-sci-bundle/bundles/local/zes-std/templates/placeholder.info index 38db9a8ae..c78cf06e6 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/placeholder.info +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/placeholder.info @@ -9,4 +9,4 @@ to the default template files. In the later case a developer must provide a customised template.txt file replacing the default file /src/WEB-INF/navigation/sci-templates.txt This file must be specified in parameter - com.arsdigita.london.navigation.templates_file \ No newline at end of file + com.arsdigita.navigation.templates_file \ No newline at end of file diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java b/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java index 952d5298a..2314eca07 100644 --- a/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java +++ b/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java @@ -18,7 +18,6 @@ package com.arsdigita.bundle; -// import com.arsdigita.london.navigation.Template; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.importer.Parser; @@ -35,7 +34,6 @@ import com.arsdigita.persistence.DataQuery; import com.arsdigita.runtime.ScriptContext; import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.StringArrayParameter; -// import com.arsdigita.util.parameter.StringParameter; import com.arsdigita.web.Application; import org.apache.log4j.Logger; diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryPortalSelectionModel.java b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryPortalSelectionModel.java index 7ed36bb0e..c88e4f8a5 100644 --- a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryPortalSelectionModel.java +++ b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryPortalSelectionModel.java @@ -18,8 +18,8 @@ package com.arsdigita.bundle.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-sci-bundle/web/WEB-INF/web.xml-sci b/ccm-sci-bundle/web/WEB-INF/web.xml-sci index 390ca7722..5babaffe0 100644 --- a/ccm-sci-bundle/web/WEB-INF/web.xml-sci +++ b/ccm-sci-bundle/web/WEB-INF/web.xml-sci @@ -208,11 +208,11 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-navigation + /templates/ccm-navigation file-resolver - com.arsdigita.london.navigation.NavigationFileResolver + com.arsdigita.navigation.NavigationFileResolver @@ -345,7 +345,7 @@ navigation-files - /ccm-ldn-navigation/files/* + /ccm-navigation/files/* diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp deleted file mode 100644 index 58d0d11ed..000000000 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - 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-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp deleted file mode 100644 index 12d3afe10..000000000 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - - - - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); - - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false); - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().addOrder("title"); - - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(20); - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title"); - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "definition"); - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "summary"); - ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "lead"); - - - - - diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-default.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-default.jsp deleted file mode 100644 index 84c1196f9..000000000 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-default.jsp +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - - - - ((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-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-recent.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-recent.jsp deleted file mode 100644 index bd346f530..000000000 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-recent.jsp +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - - - - ((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("id"); - - ((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( "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-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp deleted file mode 100644 index dd09296f8..000000000 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - - - - ((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("eventDate"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate"); - ((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"); - - - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event"); - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate >= :today and (endTime > :time or endTime is null)) or (endDate is null and startDate >= :today)"); - - // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen. // Komplizierter geht's wohl nicht mehr. - java.util.GregorianCalendar now = new java.util.GregorianCalendar(); - java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR), - now.get(java.util.GregorianCalendar.MONTH), - now.get(java.util.GregorianCalendar.DATE))).getTime(); - // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten - // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier - // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen. - java.util.Date time = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp - now.get(java.util.GregorianCalendar.HOUR_OF_DAY), - now.get(java.util.GregorianCalendar.MINUTE), - now.get(java.util.GregorianCalendar.SECOND))).getTime(); - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time); - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate"); - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().setPageSize(5); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate"); - - - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.NewsItem"); - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setSQLFilter("newsDate > :oldNewsDate"); - - // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings - // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. - // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen. - // Komplizierter geht's wohl nicht mehr. - java.util.GregorianCalendar oldDate = new java.util.GregorianCalendar(); - oldDate.add(java.util.Calendar.MONTH, -2); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setParameter("oldNewsDate", oldDate.getTime()); - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().addOrder("newsDate desc"); - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().setPageSize(5); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("title"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("lead"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("newsDate"); - - - - - - - diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/Sci-README b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/Sci-README similarity index 100% rename from ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/Sci-README rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/Sci-README diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp similarity index 71% rename from ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp index d25eccd93..05888eb75 100644 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp @@ -6,10 +6,10 @@ - - - - + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -23,13 +23,13 @@ + 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.CustomizableObjectList"/> CustomizableObjectList objList = (CustomizableObjectList) itemList; @@ -53,7 +53,7 @@ + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/SpecializingList.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/SpecializingList.jsp new file mode 100644 index 000000000..31fd0f20e --- /dev/null +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/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.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true); + + + + + + \ No newline at end of file diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-atoz.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-atoz.jsp new file mode 100644 index 000000000..f830f7cbb --- /dev/null +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-atoz.jsp @@ -0,0 +1,51 @@ + + + + + + + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); + if (age == 0) { + DispatcherHelper.cacheDisable(response); + } else { + DispatcherHelper.cacheForWorld(response, (int)age); + } + + + + + + + + + + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); + + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false); + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().addOrder("title"); + + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(20); + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title"); + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "definition"); + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "summary"); + ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "lead"); + + + + + diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp new file mode 100644 index 000000000..0a3422b34 --- /dev/null +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp @@ -0,0 +1,59 @@ + + + + + + + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); + if (age == 0) { + DispatcherHelper.cacheDisable(response); + } else { + DispatcherHelper.cacheForWorld(response, (int)age); + } + + + + + + + + + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey"); + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" ); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate"); + + + + + + + diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-events.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp similarity index 51% rename from ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-events.jsp rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp index 3b346d4b3..1394178e6 100644 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-events.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp @@ -6,9 +6,9 @@ - - - + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -23,19 +23,19 @@ 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.ComplexObjectList"/> - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate >= :today and (endTime > :time or endTime is null)) or (endDate is null and startDate >= :today)"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate >= :today and (endTime > :time or endTime is null)) or (endDate is null and startDate >= :today)"); // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen. // Komplizierter geht's wohl nicht mehr. java.util.GregorianCalendar now = new java.util.GregorianCalendar(); @@ -50,23 +50,23 @@ now.get(java.util.GregorianCalendar.MINUTE), now.get(java.util.GregorianCalendar.SECOND))).getTime(); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate"); + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp similarity index 71% rename from ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp index dde10fef7..fa67f6b0e 100644 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp @@ -7,7 +7,7 @@ <%-- JSP template to use a portal page as index page in navigation --%> - + @@ -24,13 +24,13 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/> - ((com.arsdigita.london.portal.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); + ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp similarity index 71% rename from ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal.jsp rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp index dde10fef7..fa67f6b0e 100644 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp @@ -7,7 +7,7 @@ <%-- JSP template to use a portal page as index page in navigation --%> - + @@ -24,13 +24,13 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/> - ((com.arsdigita.london.portal.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); + ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-recent.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-recent.jsp new file mode 100644 index 000000000..fb78c4971 --- /dev/null +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-recent.jsp @@ -0,0 +1,56 @@ + + + + + + + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); + if (age == 0) { + DispatcherHelper.cacheDisable(response); + } else { + DispatcherHelper.cacheForWorld(response, (int)age); + } + + + + + + + + + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("id"); + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" ); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate"); + + + + + + diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp new file mode 100644 index 000000000..a0d85d6f8 --- /dev/null +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp @@ -0,0 +1,121 @@ + + + + + + + + + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); + if (age == 0) { + DispatcherHelper.cacheDisable(response); + } else { + DispatcherHelper.cacheForWorld(response, (int)age); + } + + + + + + + + + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey"); + + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("eventDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("startDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("endDate"); + ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("newsDate"); + + + + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event"); + + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate >= :today and (endTime > :time or endTime is null)) or (endDate is null and startDate >= :today)"); + + // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen. // Komplizierter geht's wohl nicht mehr. + java.util.GregorianCalendar now = new java.util.GregorianCalendar(); + java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR), + now.get(java.util.GregorianCalendar.MONTH), + now.get(java.util.GregorianCalendar.DATE))).getTime(); + // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten + // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier + // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen. + java.util.Date time = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp + now.get(java.util.GregorianCalendar.HOUR_OF_DAY), + now.get(java.util.GregorianCalendar.MINUTE), + now.get(java.util.GregorianCalendar.SECOND))).getTime(); + + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time); + + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate"); + + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().setPageSize(5); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate"); + + + + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.NewsItem"); + + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setSQLFilter("newsDate > :oldNewsDate"); + + // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings + // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. + // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen. + // Komplizierter geht's wohl nicht mehr. + java.util.GregorianCalendar oldDate = new java.util.GregorianCalendar(); + oldDate.add(java.util.Calendar.MONTH, -2); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setParameter("oldNewsDate", oldDate.getTime()); + + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setDescendCategories(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getDefinition().addOrder("newsDate desc"); + + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().setPageSize(5); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("objectType"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("title"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("lead"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("newsDate"); + + + + + + + diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp similarity index 72% rename from ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp index b3e5f5a01..2c4559768 100644 --- a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp @@ -19,13 +19,13 @@ + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.category.Hierarchy"> - ((com.arsdigita.london.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false); + ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false); diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/services/pid.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/services/pid.jsp similarity index 100% rename from ccm-sci-bundle/web/templates/ccm-ldn-navigation/services/pid.jsp rename to ccm-sci-bundle/web/templates/ccm-navigation/services/pid.jsp diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/services/summary.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/services/summary.jsp similarity index 100% rename from ccm-sci-bundle/web/templates/ccm-ldn-navigation/services/summary.jsp rename to ccm-sci-bundle/web/templates/ccm-navigation/services/summary.jsp diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow b/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow index bc76dcdc2..c8351bdd8 100644 --- a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow +++ b/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow @@ -5,7 +5,7 @@ xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0" - xmlns:nav="http://ccm.redhat.com/london/navigation" + xmlns:nav="http://ccm.redhat.com/navigation" xmlns:search="http://rhea.redhat.com/search/1.0" xmlns:atoz="http://xmlns.redhat.com/atoz/1.0" exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz" diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/consultations-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/consultations-index.xsl index 2d47ea5e1..1e4b542ca 100644 --- a/ccm-sci-bundle/web/themes/static/aplaws-generic/consultations-index.xsl +++ b/ccm-sci-bundle/web/themes/static/aplaws-generic/consultations-index.xsl @@ -5,7 +5,7 @@ xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0" - xmlns:nav="http://ccm.redhat.com/london/navigation" + xmlns:nav="http://ccm.redhat.com/navigation" version="1.0"> - site map - &nbsp;| + site map + &nbsp;| &nbsp; - contact us - &nbsp;| + contact us + &nbsp;| + &nbsp; + help &nbsp; - help - &nbsp; &nbsp; @@ -68,7 +68,7 @@ - + - + |

@@ -116,23 +116,23 @@

- - + + + +

| - + Valid HTML 4.01! | - + Valid CSS!

@@ -337,7 +337,7 @@ - + - - + @@ -80,17 +80,17 @@ Advanced search| - Remote search + Remote search | Search| - Remote search + Remote search | Search| - Advanced search + Advanced search | @@ -101,7 +101,7 @@ - + @@ -125,7 +125,7 @@

- + - + + diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl index c37146903..8ac049b4d 100644 --- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl +++ b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl @@ -6,7 +6,7 @@ xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0" - xmlns:nav="http://ccm.redhat.com/london/navigation" + xmlns:nav="http://ccm.redhat.com/navigation" exclude-result-prefixes="xsl bebop cms ui" version="1.0"> diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl index 2d4aa9b97..bbbb5c6ac 100644 --- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl +++ b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl @@ -6,7 +6,7 @@ xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0" - xmlns:nav="http://ccm.redhat.com/london/navigation" + xmlns:nav="http://ccm.redhat.com/navigation" exclude-result-prefixes="xsl bebop cms ui" version="1.0">