diff --git a/ccm-core/src/log4j2.xml b/ccm-core/src/log4j2.xml index 91c36c5b7..76c1f5342 100644 --- a/ccm-core/src/log4j2.xml +++ b/ccm-core/src/log4j2.xml @@ -45,7 +45,7 @@ - 43,1 40% + diff --git a/ccm-sci-bundle/CHANGE_LOG b/ccm-sci-bundle/CHANGE_LOG index 209c84f44..f9444858b 100644 --- a/ccm-sci-bundle/CHANGE_LOG +++ b/ccm-sci-bundle/CHANGE_LOG @@ -1,5 +1,9 @@ +2016-04-29 +========== +New version, now responsive and based on Foundry. + + 2011-09-15: =========== - Initial Release, based on ccm-ldn-aplaws which tailors CCM for use by UK Local Authorities. diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml index 6e2279073..6ae203d6f 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/project.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml @@ -7,7 +7,7 @@ It is NOT a production grade bundle! ======================================================================= --> - + + + + + + + + + + + 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); + + + + + + + \ No newline at end of file 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 new file mode 100644 index 000000000..58c5a588a --- /dev/null +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-memberslist.jsp @@ -0,0 +1,56 @@ + + + + + + + + + + + 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("surname", "surname"); + ((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().setSpecializeObjects(true); + ((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/themes/scicms-default/README.txt b/ccm-sci-bundle/web/themes/scicms-default/README.txt deleted file mode 100644 index 036856204..000000000 --- a/ccm-sci-bundle/web/themes/scicms-default/README.txt +++ /dev/null @@ -1,39 +0,0 @@ -This theme is structured as follows: - -Directories ------------ - -conf Configuration files (see README.txt in this directory for more - information - -fancybox Files for the Fancybox script (used to display images and image - galleries) - -font-awesome Files from the font-awesome icon font - -fonts Fonts used by the theme - -images Images used by the theme (see README.txt in this directory) - -js JavaScript part of the theme, including jQuery - -styles CSS files of the theme and the Less source files - -templates Templates defining the HTML structure of the output - -texts Localisable texts of the theme - -user Custom extensions for the Foundry theme engine for this theme - -Files in the root of the theme ------------------------------- - -start.xsl Entry point for the theme manager. Do not delete or alter this - file! - -admin-index.xsl -+ -ccm-admin-application-index.xsl |----Entry points for legacy configurations -content-center-index.xsl | -content-section-admin.xsl -+ - - diff --git a/ccm-sci-bundle/web/themes/scicms-default/conf/README.txt b/ccm-sci-bundle/web/themes/scicms-default/conf/README.txt deleted file mode 100644 index 1e2cf0d78..000000000 --- a/ccm-sci-bundle/web/themes/scicms-default/conf/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -The files in this directory control several aspects of the theme. The most -important ones are the templates.xml file and the css-files.xml file. - -The templates.xml file controls which templates from the templates directory -are used to create the HTML output for a page. - -The css-files.xml file controls which CSS files are used. diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.eot b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.eot new file mode 100644 index 000000000..3c6f748ba Binary files /dev/null and b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.eot differ diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.svg b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.svg new file mode 100644 index 000000000..91568cf4d --- /dev/null +++ b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.svg @@ -0,0 +1,1993 @@ + + + + +Created by FontForge 20110222 at Tue Aug 20 01:56:27 2013 + By Orthosie Webhosting +Typeface and data copyright 1996 Microsoft Corporation. All Rights Reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.ttf b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.ttf new file mode 100644 index 000000000..eea7da8ad Binary files /dev/null and b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.ttf differ diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.woff b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.woff new file mode 100644 index 000000000..3262213d9 Binary files /dev/null and b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBold-webfont.woff differ diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.eot b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.eot new file mode 100644 index 000000000..f3afc6045 Binary files /dev/null and b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.eot differ diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.svg b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.svg new file mode 100644 index 000000000..b1295b989 --- /dev/null +++ b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.svg @@ -0,0 +1,2060 @@ + + + + +Created by FontForge 20110222 at Tue Aug 20 01:57:00 2013 + By Orthosie Webhosting +Typeface and data copyright 1996 Microsoft Corporation. All Rights Reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.ttf b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.ttf new file mode 100644 index 000000000..7bd75b929 Binary files /dev/null and b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.ttf differ diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.woff b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.woff new file mode 100644 index 000000000..5df3aaeea Binary files /dev/null and b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaBoldItalic-webfont.woff differ diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.eot b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.eot new file mode 100644 index 000000000..214964739 Binary files /dev/null and b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.eot differ diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.svg b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.svg new file mode 100644 index 000000000..4b67bdee9 --- /dev/null +++ b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.svg @@ -0,0 +1,2047 @@ + + + + +Created by FontForge 20110222 at Tue Aug 20 01:56:40 2013 + By Orthosie Webhosting +Typeface and data copyright 1996 Microsoft Corporation. All Rights Reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.ttf b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.ttf new file mode 100644 index 000000000..7f7c57cd5 Binary files /dev/null and b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.ttf differ diff --git a/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.woff b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.woff new file mode 100644 index 000000000..33e92e1c9 Binary files /dev/null and b/ccm-sci-bundle/web/themes/scicms-default/fonts/GeorgiaItalic-webfont.woff differ diff --git a/ccm-sci-bundle/web/themes/scicms-default/styles/README.txt b/ccm-sci-bundle/web/themes/scicms-default/styles/README.txt index 2797d2c4b..9281d401a 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/styles/README.txt +++ b/ccm-sci-bundle/web/themes/scicms-default/styles/README.txt @@ -4,9 +4,8 @@ files are also included. If you want to customise the stylesheet we strongly recommanded to use Less. -To customise to styles make a copy of the Less file(s) you want to customize -and create a new configuration file pointing to your files in conf (see -README.txt in conf). +to customise to styles make a copy of the Less file(s) you want to customize +and create a new configuration file pointing to your files in conf. To make editing of the Less file(s) easier this theme also includes the Less compiler in the development mode. For