diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css index 1ead98f7c..e7983e7ef 100644 --- a/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css +++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css @@ -73,6 +73,10 @@ h2 { border: none; } +table.htmlarea td.toolbarElement { + padding: 0px; +} + .tableCell, span.key, span.value { display: table-cell; width: auto; @@ -95,8 +99,8 @@ h2 { } #cmsPage .headerHeight { - height: 100px; - top: 100px; + height: 70px; + top: 70px; } /*-----CMS Header-----*/ @@ -105,17 +109,17 @@ h2 { top: auto !important; padding-bottom: 35px; color: #ffffff; - background-color:#75051d; - background-image: linear-gradient(top, #75051d 25%, #2f020c 75%); - background-image: -o-linear-gradient(top, #75051d 25%, #2f020c 75%); - background-image: -ie-linear-gradient(top, #75051d 25%, #2f020c 75%); - background-image: -moz-linear-gradient(top, #75051d 25%, #2f020c 75%); - background-image: -webkit-linear-gradient(top, #75051d 25%, #2f020c 75%); + background-color:#56a1bd; + background-image: linear-gradient(top, #56a1bd 5%, #024C68 95%); + background-image: -o-linear-gradient(top, #56a1bd 5%, #024C68 95%); + background-image: -ie-linear-gradient(top, #56a1bd 5%, #024C68 95%); + background-image: -moz-linear-gradient(top, #56a1bd 5%, #024C68 95%); + background-image: -webkit-linear-gradient(top, #56a1bd 5%, #024C68 95%); /*Compatibility IE- es fuktioniert noch nicht ganz*/ - filter: progid:DXImageTransform.Microsoft.gradient(enabled='true',gradientType='0',startColorstr='#75051d', - endColorstr='#2f020c'); /* IE6 & IE7 */ - -ms-filter: progid:DXImageTransform.Microsoft.gradient(enabled='true',gradientType='0',startColorstr='#75051d', - endColorstr='#2f020c'); /* IE8 */ + filter: progid:DXImageTransform.Microsoft.gradient(enabled='true',gradientType='0',startColorstr='#56a1bd', + endColorstr='#024C68'); /* IE6 & IE7 */ + -ms-filter: progid:DXImageTransform.Microsoft.gradient(enabled='true',gradientType='0',startColorstr='#56a1bd', + endColorstr='#024C68'); /* IE8 */ font-size: 0.8em; } @@ -188,7 +192,7 @@ span.bebopTab { border-top-right-radius: 0.5em; padding: 0.4em; white-space: nowrap; - background-color: #2c2b2d; + background-color: #4a4a4a; transition: all 0.5s ease; -o-transition: all 0.5s ease; -ie-transition: all 0.5s ease; @@ -438,7 +442,7 @@ div#right{ div#right div.columnHead { font-weight: bold; - background-color: #75051d; + background-color: #0776a0; } div#right div.columnContent{ @@ -503,7 +507,7 @@ a, a:visited { a:hover { text-decoration: none; - color: #a75b3b; + color: #FF9200; } a img { @@ -539,7 +543,7 @@ table * table ,form table { } table thead tr th { - padding-left: 0.9em; + padding-lef t: 0.9em; color: #999999; text-align: left; background-color: #eeeeee; @@ -671,7 +675,7 @@ div.actionLink span { margin-right: 1.5em; border-radius: 0.3em; padding: 0.3em 2em; - background-color: #75051d; + background-color: #0776A0; box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px 10px rgba(0,0,0,0.3); } @@ -682,7 +686,7 @@ div.actionLink a { } div.actionLink span:hover { - background-color: #cc0033 ; + background-color: #07698e ; } div.actionLink span:active { @@ -1075,7 +1079,7 @@ div.cmsSummarySection div.cmsSummaryHeading { } div.cmsSummarySection .cmsSummaryHeading { - color: #75051d; + color: #0776A0; } div.cmsSummaryBody { @@ -1084,6 +1088,14 @@ div.cmsSummaryBody { border-bottom: 1px solid rgba(102, 102, 102, 0.5); } +div.cmsSummaryBody ul.categoryList li{ + padding-left: 30px; +} + +div.cmsSummarySection ul { + text-indent: -2.5em; +} + span.cmsCurrentRevision { font-style:italic; font-weight:bold; @@ -1221,7 +1233,7 @@ div#cmsFooter{ width: 100%; height: 30px; color: #a4a4a4; - background-color: #1c1b1d; + background-color: #29272a; font-size: 0.8em; } @@ -1365,6 +1377,24 @@ input#draft_search:active { background-color: #ffffff; } +#content form fieldset { + border: none; + margin: 0.5em 0em 1em 0.3em; + border-top: 1px dotted #0776A0; + border-bottom: 1px dotted #0776A0; + padding: 0.3em 0em; + color: #0776A0; + font-weight: bold; +} + +#content span.optionGroup input[value="externalLink"]:checked ~ fieldset[class="internalLink"]{ + display:none; +} + +#content span.optionGroup input[value="internalLink"]:checked ~ fieldset[class="externalLink"]{ + display:none; +} + #content form select { padding: 0.25em; min-width: 11.4em; @@ -1383,7 +1413,7 @@ input#draft_search:active { border: none; padding: 0 2em; color: #ffffff; - background-color: #75051d; + background-color: #0776a0; background-image: none; height: 1.8em; box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px @@ -1399,7 +1429,7 @@ input#file_upload{ box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px 10px rgba(0,0,0,0.3); } #content form input[type="submit"]:hover { - background-color: #cc0033 ; + background-color: #07698e ; background-image: none; } @@ -1452,3 +1482,6 @@ div.bebopGridPanel{ background-image: -o-linear-gradient(top, #eeeeee, #cccccc); } +ul.bebopTree li a[type="control"] { + padding: 5px; +} \ No newline at end of file diff --git a/ccm-sci-bundle/web/themes/mandalay/images/scientificcms_logo.png b/ccm-sci-bundle/web/themes/mandalay/images/scientificcms_logo.png new file mode 100644 index 000000000..e3acc9efb Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/images/scientificcms_logo.png differ diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPage.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPage.xsl index a6b766803..9df7d7311 100644 --- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPage.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPage.xsl @@ -58,7 +58,7 @@ -

+

diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/navigation/breadcrumbs.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/navigation/breadcrumbs.xsl index 64f21fc0f..8879cdeb5 100755 --- a/ccm-sci-bundle/web/themes/mandalay/includes/navigation/breadcrumbs.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/navigation/breadcrumbs.xsl @@ -31,471 +31,471 @@ - + - - + + - - - - - - - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ... + + + + + + + + + + ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - ... - - - - - - - - - - ... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/Address.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/Address.xsl index 10e287664..dfb08f015 100755 --- a/ccm-sci-bundle/web/themes/mandalay/includes/types/Address.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/Address.xsl @@ -21,346 +21,368 @@ --> + xmlns:mandalay="http://mandalay.quasiweb.de" + exclude-result-prefixes="xsl bebop cms" + version="1.0"> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - -
- -
- - + +
+ +
+ + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + -
- - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - dynamic - - - -
- - /ccm/cms-service/stream/image/?image_id=&maxWidth=150&maxHeight=100 - - - - - +
+ + + + +
- - +
+ - - - - - - - - dynamic - - - - - - - dynamic - - + + + - -
- - - - - - - - - ... - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dynamic + + + +
+ + /ccm/cms-service/stream/image/?image_id=&maxWidth=150&maxHeight=100 + + + + + + + + + +
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /redirect/?oid= - - - - - - dynamic - - - - - - - - - - - - - - /redirect/?oid= - - - - - - dynamic - - - - - - - dynamic - - - -
- - - - - - - - ... - - - - + + + + + + + + + + dynamic - - - - - - - - - + + + + + + dynamic + + + + +
+ + + + + + + + + ... + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /redirect/?oid= + + + + + + + + dynamic + + + + + + + + + + + + + + + /redirect/?oid= + + + + + + + + dynamic + + + + + + + dynamic + + + +
+ + + + + + + + ... + + + + + + + + + + + + + + + + + + diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/Article.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/Article.xsl index 102960d1a..ca354053f 100755 --- a/ccm-sci-bundle/web/themes/mandalay/includes/types/Article.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/Article.xsl @@ -33,327 +33,347 @@ Article content type + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + xmlns:nav="http://ccm.redhat.com/navigation" + xmlns:mandalay="http://mandalay.quasiweb.de" + exclude-result-prefixes="xsl cms nav mandalay" + version="1.0"> - - - - - - - - - - + + + + + + + + + + - -
- -
- - + +
+ +
+ + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - -
- + + + +
+ +
+
+
-
- -
- + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - dynamic - - + + + + + + + + + + + dynamic + + -
- - /ccm/cms-service/stream/image/?image_id=&maxWidth=150&maxHeight=100 - - - - - -
- - - - - - - - - - - dynamic - - - - - - - dynamic - - - - -
- - - - - - - - - ... - - - - - - - - - - - - - - +
+ + /ccm/cms-service/stream/image/?image_id=&maxWidth=150&maxHeight=100 + + + + + + + + + +
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /redirect/?oid= - - - - - - dynamic - - - - - - - - - - - - - - - /redirect/?oid= - - - - - - dynamic - - - - - - - dynamic - - - -
- - - - - - - - ... - - - - + + + + + + + + + + dynamic - - - - - - - - - + + + + + + dynamic + + + + +
+ + + + + + + + + ... + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /redirect/?oid= + + + + + + + + dynamic + + + + + + + + + + + + + + + + /redirect/?oid= + + + + + + + + dynamic + + + + + + + dynamic + + + +
+ + + + + + + + ... + + + + + + + + + + + + + + + + + + diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/MultiPartArticle.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/MultiPartArticle.xsl index aa4316e1d..5211c31a1 100755 --- a/ccm-sci-bundle/web/themes/mandalay/includes/types/MultiPartArticle.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/MultiPartArticle.xsl @@ -32,7 +32,8 @@ - + @@ -58,7 +59,8 @@ - +
@@ -113,7 +115,9 @@ - + @@ -198,7 +202,9 @@ - + @@ -269,11 +275,16 @@ - - - - - + + + + +
@@ -370,7 +381,9 @@ - + @@ -482,7 +495,9 @@ - + diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml b/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml index aaed447c3..80979905a 100644 --- a/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml +++ b/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml @@ -34,7 +34,7 @@