From 7d3056ffaf7aa18a7bc63527d187be4b5affcccf Mon Sep 17 00:00:00 2001 From: pb Date: Fri, 28 Aug 2009 13:52:52 +0000 Subject: [PATCH] ccm-zes-aplaws verschiedene kleinere Bereinigungen in Zusammenhang mit Update auf Version 1.0.9 git-svn-id: https://svn.libreccm.org/ccm/trunk@242 8810af33-2d31-482b-a856-94f89814c4df --- .../bundles/devel/cfg/integration.properties | 5 + .../src/com/arsdigita/aplaws/Loader.java | 5 + .../com/arsdigita/aplaws/ui/TermWidget.java | 75 ++++++++++----- .../navigation/templates/zes-events.jsp | 73 --------------- .../navigation/templates/zes-portal.jsp | 38 ++++++++ .../navigation/templates/zes-welcome-neu.jsp | 93 ------------------- .../navigation/templates/zes-welcome.jsp | 2 + 7 files changed, 104 insertions(+), 187 deletions(-) delete mode 100644 ccm-zes-aplaws/web/packages/navigation/templates/zes-events.jsp create mode 100644 ccm-zes-aplaws/web/packages/navigation/templates/zes-portal.jsp delete mode 100644 ccm-zes-aplaws/web/packages/navigation/templates/zes-welcome-neu.jsp diff --git a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties index e279a3f11..96333eba4 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties @@ -65,6 +65,11 @@ com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/ars 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 diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java index b2e8f02d3..2539464e0 100644 --- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -223,6 +223,11 @@ public class Loader extends PackageLoader { "ZeS default index page", "/packages/navigation/templates/zes-default.jsp"); + template = Template.create( + "ZeS Portalseite", + "ZeS Portal Page", + "/packages/navigation/templates/zes-portal.jsp"); + template = Template.create( "ZeS Recent", "ZeS reverse order page", diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java index 3f238a981..028ae2edd 100644 --- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java +++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java @@ -19,26 +19,6 @@ package com.arsdigita.aplaws.ui; -import com.arsdigita.london.terms.Domain; -import com.arsdigita.london.terms.Term; - -import com.arsdigita.aplaws.Aplaws; -import com.arsdigita.bebop.form.Widget; -import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.parameters.ArrayParameter; -import com.arsdigita.bebop.parameters.StringParameter; -import com.arsdigita.bebop.parameters.BigDecimalParameter; -import com.arsdigita.categorization.Category; -import com.arsdigita.domain.DomainCollection; -import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.SessionManager; -import com.arsdigita.xml.Element; -import com.arsdigita.xml.XML; - -import com.arsdigita.cms.CMS; -import com.arsdigita.cms.ContentSection; - import java.math.BigDecimal; import java.util.HashMap; import java.util.HashSet; @@ -48,6 +28,27 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.arsdigita.aplaws.Aplaws; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.form.Widget; +import com.arsdigita.bebop.parameters.ArrayParameter; +import com.arsdigita.bebop.parameters.BigDecimalParameter; +import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.categorization.Category; +import com.arsdigita.cms.CMS; +import com.arsdigita.cms.ContentItem; +import com.arsdigita.cms.ContentSection; +import com.arsdigita.domain.DomainCollection; +import com.arsdigita.domain.DomainObjectFactory; +import com.arsdigita.london.terms.Domain; +import com.arsdigita.london.terms.Term; +import com.arsdigita.london.terms.indexing.Indexer; +import com.arsdigita.london.terms.indexing.RankedTerm; +import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.xml.Element; +import com.arsdigita.xml.XML; + /** * A Widget for selecting Terms. Based heavily on CategoryWidget. * @@ -129,13 +130,45 @@ public class TermWidget extends Widget { } Element el = generateCategory(widget, domain.getModel(), ids, null); + + /** + * Used by kea based keyphrase extraction facility. + * (Added r1885) + * + * @Author: terry_permeance + */ + Indexer indexer = Indexer.retrieve(domain); + if (indexer != null) { + ContentItem item = CMS.getContext().getContentItem(); + List autoTerms = indexer.index(item, 16); + Element autoCategories = widget.newChildElement("cms:autoCategories", CMS.CMS_XML_NS); + for (Iterator i = autoTerms.iterator(); i.hasNext(); ) { + RankedTerm nextRankedTerm = i.next(); + Category cat = nextRankedTerm.getTerm().getModel(); + if (!ids.contains(cat.getID())) { + String fullname = cat.getQualifiedName(" > ", false); + if (fullname != null) { + Element catEl = autoCategories.newChildElement("cms:category", CMS.CMS_XML_NS); + catEl.addAttribute("id", XML.format(cat.getID())); + catEl.addAttribute("name", cat.getName()); + catEl.addAttribute("description", cat.getDescription()); + catEl.addAttribute("isAbstract", cat.isAbstract() ? "1" : "0"); + catEl.addAttribute("isEnabled", cat.isEnabled() ? "1" : "0"); + catEl.addAttribute("sortKey", nextRankedTerm.getRanking().toString()); + catEl.addAttribute("fullname", fullname); + } + } + } + } + if (Aplaws.getAplawsConfig().ajaxExpandAllBranches()) { // add attribute to the parent node, so that in stylesheet // we can look for any ancestor with this attribute (can't // add attribute to categoryWidget element as that is not // visible when subbranches are transformed) el.addAttribute("expand", "all" ); - } + } + for (Iterator i=roots.iterator(); i.hasNext(); ) { TermSortKeyPair pair = (TermSortKeyPair) i.next(); Term term = pair.getTerm(); diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/zes-events.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/zes-events.jsp deleted file mode 100644 index 3b346d4b3..000000000 --- a/ccm-zes-aplaws/web/packages/navigation/templates/zes-events.jsp +++ /dev/null @@ -1,73 +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) 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().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"); - - - - - - - diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/zes-portal.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/zes-portal.jsp new file mode 100644 index 000000000..dde10fef7 --- /dev/null +++ b/ccm-zes-aplaws/web/packages/navigation/templates/zes-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-zes-aplaws/web/packages/navigation/templates/zes-welcome-neu.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/zes-welcome-neu.jsp deleted file mode 100644 index cae21500c..000000000 --- a/ccm-zes-aplaws/web/packages/navigation/templates/zes-welcome-neu.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-zes-aplaws/web/packages/navigation/templates/zes-welcome.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/zes-welcome.jsp index d0edcfe73..bdf3f7745 100644 --- a/ccm-zes-aplaws/web/packages/navigation/templates/zes-welcome.jsp +++ b/ccm-zes-aplaws/web/packages/navigation/templates/zes-welcome.jsp @@ -4,6 +4,8 @@ xmlns:show="/WEB-INF/bebop-show.tld" version="1.2"> + <%-- JSP template for the ZeS welcome / start page using navigation --%> +