diff --git a/ccm-bundle/bundles/demo/themes/placeholder.info b/ccm-bundle/bundles/demo/themes/placeholder.info index 38db9a8ae..c78cf06e6 100644 --- a/ccm-bundle/bundles/demo/themes/placeholder.info +++ b/ccm-bundle/bundles/demo/themes/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-bundle/bundles/devel/themes/placeholder.info b/ccm-bundle/bundles/devel/themes/placeholder.info index 38db9a8ae..c78cf06e6 100644 --- a/ccm-bundle/bundles/devel/themes/placeholder.info +++ b/ccm-bundle/bundles/devel/themes/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-bundle/web/packages/content-section/www/person4homepages.jsp b/ccm-bundle/web/packages/content-section/www/person4homepages.jsp deleted file mode 100644 index ad3103a5d..000000000 --- a/ccm-bundle/web/packages/content-section/www/person4homepages.jsp +++ /dev/null @@ -1,49 +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) personList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.GenericPerson"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getRenderer().setSpecializeObjects(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setExcludeIndexObjects(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setFilterCategory(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getRenderer().setPageSize(99999); - if((request.getParameterMap().get("DaBInId") != null) && (((String[])request.getParameterMap().get("DaBInId")).length > 0)) { - String[] params = (String[]) request.getParameterMap().get("DaBInId"); - String dabinid = params[0]; - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setSQLFilter(String.format("pageDescription LIKE '%%DaBInId={%s}%%'", dabinid)); - } - - - - - - - \ No newline at end of file diff --git a/ccm-bundle/web/packages/content-section/www/projects4homepages.jsp b/ccm-bundle/web/packages/content-section/www/projects4homepages.jsp deleted file mode 100644 index 5579d1073..000000000 --- a/ccm-bundle/web/packages/content-section/www/projects4homepages.jsp +++ /dev/null @@ -1,52 +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) projectList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjects(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setExcludeIndexObjects(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setFilterCategory(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setAddOrder("title"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjectsContext("sciProjectList"); - if((request.getParameterMap().get("DaBInId") != null) && (((String[])request.getParameterMap().get("DaBInId")).length > 0)) { - String[] params = (String[]) request.getParameterMap().get("DaBInId"); - String dabinid = params[0]; - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setSQLFilter(String.format("persons.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid)); - - } - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setPageSize(99999); - - - - - - diff --git a/ccm-bundle/web/packages/content-section/www/publications4homepages.jsp b/ccm-bundle/web/packages/content-section/www/publications4homepages.jsp deleted file mode 100644 index 6a3f587f7..000000000 --- a/ccm-bundle/web/packages/content-section/www/publications4homepages.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.ComplexObjectList) publicationList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setSpecializeObjects(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setExcludeIndexObjects(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setFilterCategory(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().addOrder("yearOfPublication desc"); - if((request.getParameterMap().get("DaBInId") != null) && (((String[])request.getParameterMap().get("DaBInId")).length > 0)) { - String[] params = (String[]) request.getParameterMap().get("DaBInId"); - String dabinid = params[0]; - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setSQLFilter(String.format("authors.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid)); - - } - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setPageSize(99999); - - - - - - diff --git a/ccm-bundle/web/templates/ccm-navigation/services/summary.jsp b/ccm-bundle/web/templates/ccm-navigation/services/summary.jsp index 1c52b6861..7dbc4d913 100644 --- a/ccm-bundle/web/templates/ccm-navigation/services/summary.jsp +++ b/ccm-bundle/web/templates/ccm-navigation/services/summary.jsp @@ -13,9 +13,9 @@ title="APLAWS" cache="true"> + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> diff --git a/ccm-sci-bundle/bundles/demo/themes/placeholder.info b/ccm-sci-bundle/bundles/demo/themes/placeholder.info index 38db9a8ae..c78cf06e6 100644 --- a/ccm-sci-bundle/bundles/demo/themes/placeholder.info +++ b/ccm-sci-bundle/bundles/demo/themes/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/themes/placeholder.info b/ccm-sci-bundle/bundles/devel/themes/placeholder.info index 38db9a8ae..c78cf06e6 100644 --- a/ccm-sci-bundle/bundles/devel/themes/placeholder.info +++ b/ccm-sci-bundle/bundles/devel/themes/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-std/templates/ccm-navigation/navigation/SciDepartment-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartment-index.jsp index 2be3aa4be..44864a868 100644 --- 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 @@ -26,7 +26,7 @@ - com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject(); + com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.navigation.ui.GreetingItem) greetingItem).getObject(); ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel) sectionXML).setContentItem(item); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", + ((com.arsdigita.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(); diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentAssociatedMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentAssociatedMembers.jsp index 890957e58..b99febc5c 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentAssociatedMembers.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentAssociatedMembers.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,28 +26,28 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", + ((com.arsdigita.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.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.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentDescription.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentDescription.jsp index 2e1d5a139..6941830c4 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentDescription.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentDescription.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,21 +26,21 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", SimpleXMLGenerator.ADAPTER_CONTEXT); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFinishedProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFinishedProjects.jsp index b6c5815fa..09665afbe 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFinishedProjects.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFinishedProjects.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,31 +26,31 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFormerMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFormerMembers.jsp index 706a76a3a..3a5a92608 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFormerMembers.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFormerMembers.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,27 +26,27 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", + ((com.arsdigita.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).setOrder("surname asc, givenname asc"); + ((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).setOrder("surname asc, givenname asc"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentMembers.jsp index 87af629b7..38f33fe52 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentMembers.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentMembers.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,26 +26,26 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", + ((com.arsdigita.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).setOrder("surname asc, givenname asc"); + ((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).setOrder("surname asc, givenname asc"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentOngoingProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentOngoingProjects.jsp index e910d132d..48f096e59 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentOngoingProjects.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentOngoingProjects.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,31 +26,31 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> '" + todayDate + "'"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); ]]> + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentProjects.jsp index 15b32d4c1..e52810745 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentProjects.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentProjects.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,25 +26,25 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", + ((com.arsdigita.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/projects"); + ((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/projects"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentSubDepartments.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentSubDepartments.jsp index f4ee43330..2ed9293bd 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentSubDepartments.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentSubDepartments.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,25 +26,25 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment", + ((com.arsdigita.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/subDepartments"); + ((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/subDepartments"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciMember-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciMember-index.jsp index 5fb8f9004..c27621365 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciMember-index.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciMember-index.jsp @@ -5,9 +5,9 @@ - - - + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -22,47 +22,47 @@ title="Navigation" cache="false"> + classname="com.arsdigita.navigation.ui.GreetingItem"/> - com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject(); + com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.navigation.ui.GreetingItem) greetingItem).getObject(); ((com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel) sectionXML).setContentItem(item); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/> ((com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel)sectionXML).setPageSize(20); - ((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.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.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.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false); + ((com.arsdigita.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"); + ((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"); + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganization-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganization-index.jsp index 5aee1477f..779fdc0e3 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganization-index.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganization-index.jsp @@ -5,9 +5,9 @@ - - - + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -22,44 +22,44 @@ title="Navigation" cache="false"> + classname="com.arsdigita.navigation.ui.GreetingItem"/> - com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject(); + com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.navigation.ui.GreetingItem) greetingItem).getObject(); ((com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel) sectionXML).setContentItem(item); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/> ((com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel)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.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.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.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false); + ((com.arsdigita.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"); + ((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"); + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationActiveMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationActiveMembers.jsp index f94befbc7..5c0f12fd2 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationActiveMembers.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationActiveMembers.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,29 +26,29 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", SimpleXMLGenerator.ADAPTER_CONTEXT); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); - ((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).getTraversalAdapter().addAssociationProperty("/object/departments/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.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/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.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationAssociatedMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationAssociatedMembers.jsp index 6041bad0d..ec193499a 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationAssociatedMembers.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationAssociatedMembers.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,29 +26,29 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", SimpleXMLGenerator.ADAPTER_CONTEXT); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); - ((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).getTraversalAdapter().addAssociationProperty("/object/departments/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.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/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.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDepartments.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDepartments.jsp index 7ff218392..5c25cb5a5 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDepartments.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDepartments.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,25 +26,25 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", SimpleXMLGenerator.ADAPTER_CONTEXT); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDescription.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDescription.jsp index 9fcaecf02..fe59db453 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDescription.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDescription.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,21 +26,21 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", SimpleXMLGenerator.ADAPTER_CONTEXT); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFinishedProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFinishedProjects.jsp index c31ed85e1..b4e8310a2 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFinishedProjects.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFinishedProjects.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,32 +26,32 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFormerMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFormerMembers.jsp index 3e702b584..f95cc2c03 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFormerMembers.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFormerMembers.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,28 +26,28 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", SimpleXMLGenerator.ADAPTER_CONTEXT); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); - ((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).getTraversalAdapter().addAssociationProperty("/object/departments/persons"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember = true"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember = true"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationMembers.jsp index 0289f84c1..fbfe80dca 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationMembers.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationMembers.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,27 +26,27 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", SimpleXMLGenerator.ADAPTER_CONTEXT); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); - ((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).getTraversalAdapter().addAssociationProperty("/object/departments/persons"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationOngoingProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationOngoingProjects.jsp index 5b2f64a9d..b091d21d3 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationOngoingProjects.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationOngoingProjects.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,32 +26,32 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> '" + todayDate + "'"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); ]]> + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationProjects.jsp index 286fb0f0a..5b6b419b7 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationProjects.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationProjects.jsp @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -26,27 +26,27 @@ title="Navigation" cache="true"> + classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/> - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization", SimpleXMLGenerator.ADAPTER_CONTEXT); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties(); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects"); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects"); - ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20); + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciProjectList.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciProjectList.jsp index ccb76568a..35e4cf7fb 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciProjectList.jsp +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciProjectList.jsp @@ -6,11 +6,11 @@ - - - - - + + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -24,13 +24,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; @@ -59,7 +59,7 @@ + classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/> diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/placeholder.info b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/placeholder.info index 38db9a8ae..c78cf06e6 100644 --- a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/placeholder.info +++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/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/doc/app-schemas/app-schemas.html b/ccm-sci-bundle/doc/app-schemas/app-schemas.html index 0b17098ba..f272f248f 100644 --- a/ccm-sci-bundle/doc/app-schemas/app-schemas.html +++ b/ccm-sci-bundle/doc/app-schemas/app-schemas.html @@ -120,7 +120,7 @@ etc. </xs:documentation> <xs:appinfo> - <gen:class>com.arsdigita.london.navigation.ui.category.Root</gen:class> + <gen:class>com.arsdigita.navigation.ui.category.Root</gen:class> </xs:appinfo> </xs:annotation> @@ -139,7 +139,7 @@ etc. </xs:documentation> <xs:appinfo> - <gen:class>com.arsdigita.london.navigation.ui.category.TopLevel</gen:class> + <gen:class>com.arsdigita.navigation.ui.category.TopLevel</gen:class> </xs:appinfo> </xs:annotation> @@ -158,7 +158,7 @@ etc. </xs:documentation> <xs:appinfo> - <gen:class>com.arsdigita.london.navigation.ui.category.Siblings</gen:class> + <gen:class>com.arsdigita.navigation.ui.category.Siblings</gen:class> </xs:appinfo> </xs:annotation> @@ -176,7 +176,7 @@ etc. </xs:documentation> <xs:appinfo> - <gen:class>com.arsdigita.london.navigation.ui.category.Children</gen:class> + <gen:class>com.arsdigita.navigation.ui.category.Children</gen:class> </xs:appinfo> </xs:annotation> @@ -195,7 +195,7 @@ etc. </xs:documentation> <xs:appinfo> - <gen:class>com.arsdigita.london.navigation.ui.category.Path</gen:class> + <gen:class>com.arsdigita.navigation.ui.category.Path</gen:class> </xs:appinfo> </xs:annotation> @@ -216,7 +216,7 @@ etc. </xs:documentation> <xs:appinfo> - <gen:class>com.arsdigita.london.navigation.ui.category.Menu</gen:class> + <gen:class>com.arsdigita.navigation.ui.category.Menu</gen:class> </xs:appinfo> </xs:annotation> @@ -235,7 +235,7 @@ etc. </xs:documentation> <xs:appinfo> - <gen:class>com.arsdigita.london.navigation.ui.category.Hierarchy</gen:class> + <gen:class>com.arsdigita.navigation.ui.category.Hierarchy</gen:class> </xs:appinfo> </xs:annotation> @@ -298,7 +298,7 @@ contains a summary of top two levels of navigation categories. </xs:documentation> <xs:appinfo> - <gen:class>com.arsdigita.london.navigation.ui.DirectoryComponent</gen:class> + <gen:class>com.arsdigita.navigation.ui.DirectoryComponent</gen:class> </xs:appinfo> </xs:annotation> diff --git a/ccm-sci-bundle/doc/app-schemas/directory.xsd b/ccm-sci-bundle/doc/app-schemas/directory.xsd index cd97da858..6787e10d4 100644 --- a/ccm-sci-bundle/doc/app-schemas/directory.xsd +++ b/ccm-sci-bundle/doc/app-schemas/directory.xsd @@ -15,7 +15,7 @@ - com.arsdigita.london.navigation.ui.DirectoryComponent + com.arsdigita.navigation.ui.DirectoryComponent diff --git a/ccm-sci-bundle/doc/app-schemas/navigation.xsd b/ccm-sci-bundle/doc/app-schemas/navigation.xsd index 117751e63..696f0f615 100644 --- a/ccm-sci-bundle/doc/app-schemas/navigation.xsd +++ b/ccm-sci-bundle/doc/app-schemas/navigation.xsd @@ -12,7 +12,7 @@ - com.arsdigita.london.navigation.ui.category.Root + com.arsdigita.navigation.ui.category.Root @@ -31,7 +31,7 @@ - com.arsdigita.london.navigation.ui.category.TopLevel + com.arsdigita.navigation.ui.category.TopLevel @@ -50,7 +50,7 @@ - com.arsdigita.london.navigation.ui.category.Siblings + com.arsdigita.navigation.ui.category.Siblings @@ -68,7 +68,7 @@ - com.arsdigita.london.navigation.ui.category.Children + com.arsdigita.navigation.ui.category.Children @@ -87,7 +87,7 @@ - com.arsdigita.london.navigation.ui.category.Path + com.arsdigita.navigation.ui.category.Path @@ -108,7 +108,7 @@ - com.arsdigita.london.navigation.ui.category.Menu + com.arsdigita.navigation.ui.category.Menu @@ -127,7 +127,7 @@ - com.arsdigita.london.navigation.ui.category.Hierarchy + com.arsdigita.navigation.ui.category.Hierarchy diff --git a/ccm-sci-bundle/web/packages/content-section/www/person4homepages.jsp b/ccm-sci-bundle/web/packages/content-section/www/person4homepages.jsp index ad3103a5d..d5de9a0dc 100644 --- a/ccm-sci-bundle/web/packages/content-section/www/person4homepages.jsp +++ b/ccm-sci-bundle/web/packages/content-section/www/person4homepages.jsp @@ -6,9 +6,9 @@ - - - + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -25,20 +25,20 @@ cache="false"> + classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/> - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.GenericPerson"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getRenderer().setSpecializeObjects(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setExcludeIndexObjects(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setFilterCategory(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getRenderer().setPageSize(99999); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.GenericPerson"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getRenderer().setSpecializeObjects(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getDefinition().setDescendCategories(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getDefinition().setExcludeIndexObjects(false); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getDefinition().setFilterCategory(false); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getRenderer().setPageSize(99999); if((request.getParameterMap().get("DaBInId") != null) && (((String[])request.getParameterMap().get("DaBInId")).length > 0)) { String[] params = (String[]) request.getParameterMap().get("DaBInId"); String dabinid = params[0]; - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setSQLFilter(String.format("pageDescription LIKE '%%DaBInId={%s}%%'", dabinid)); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).setSQLFilter(String.format("pageDescription LIKE '%%DaBInId={%s}%%'", dabinid)); } diff --git a/ccm-sci-bundle/web/packages/content-section/www/projects4homepages.jsp b/ccm-sci-bundle/web/packages/content-section/www/projects4homepages.jsp index 5579d1073..9dae2663c 100644 --- a/ccm-sci-bundle/web/packages/content-section/www/projects4homepages.jsp +++ b/ccm-sci-bundle/web/packages/content-section/www/projects4homepages.jsp @@ -6,9 +6,9 @@ - - - + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -25,25 +25,25 @@ cache="false"> + classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/> - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjects(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setExcludeIndexObjects(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setFilterCategory(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setAddOrder("title"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjectsContext("sciProjectList"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjects(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setDescendCategories(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setExcludeIndexObjects(false); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setFilterCategory(false); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setAddOrder("title"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjectsContext("sciProjectList"); if((request.getParameterMap().get("DaBInId") != null) && (((String[])request.getParameterMap().get("DaBInId")).length > 0)) { String[] params = (String[]) request.getParameterMap().get("DaBInId"); String dabinid = params[0]; - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setSQLFilter(String.format("persons.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid)); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).setSQLFilter(String.format("persons.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid)); } - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setPageSize(99999); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setPageSize(99999); diff --git a/ccm-sci-bundle/web/packages/content-section/www/publications4homepages.jsp b/ccm-sci-bundle/web/packages/content-section/www/publications4homepages.jsp index 6a3f587f7..cf3a400e4 100644 --- a/ccm-sci-bundle/web/packages/content-section/www/publications4homepages.jsp +++ b/ccm-sci-bundle/web/packages/content-section/www/publications4homepages.jsp @@ -6,9 +6,9 @@ - - - + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -25,24 +25,24 @@ cache="false"> + classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/> - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setSpecializeObjects(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setExcludeIndexObjects(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setFilterCategory(false); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().addOrder("yearOfPublication desc"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).setDefinition(new CMSDataCollectionDefinition()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).setRenderer(new CMSDataCollectionRenderer()); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication"); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setSpecializeObjects(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setDescendCategories(true); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setExcludeIndexObjects(false); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setFilterCategory(false); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().addOrder("yearOfPublication desc"); if((request.getParameterMap().get("DaBInId") != null) && (((String[])request.getParameterMap().get("DaBInId")).length > 0)) { String[] params = (String[]) request.getParameterMap().get("DaBInId"); String dabinid = params[0]; - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setSQLFilter(String.format("authors.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid)); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).setSQLFilter(String.format("authors.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid)); } - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setPageSize(99999); + ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setPageSize(99999); diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/services/summary.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/services/summary.jsp index 1c52b6861..7dbc4d913 100644 --- a/ccm-sci-bundle/web/templates/ccm-navigation/services/summary.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/services/summary.jsp @@ -13,9 +13,9 @@ title="APLAWS" cache="true"> + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> diff --git a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-with-publications-item.jsp b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-with-publications-item.jsp index d673bea10..daa940e9b 100644 --- a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-with-publications-item.jsp +++ b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-with-publications-item.jsp @@ -4,8 +4,8 @@ version="1.2"> + import="com.arsdigita.navigation.NavigationModel, + com.arsdigita.navigation.cms.CMSNavigationModel"/> NavigationModel model = new CMSNavigationModel(); @@ -15,15 +15,15 @@ title="APLAWS" cache="false"> + classname="com.arsdigita.navigation.ui.category.Path"/> - ((com.arsdigita.london.navigation.ui.category.Path)categoryPath) + ((com.arsdigita.navigation.ui.category.Path)categoryPath) .setModel(model); + classname="com.arsdigita.navigation.ui.category.Menu"/> - ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu) + ((com.arsdigita.navigation.ui.category.Menu)categoryMenu) .setModel(model); + classname="com.arsdigita.navigation.ui.RelatedItems"/> diff --git a/ccm-webpage/web/packages/content-section/templates/default/practice-news-folder.jsp b/ccm-webpage/web/packages/content-section/templates/default/practice-news-folder.jsp index d2cd73863..ef580ab4a 100755 --- a/ccm-webpage/web/packages/content-section/templates/default/practice-news-folder.jsp +++ b/ccm-webpage/web/packages/content-section/templates/default/practice-news-folder.jsp @@ -6,32 +6,32 @@ - + + classname="com.arsdigita.navigation.ui.GreetingItem"/> + classname="com.arsdigita.navigation.ui.CategoryPath"/> + classname="com.arsdigita.navigation.ui.CategoryNavRecursive"/> + classname="com.arsdigita.navigation.ui.ItemList"/> - ((com.arsdigita.london.navigation.ui.ItemList) itemList).setObjectType( "com.arsdigita.cms.ContentBundle" ); - ((com.arsdigita.london.navigation.ui.ItemList) itemList).setHowMany(99); - ((com.arsdigita.london.navigation.ui.ItemList) itemList).setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute("objectType"); - ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute( "title" ); - ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute( "description" ); - - ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute( "lead" ); - ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute( "lastModifiedDate" ); - ((com.arsdigita.london.navigation.ui.ItemList) itemList).includeImages(4); + ((com.arsdigita.navigation.ui.ItemList) itemList).setObjectType( "com.arsdigita.cms.ContentBundle" ); + ((com.arsdigita.navigation.ui.ItemList) itemList).setHowMany(99); + ((com.arsdigita.navigation.ui.ItemList) itemList).setDescendCategories(true); + ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute("objectType"); + ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute( "title" ); + ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute( "description" ); + + ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute( "lead" ); + ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute( "lastModifiedDate" ); + ((com.arsdigita.navigation.ui.ItemList) itemList).includeImages(4); diff --git a/ccm-webpage/web/packages/content-section/templates/default/practice-news-item.jsp b/ccm-webpage/web/packages/content-section/templates/default/practice-news-item.jsp index 01ac7ea96..35ff5f168 100755 --- a/ccm-webpage/web/packages/content-section/templates/default/practice-news-item.jsp +++ b/ccm-webpage/web/packages/content-section/templates/default/practice-news-item.jsp @@ -6,20 +6,20 @@ - + + classname="com.arsdigita.navigation.ui.CategoryPath"/> - ((com.arsdigita.london.navigation.ui.CategoryPath) categoryPath).setSelectionType( com.arsdigita.london.navigation.ui.Selection.USE_ITEM_ID ); + ((com.arsdigita.navigation.ui.CategoryPath) categoryPath).setSelectionType( com.arsdigita.navigation.ui.Selection.USE_ITEM_ID ); + classname="com.arsdigita.navigation.ui.CategoryNavRecursive"/> - ((com.arsdigita.london.navigation.ui.CategoryNavRecursive) categoryNavRecursive).setSelectionType( com.arsdigita.london.navigation.ui.Selection.USE_ITEM_ID ); + ((com.arsdigita.navigation.ui.CategoryNavRecursive) categoryNavRecursive).setSelectionType( com.arsdigita.navigation.ui.Selection.USE_ITEM_ID ); diff --git a/ccm-webpage/web/static/content-types/com/arsdigita/cms/Webpage.xsl b/ccm-webpage/web/static/content-types/com/arsdigita/cms/Webpage.xsl index 736bb8e07..43436cf40 100755 --- a/ccm-webpage/web/static/content-types/com/arsdigita/cms/Webpage.xsl +++ b/ccm-webpage/web/static/content-types/com/arsdigita/cms/Webpage.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" xmlns:webpage="http://www.undp.org/webpage/1.0" version="1.0">