diff --git a/ccm-sci-bundle/bundles/standard/cfg/integration.properties b/ccm-sci-bundle/bundles/standard/cfg/integration.properties
index 7fb571f5b..97102f7ed 100644
--- a/ccm-sci-bundle/bundles/standard/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/standard/cfg/integration.properties
@@ -140,6 +140,17 @@ com.arsdigita.cms.use_streamlined_creation=true
com.arsdigita.cms.contenttypes.generic_contact.contact_entry_keys=email,phoneOffice,phoneMobile,phonePrivate,fax,building,office,vistitingHours
+# ccm-cms-publicpersonalprofile
+# ##############################################################################
+com.arsdigita.cms.publicpersonalprofile.publications.groups=monographs\:com.arsdigita.cms.contenttypes.Monograph;collectedVolumes\:com.arsdigita.cms.contenttypes.CollectedVolume;collectedVolumeArticles\:com.arsdigita.cms.contenttypes.ArticleInCollectedVolume;journalArticlesReviewed\:com.arsdigita.cms.contenttypes.ArticleInJournal_reviewed;journalArticles\:com.arsdigita.cms.contenttypes.ArticleInJournal_notreviewed
+#com.arsdigita.cms.publicpersonalprofile.publications.groupSplit=20
+#com.arsdigita.cms.publicpersonlprofile.publications.groupSplit=20
+com.arsdigita.cms.publicpersonlprofile.publications.groupSplit=1
+com.arsdigita.cms.publicpersonlprofile.publications.pageSize=100
+com.arsdigita.cms.publicpersonalprofile.projects.groupSplit=1
+com.arsdigita.cms.publicPersonalProfile.person_type=com.arsdigita.cms.contenttypes.SciMember
+
+
# ccm-cms-types-event parameters
# ##############################################################################
com.arsdigita.cms.contenttypes.event.hide_cost=true
@@ -151,24 +162,12 @@ com.arsdigita.cms.contenttypes.event.use_html_date_description=false
com.arsdigita.cms.contenttypes.event.start_year=2015
com.arsdigita.cms.contenttypes.event.end_year_delta=5
-
# ccm-cms-types-newsitem parameters
# ##############################################################################
com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
com.arsdigita.cms.contenttypes.newsitem.start_year=2015
com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
-# ccm-cms-publicpersonalprofile
-# ##############################################################################
-com.arsdigita.cms.publicpersonalprofile.publications.groups=monographs\:com.arsdigita.cms.contenttypes.Monograph;collectedVolumes\:com.arsdigita.cms.contenttypes.CollectedVolume;collectedVolumeArticles\:com.arsdigita.cms.contenttypes.ArticleInCollectedVolume;journalArticlesReviewed\:com.arsdigita.cms.contenttypes.ArticleInJournal_reviewed;journalArticles\:com.arsdigita.cms.contenttypes.ArticleInJournal_notreviewed
-#com.arsdigita.cms.publicpersonalprofile.publications.groupSplit=20
-#com.arsdigita.cms.publicpersonlprofile.publications.groupSplit=20
-com.arsdigita.cms.publicpersonlprofile.publications.groupSplit=1
-com.arsdigita.cms.publicpersonlprofile.publications.pageSize=100
-com.arsdigita.cms.publicpersonalprofile.projects.groupSplit=1
-com.arsdigita.cms.publicPersonalProfile.person_type=com.arsdigita.cms.contenttypes.SciMember
-
-
# AtoZ configuration parameters
# ##############################################################################
com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
diff --git a/ccm-sci-bundle/bundles/standard/cfg/web.xml b/ccm-sci-bundle/bundles/standard/cfg/web.xml
index 47a3b9b24..589c87cbb 100644
--- a/ccm-sci-bundle/bundles/standard/cfg/web.xml
+++ b/ccm-sci-bundle/bundles/standard/cfg/web.xml
@@ -14,7 +14,7 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- Scientific CMS (standard bundle)
+ Scientific CMS (standard bundle)
Content and Collaboration Management for Scientific Institutions
+
+
+
+
+
+
+
+
+
+ long age = Navigation.getConfig().getIndexPageCacheLifetime();
+ if (age == 0) {
+ DispatcherHelper.cacheDisable(response);
+ } else {
+ DispatcherHelper.cacheForWorld(response, (int)age);
+ }
+
+
+
+
+
+
+
+ // Menu for mobile responsive version
+
+
+ ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+
+
+
+
+
+
+ defaultItemPage.setClassAttr("departmentsPage");
+
+ ((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.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);
+ ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+
+ ((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("departmentShortDescription");
+ ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("contacts.contact_type");
+ // ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("contacts");
+ // ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("persons");
+ ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "imageAttachments.caption");
+ ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "imageAttachments.image.id");
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-memberslist.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-memberslist.jsp
index 58c5a588a..d0fa5bd0f 100644
--- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-memberslist.jsp
+++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-memberslist.jsp
@@ -9,6 +9,7 @@
+
@@ -29,28 +30,30 @@
-
- ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
-
-
-
+ classname="com.arsdigita.navigation.ui.category.Hierarchy" />
+
+ ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+
- ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).addTextFilter("surname", "surname");
- ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).setCustomName("memberList");
+ ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).addTextFilter("surname", "surname");
+ //CompareFilter statusFilter = ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).addCompareFilter(
+ // "memberStatus", "status", false, false, false);
+ //statusFilter.addOption("memberActive", "active");
+ //statusFilter.addOption("memberFormer", "former");
+ ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).setCustomName("memberList");
((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.GenericPerson");
- ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20);
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(100);
((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
- ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("surname");
- ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("givenname");
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("surname");
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("givenname");
-
+
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-projects-customizable.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-projects-customizable.jsp
new file mode 100644
index 000000000..308db8829
--- /dev/null
+++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-projects-customizable.jsp
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+ long age = Navigation.getConfig().getIndexPageCacheLifetime();
+ if (age == 0) {
+ DispatcherHelper.cacheDisable(response);
+ } else {
+ DispatcherHelper.cacheForWorld(response, (int)age);
+ }
+
+
+
+
+
+
+
+
+
+ ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+
+
+
+
+ ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).addTextFilter("title", "title");
+ CategoryFilter rfFilter = ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).addCategoryFilter("researchfield", "Forschungsfelder");
+ rfFilter.setMultiple(false);
+ ((com.arsdigita.navigation.ui.object.CustomizableObjectList) itemList).setCustomName("projectList");
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject");
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(50);
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("projectBegin DESC");
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("projectEnd DESC");
+ ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("title ASC");
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-projects.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-projects.jsp
new file mode 100644
index 000000000..f2fdf3985
--- /dev/null
+++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-projects.jsp
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+ long age = Navigation.getConfig().getIndexPageCacheLifetime();
+ if (age == 0) {
+ DispatcherHelper.cacheDisable(response);
+ } else {
+ DispatcherHelper.cacheForWorld(response, (int)age);
+ }
+
+
+
+
+
+
+
+
+
+ ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publications.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publications.jsp
index 4593a5a2b..a4243e016 100644
--- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publications.jsp
+++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publications.jsp
@@ -3,21 +3,22 @@
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);
- }
+ long age = Navigation.getConfig().getIndexPageCacheLifetime();
+ if (age == 0) {
+ DispatcherHelper.cacheDisable(response);
+ } else {
+ DispatcherHelper.cacheForWorld(response, (int)age);
+ }
+
+
+ ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+
+
-
- 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("authorsStr", "authorsStr");
- 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", "authorsStr asc");
- objList.getDefinition().addOrder(objList.getOrder(request.getParameter("sort")));
+
+ 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(true);
+ objList.addTextFilter("title", "title");
+ objList.addSelectFilter("yearOfPublication", "yearOfPublication", true, true, true, true);
+ objList.addTextFilter("authorsStr", "authorsStr");
- objList.getRenderer().setPageSize(20);
- objList.getRenderer().setSpecializeObjects(true);
+ //CategoryFilter catFilter = objList.addCategoryFilter("keywords", "Publikationen Schlagworte");
+ //catFilter.setSeparator(";");
-
+ objList.addSortField("yearAsc", "yearOfPublication asc");
+ objList.addSortField("yearDesc", "yearOfPublication desc");
+ objList.addSortField("authors", "authorsStr asc");
+ objList.addSortField("title", "title asc");
+ objList.getDefinition().addOrder(objList.getOrder(request.getParameter("sort")));
+
+ objList.getRenderer().setPageSize(20);
+ objList.getRenderer().setSpecializeObjects(true);
+
+
+
+
+
+
+
+ ((com.arsdigita.cms.scipublications.ui.PublicationExportLinks)publicationExportLinks).setObjList(objList);
+
+
-
-
-
-
- ((com.arsdigita.cms.scipublications.ui.PublicationExportLinks)publicationExportLinks).setObjList(objList);
-
-
-