diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/lib.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/lib.xsl index b04752556..c50705c54 100755 --- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/lib.xsl +++ b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/lib.xsl @@ -258,8 +258,8 @@ - - + + | @@ -282,10 +282,10 @@ - + - + @@ -300,7 +300,7 @@ / - --> - + | diff --git a/ccm-ldn-navigation/web/packages/navigation/templates/default.jsp b/ccm-ldn-navigation/web/packages/navigation/templates/default.jsp index 9fc430979..1740ca15f 100755 --- a/ccm-ldn-navigation/web/packages/navigation/templates/default.jsp +++ b/ccm-ldn-navigation/web/packages/navigation/templates/default.jsp @@ -9,6 +9,9 @@ + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -32,6 +35,9 @@ classname="com.arsdigita.london.navigation.ui.category.Menu"/> + + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); @@ -43,7 +49,19 @@ ((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("displayName"); ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate"); + + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).setDefinition(new DataCollectionDefinition()); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).setRenderer(new DataCollectionRenderer()); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setObjectType("com.arsdigita.web.Application"); + + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setDescendCategories(false); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().addOrder("categories.link.sortKey"); + + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().setPageSize(30); + ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().addAttribute("displayName"); +