From 3f6e7f6f5ec93b209afc90c4f4b9f3ae68352a2f Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 1 Apr 2011 07:28:47 +0000 Subject: [PATCH] =?UTF-8?q?JSP-Templates=20f=C3=BCr=20Publikationen=20und?= =?UTF-8?q?=20Projekte=20mit=20der=20CustomizableObjectList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@815 8810af33-2d31-482b-a856-94f89814c4df --- .../navigation/templates/SciProjectList.jsp | 95 +++++++++++-------- .../templates/SciPublicationList.jsp | 72 +++++--------- 2 files changed, 80 insertions(+), 87 deletions(-) diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciProjectList.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciProjectList.jsp index 4c4231230..6349befff 100644 --- a/ccm-zes-aplaws/web/packages/navigation/templates/SciProjectList.jsp +++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciProjectList.jsp @@ -1,53 +1,66 @@ - - - - - - + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:define="/WEB-INF/bebop-define.tld" + xmlns:show="/WEB-INF/bebop-show.tld" + version="1.2"> - + + + + + + + + + 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("title"); - - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(20); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setSpecializeObjects(true); - ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setSpecializeObjectsContext("sciProjectList"); - + + + + + - - - + + CustomizableObjectList objList = (CustomizableObjectList) itemList; + objList.setDefinition(new CMSDataCollectionDefinition()); + objList.setRenderer(new CMSDataCollectionRenderer()); + objList.setCustomName("SciProjectList"); + objList.getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject"); + objList.getDefinition().setDescendCategories(false); + objList.addTextFilter("title", "title"); - + java.util.GregorianCalendar now = new java.util.GregorianCalendar(); + String today = String.format("%d-%02d-%02d", now.get(java.util.GregorianCalendar.YEAR), + now.get(java.util.GregorianCalendar.MONTH) + 1, + now.get(java.util.GregorianCalendar.DATE)); + + objList.addCompareFilter("projectend", "projectstatus", true, true, false) + .addOption("ongoing", CompareFilter.Operators.GTEQ, today) + .addOption("finished", CompareFilter.Operators.LT, today); + objList.addSortField("title", "title asc"); + objList.getDefinition().addOrder(objList.getOrder(request.getParameter("sort"))); + + objList.getRenderer().setPageSize(20); + objList.getRenderer().setSpecializeObjects(true); + + + + + + + + + \ No newline at end of file diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciPublicationList.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciPublicationList.jsp index 41a98ef78..d25eccd93 100644 --- a/ccm-zes-aplaws/web/packages/navigation/templates/SciPublicationList.jsp +++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciPublicationList.jsp @@ -3,13 +3,13 @@ xmlns:define="/WEB-INF/bebop-define.tld" xmlns:show="/WEB-INF/bebop-show.tld" version="1.2"> - + - + long age = Navigation.getConfig().getIndexPageCacheLifetime(); @@ -22,7 +22,6 @@ - - + classname="com.arsdigita.london.navigation.ui.object.CustomizableObjectList"/> - org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger("SciPublicationListJsp"); + + CustomizableObjectList objList = (CustomizableObjectList) itemList; + objList.setDefinition(new CMSDataCollectionDefinition()); + objList.setRenderer(new CMSDataCollectionRenderer()); + objList.setCustomName("SciPublicationsList"); + objList.getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication"); + objList.getDefinition().setDescendCategories(false); + objList.addTextFilter("title", "title"); + objList.addTextFilter("authors.surname", "author"); + objList.addSelectFilter("yearOfPublication", "yearOfPublication", true, true, true, true); + objList.addSortField("title", "title asc"); + objList.addSortField("yearAsc", "yearOfPublication asc"); + objList.addSortField("yearDesc", "yearOfPublication desc"); + objList.addSortField("authors", "authors.surname asc, authors.givenname asc"); + objList.getDefinition().addOrder(objList.getOrder(request.getParameter("sort"))); - application.log("JSP::Configuring object list..."); - logger.warn("JSP::Configuring object list..."); + objList.getRenderer().setPageSize(20); + objList.getRenderer().setSpecializeObjects(true); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setCustomName("SciPublicationsList"); + - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(false); - logger.warn(String.format("JSP::orderBy = %s", request.getParameter("orderBy"))); - if((request.getParameter("orderBy") == null)) { - logger.warn("JSP::Setting list order to 'title'..."); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("title"); - } else { - if("title".equals(request.getParameter("orderBy"))) { - logger.warn("JSP::Setting list order to 'title'..."); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("title"); - } else if("authors".equals(request.getParameter("orderBy"))) { - logger.warn("JSP::Setting list order to 'authors'..."); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("authors asc"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("authors.givenname asc"); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("authors.link.editor asc"); - } else if("year".equals(request.getParameter("orderBy"))) { - logger.warn("JSP::Setting list order to 'yearOfPublication'..."); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("yearOfPublication asc"); - } else { - logger.warn("JSP::Unknown value for order, setting list order to 'title'..."); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("title"); - } - } - - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20); - ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true); - - - - - + + + - - + \ No newline at end of file