From 2a76ba565efaf684edcd848cd327cc58fc73a282 Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 17 Mar 2016 09:08:15 +0000 Subject: [PATCH] Upgraded scicms-default theme in the ccm-sci-bundle git-svn-id: https://svn.libreccm.org/ccm/trunk@3934 8810af33-2d31-482b-a856-94f89814c4df --- ccm-sci-bundle/bundles/devel/cfg/project.xml | 2 +- .../themes/scicms-default/conf/css-files.xml | 10 +- .../themes/scicms-default/styles/aplaws.css | 274 +++++++------- .../themes/scicms-default/styles/aplaws.less | 9 +- .../scicms-default/styles/libre-blue-flex.css | 262 ++++++------- .../styles/libre-blue-flex.less | 5 + .../themes/scicms-default/styles/libreccm.css | 344 +++++++++--------- .../scicms-default/styles/libreccm.less | 15 +- .../themes/scicms-default/styles/librecms.css | 278 +++++++------- .../scicms-default/styles/librecms.less | 7 +- .../themes/scicms-default/styles/scicms.css | 278 +++++++------- .../themes/scicms-default/styles/scicms.less | 7 +- .../themes/scicms-default/styles/styles.less | 280 +++++++++----- .../content-items/address-detail.xml | 6 +- .../templates/content-items/agenda-detail.xml | 4 +- .../content-items/article-detail.xml | 9 +- .../content-items/bookmark-detail.xml | 6 +- .../content-items/contact-detail.xml | 4 +- .../content-items/decisiontree-detail.xml | 6 +- .../content-items/detail-default.xml | 16 +- .../templates/content-items/event-detail.xml | 6 +- .../content-items/formitem-detail.xml | 27 +- .../templates/content-items/fsi-detail.xml | 6 +- .../templates/content-items/image-detail.xml | 6 +- .../templates/content-items/job-detail.xml | 4 +- .../content-items/journal-detail.xml | 6 +- .../content-items/legalnotice-detail.xml | 4 +- .../content-items/minutes-detail.xml | 4 +- .../templates/content-items/mpa-detail.xml | 6 +- .../templates/content-items/news-detail.xml | 6 +- .../templates/content-items/person-detail.xml | 6 +- .../content-items/pressrelease-detail.xml | 6 +- .../content-items/scidepartment-detail.xml | 4 +- .../content-items/sciinstitute-detail.xml | 4 +- .../content-items/sciproject-detail.xml | 4 +- .../content-items/sciproject-list.xml | 6 +- .../content-items/scipublications-detail.xml | 8 +- .../templates/content-items/series-detail.xml | 6 +- .../content-items/service-detail.xml | 4 +- .../content-items/simpleaddress-detail.xml | 6 +- .../content-items/siteproxy-detail.xml | 14 +- .../templates/default-layout.xml | 2 +- .../scicms-default/templates/navigation.xml | 6 +- 43 files changed, 1100 insertions(+), 873 deletions(-) diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml index 4ae2a3ba1..301310aa2 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/project.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml @@ -9,7 +9,7 @@ name="ScientificCMS" prettyName="Scientific CMS" version="2.3.0" - release="devel-SNAPSHOT-r3436" + release="devel-SNAPSHOT-r3893" webxml="sci-web.xml" portletxml="sci-portlet.xml" webapp="ROOT" diff --git a/ccm-sci-bundle/web/themes/scicms-default/conf/css-files.xml b/ccm-sci-bundle/web/themes/scicms-default/conf/css-files.xml index de914a848..f856be182 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/conf/css-files.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/conf/css-files.xml @@ -54,7 +54,7 @@ fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.5 fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7 font-awesome/css/font-awesome.min.css - libre-blue-flex + scicms @@ -79,7 +79,7 @@ fancybox/helpers/jquery.fancybox-thumbs.css?v=1.0.7 font-awesome/css/font-awesome.min.css portal.css - libre-blue-flex + scicms - - + +
+ -
- -
- \ No newline at end of file +
+ +
+ +
+ + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/event-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/event-detail.xml index 103513eac..a0a09a57f 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/event-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/event-detail.xml @@ -3,7 +3,7 @@ ]> -
+
@@ -109,6 +109,6 @@ -
+
- \ No newline at end of file + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/formitem-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/formitem-detail.xml index 525d7ed88..8c31e5cd7 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/formitem-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/formitem-detail.xml @@ -1,20 +1,23 @@ -
+
+
-
- - - - - - - +
+ - + -
- \ No newline at end of file + + + + + + +
+ +
+ diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/fsi-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/fsi-detail.xml index fdec1a25b..0d7f0634d 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/fsi-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/fsi-detail.xml @@ -3,7 +3,7 @@ ]> -
+
@@ -30,6 +30,6 @@ -
+
- \ No newline at end of file + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/image-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/image-detail.xml index 8befb3b13..1cbe37090 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/image-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/image-detail.xml @@ -5,7 +5,7 @@ ]> -
+
@@ -127,5 +127,5 @@ -
- \ No newline at end of file +
+ diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/job-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/job-detail.xml index 4190244ff..3d8ae0404 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/job-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/job-detail.xml @@ -5,7 +5,7 @@ ]> -
+
@@ -98,5 +98,5 @@ -
+
diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/journal-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/journal-detail.xml index fd1b39cf9..1f9b075e0 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/journal-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/journal-detail.xml @@ -1,7 +1,7 @@ -
+
@@ -53,5 +53,5 @@ -
-
\ No newline at end of file + + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/legalnotice-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/legalnotice-detail.xml index fe3f0b7e1..ad0966436 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/legalnotice-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/legalnotice-detail.xml @@ -4,7 +4,7 @@ ]> -
+
@@ -24,5 +24,5 @@ -
+
diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/minutes-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/minutes-detail.xml index 4e536c2e2..7fc3ec148 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/minutes-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/minutes-detail.xml @@ -5,7 +5,7 @@ ]> -
+
@@ -59,5 +59,5 @@ -
+
diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/mpa-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/mpa-detail.xml index 92388df63..979cae18d 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/mpa-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/mpa-detail.xml @@ -1,7 +1,7 @@ -
+
@@ -61,6 +61,6 @@ -
+
- \ No newline at end of file + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/news-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/news-detail.xml index b5436873c..c57969757 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/news-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/news-detail.xml @@ -3,7 +3,7 @@ ]> -
+
@@ -36,6 +36,6 @@ -
+
- \ No newline at end of file + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/person-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/person-detail.xml index f0bf8875e..4874b86e8 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/person-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/person-detail.xml @@ -1,7 +1,7 @@ -
+
@@ -110,5 +110,5 @@ -
-
\ No newline at end of file + + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/pressrelease-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/pressrelease-detail.xml index bd4c2e377..4998932ca 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/pressrelease-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/pressrelease-detail.xml @@ -1,7 +1,7 @@ -
+
@@ -32,6 +32,6 @@ -
+
- \ No newline at end of file + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/scidepartment-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/scidepartment-detail.xml index bede7c014..bf9ccc6fb 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/scidepartment-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/scidepartment-detail.xml @@ -3,7 +3,7 @@ ]> -
+
@@ -126,5 +126,5 @@ -
+
diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciinstitute-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciinstitute-detail.xml index d18262f94..7460949d1 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciinstitute-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciinstitute-detail.xml @@ -3,7 +3,7 @@ ]> -
+
@@ -154,5 +154,5 @@ -
+
diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciproject-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciproject-detail.xml index 16446d9ab..9d1ad9cb8 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciproject-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciproject-detail.xml @@ -3,7 +3,7 @@ ]> -
+
@@ -219,6 +219,6 @@ -
+
diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciproject-list.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciproject-list.xml index 0a07fbefa..9e562654d 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciproject-list.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/sciproject-list.xml @@ -46,12 +46,12 @@
- + - + - +
diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/scipublications-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/scipublications-detail.xml index f0ad69640..b93a244e8 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/scipublications-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/scipublications-detail.xml @@ -1,10 +1,10 @@ - + ]> -
+
@@ -379,6 +379,6 @@ -
+
-
\ No newline at end of file + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/series-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/series-detail.xml index 8c369138f..b9954a6b4 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/series-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/series-detail.xml @@ -1,6 +1,6 @@ -
+
@@ -35,5 +35,5 @@
-
-
\ No newline at end of file + + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/service-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/service-detail.xml index 43f90787a..c64754a83 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/service-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/service-detail.xml @@ -4,7 +4,7 @@ ]> -
+
@@ -54,5 +54,5 @@ -
+
diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/simpleaddress-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/simpleaddress-detail.xml index c50ed5a2d..1c44b1b38 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/simpleaddress-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/simpleaddress-detail.xml @@ -2,7 +2,7 @@ ]> -
+
@@ -68,5 +68,5 @@
     
         
         
-    
-
\ No newline at end of file + + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/siteproxy-detail.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/siteproxy-detail.xml index 95e9a4cb9..5bec5d32b 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/siteproxy-detail.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/content-items/siteproxy-detail.xml @@ -1,9 +1,11 @@ + +
+ - - -
- -
- \ No newline at end of file +
+ +
+
+
diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/default-layout.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/default-layout.xml index 4764fd503..52f15d3ff 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/default-layout.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/default-layout.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/ccm-sci-bundle/web/themes/scicms-default/templates/navigation.xml b/ccm-sci-bundle/web/themes/scicms-default/templates/navigation.xml index 924373f98..7793d7a69 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/templates/navigation.xml +++ b/ccm-sci-bundle/web/themes/scicms-default/templates/navigation.xml @@ -58,8 +58,8 @@ -