From ad8a8d2e9ac70111469ca78ac797a9e76dec7152 Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 6 Feb 2010 11:02:19 +0000 Subject: [PATCH] ccm-gen-aplaws korrigiert, ldn-theme funktioniert wieder. git-svn-id: https://svn.libreccm.org/ccm/trunk@337 8810af33-2d31-482b-a856-94f89814c4df --- ccm-gen-aplaws/bundles/devel/bundle.in | 2 +- .../handbook/cfg/integration.properties | 101 +++++++++++---- .../src/com/arsdigita/aplaws/Initializer.java | 6 +- .../src/com/arsdigita/aplaws/Loader.java | 28 ++-- .../aplaws-generic/consultations-index.xsl | 2 +- .../forum-example/forum-index.css | 5 +- .../web/assets/xinha/XinhaConfig.js | 18 +++ .../navigation/templates/gen-portal.jsp | 38 ++++++ .../navigation/templates/gen-welcome.jsp | 121 ++++++++++++++++++ .../packages/navigation/templates/welcome.jsp | 93 -------------- .../ccm-ldn-navigation/navigation/sitemap.jsp | 4 + .../ccm-ldn-portal/portal/README.txt | 2 +- 12 files changed, 287 insertions(+), 133 deletions(-) create mode 100644 ccm-gen-aplaws/web/assets/xinha/XinhaConfig.js create mode 100644 ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp create mode 100644 ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp delete mode 100755 ccm-gen-aplaws/web/packages/navigation/templates/welcome.jsp diff --git a/ccm-gen-aplaws/bundles/devel/bundle.in b/ccm-gen-aplaws/bundles/devel/bundle.in index ad1200c37..e9ed3a3b4 100755 --- a/ccm-gen-aplaws/bundles/devel/bundle.in +++ b/ccm-gen-aplaws/bundles/devel/bundle.in @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-devel BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle" -VERSION=1.0.5devel +VERSION=1.0.9devel RELEASE=1 diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties b/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties index 952d8967b..a4e292238 100755 --- a/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties +++ b/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties @@ -1,41 +1,98 @@ -waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver -waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt -# waf.kernel.data_permission_check_enabled=false -waf.dispatcher.default_expiry=3600 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage +; dhtml editor to use (system wide) +waf.bebop.dhtml_editor=FCKeditor + +waf.categorization.show_internal_name=true +waf.categorization.supported_languages=de,en + +waf.dispatcher.default_expiry=3600 +; +# waf.kernel.data_permission_check_enabled=false +waf.kernel.primary_user_identifier=email +; if you activate screen_name, forum loader doesn't work. +; waf.kernel.primary_user_identifier=screen_name + +; security.properties: +waf.auto_registration_on=false waf.pagemap.root=portal/ waf.pagemap.workspace=portal/ waf.pagemap.login_redirect=content/content-center-redirect.jsp +; Searches for localized style sheet (among others) +waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver +waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt + +; Configures the xml processing +waf.xml.xsl_transformer=xalan +waf.xml.activate_full_date_formatter=true + +com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker + com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver -com.arsdigita.cms.disable_item_pfs=true -com.arsdigita.cms.use_section_categories=false -com.arsdigita.cms.use_streamlined_creation=true -# ## com.arsdigita.cms.hide_templates_tab=true -# ## com.arsdigita.cms.hide_admin_tabs=true -# ## com.arsdigita.cms.hide_timezone=true -com.arsdigita.cms.hide_launch_date=true -# com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js -# com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS + +; Configure dhtml editor for use in cms content-center com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js -cms.dhtml_editor_hidden_buttons= +com.arsdigita.cms.dhtml_editor_hidden_buttons= +; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS com.arsdigita.cms.dhtml_editor_plugins= -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker -# ## com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true -com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp -com.arsdigita.cms.hide_udct_ui=true -# ## com.arsdigita.cms.hide_folder_index_checkbox=true +com.arsdigita.cms.disable_item_pfs=true +# ## com.arsdigita.cms.hide_admin_tabs=true +# ## com.arsdigita.cms.hide_folder_index_checkbox=true +com.arsdigita.cms.hide_launch_date=true +# ## com.arsdigita.cms.hide_templates_tab=true +# ## com.arsdigita.cms.hide_timezone=true +com.arsdigita.cms.hide_udct_ui=true + +com.arsdigita.cms.use_section_categories=false +com.arsdigita.cms.use_streamlined_creation=true + + +com.arsdigita.cms.contenttypes.event.hide_cost=true +com.arsdigita.cms.contenttypes.event.hide_date_description=false +com.arsdigita.cms.contenttypes.event.hide_event_type=true +com.arsdigita.cms.contenttypes.event.hide_link_to_map=true +com.arsdigita.cms.contenttypes.event.hide_main_contributor=true +com.arsdigita.cms.contenttypes.event.use_html_date_description=false + + +com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp + +# ## com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true + +# ## com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp + + +; Forum application +com.arsdigita.forum.show_new_tabs=true +com.arsdigita.forum.use_wysiwyg_editor=true +com.arsdigita.forum.allow_quick_finish=true +com.arsdigita.forum.disable_page_caching=true + + +; atoz currently not in use # ## com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker + +; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 +; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive +; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 +; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 +com.arsdigita.london.navigation.category_menu_show_grand_children=false +; com.arsdigita.london.navigation.category_menu_show_nephews=false +com.arsdigita.london.navigation.default_cat_root_path=/navigation/ +com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp + +com.arsdigita.london.search.show_sponsored_links=true + com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic com.arsdigita.london.theme.default_theme_context= -com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf -com.arsdigita.london.search.show_sponsored_links=true +com.arsdigita.london.theme.default_theme_manifest=ccm-gen-aplaws.web.mf +com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic +com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml # com.arsdigita.london.cms.dublin.audience_domain=LGAL diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java index 6f1697843..dec7b485a 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java @@ -19,12 +19,14 @@ package com.arsdigita.aplaws; import com.arsdigita.categorization.Categorization; -import com.arsdigita.london.terms.TermCategoryListener; import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.DomainInitEvent; +import com.arsdigita.templating.PatternStylesheetResolver; + +import com.arsdigita.london.terms.TermCategoryListener; + import org.apache.log4j.Logger; -import com.arsdigita.templating.PatternStylesheetResolver; /** * The APLAWS initializer. diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java index 65ec64476..46a6972ff 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -210,26 +210,32 @@ public class Loader extends PackageLoader { Template template ; - /* Werden bereits in navigation erstellt. + /* In navigation werden bereits Grund-Templates erstellt. + */ template = Template.create( "Generic AtoZ paginator", "Generic AtoZ paginator index page", "/packages/navigation/templates/gen-atoz.jsp"); template = Template.create( - "Default", - "default index page", - "/packages/navigation/templates/default.jsp"); + "Generic Default", + "Generic default index page", + "/packages/navigation/templates/gen-default.jsp"); template = Template.create( - "Recent", - "reverse order page", - "/packages/navigation/templates/recent.jsp"); - */ + "Generic Portalseite", + "Generic Portal Page", + "/packages/navigation/templates/gen-portal.jsp"); + template = Template.create( - "Welcome Page", - "Welcome Page for navigation", - "/packages/navigation/templates/welcome.jsp"); + "Generic Recent", + "Generic reverse order page", + "/packages/navigation/templates/gen-recent.jsp"); + + template = Template.create( + "Generic Welcome Page", + "Generic Welcome Page for navigation", + "/packages/navigation/templates/gen-welcome.jsp"); } diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl b/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl index 40ca23cd0..75fe0ebdd 100644 --- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl +++ b/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl @@ -8,7 +8,7 @@ xmlns:nav="http://ccm.redhat.com/london/navigation" version="1.0"> - + diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css b/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css index 31ac138af..74c5d3a59 100644 --- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css +++ b/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css @@ -1,6 +1,7 @@ @import url("css/main.css"); -<--@import url("/css/acs-master.css");--> -<--@import url("/css/tabbed-pane/tabbed-pane.css");--> +/* Chris presumably forgot the ! to comment the following 2 lines out +/* <--@import url("/css/acs-master.css");--> */ +/* <--@import url("/css/tabbed-pane/tabbed-pane.css");--> */ body { diff --git a/ccm-gen-aplaws/web/assets/xinha/XinhaConfig.js b/ccm-gen-aplaws/web/assets/xinha/XinhaConfig.js new file mode 100644 index 000000000..d39daff3b --- /dev/null +++ b/ccm-gen-aplaws/web/assets/xinha/XinhaConfig.js @@ -0,0 +1,18 @@ +/* This compressed file is part of Xinha. For uncompressed sources, forum, and bug reports, go to xinha.org */ +/* This file is part of version 0.95 released Mon, 12 May 2008 17:33:15 +0200 */ +/* The URL of the most recent version of this file is http://svn.xinha.webfactional.com/trunk/examples/XinhaConfig.js */ +xinha_init=null; +xinha_config=null; +xinha_init=xinha_init?xinha_init:function(){ +xinha_editors=xinha_editors?xinha_editors:["myTextArea","anotherOne"]; +xinha_plugins=xinha_plugins?xinha_plugins:["CharacterMap","ContextMenu","SmartReplace","Stylist","Linker","SuperClean","TableOperations"]; +if(!Xinha.loadPlugins(xinha_plugins,xinha_init)){ +return; +} +xinha_config=xinha_config?xinha_config():new Xinha.Config(); +xinha_config.pageStyleSheets=[_editor_url+"examples/full_example.css"]; +xinha_editors=Xinha.makeEditors(xinha_editors,xinha_config,xinha_plugins); +Xinha.startEditors(xinha_editors); +}; +Xinha.addOnloadHandler(xinha_init); + diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp new file mode 100644 index 000000000..dde10fef7 --- /dev/null +++ b/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp @@ -0,0 +1,38 @@ + + + <%-- JSP template to use a portal page as index page in navigation --%> + + + + + + + + long age = Navigation.getConfig().getIndexPageCacheLifetime(); + if (age == 0) { + DispatcherHelper.cacheDisable(response); + } else { + DispatcherHelper.cacheForWorld(response, (int)age); + } + + + + + + + + + ((com.arsdigita.london.portal.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); + + + + + diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp new file mode 100644 index 000000000..bdf3f7745 --- /dev/null +++ b/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp @@ -0,0 +1,121 @@ + + + <%-- JSP template for the ZeS welcome / start page using navigation --%> + + + + + + + + + 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-gen-aplaws/web/packages/navigation/templates/welcome.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/welcome.jsp deleted file mode 100755 index cae21500c..000000000 --- a/ccm-gen-aplaws/web/packages/navigation/templates/welcome.jsp +++ /dev/null @@ -1,93 +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.SimpleObjectList) eventList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event"); - - //((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getDefinition().getDataCollection(((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getModel()).setFilter("now() between launchDate and endDate"); - - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getDefinition().addOrder("startDate"); - - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getRenderer().setPageSize(5); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getRenderer().addAttribute("title"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getRenderer().addAttribute("lead"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getRenderer().addAttribute("eventDate"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getRenderer().addAttribute("launchDate"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getRenderer().addAttribute("startDate"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) eventList).getRenderer().addAttribute("endDate"); - - - - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.NewsItem"); - - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).getDefinition().setDescendCategories(true); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).getDefinition().addOrder("newsDate desc"); - - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).getRenderer().setPageSize(5); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).getRenderer().addAttribute("title"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).getRenderer().addAttribute("lead"); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) newsList).getRenderer().addAttribute("newsDate"); - - - - - - - diff --git a/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp b/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp index 79ac1ae65..e87172fb1 100755 --- a/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp +++ b/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp @@ -14,6 +14,10 @@ + + sitemapPage.setClassAttr("sitemapPage"); + +