From 8a3bb4c295099d964ce68e07f9ec4027a0f0a97f Mon Sep 17 00:00:00 2001 From: quasi Date: Mon, 25 Nov 2013 07:39:20 +0000 Subject: [PATCH] Aktualisierung von Mandalay auf die aktuelle Version git-svn-id: https://svn.libreccm.org/ccm/trunk@2457 8810af33-2d31-482b-a856-94f89814c4df --- .../mandalay/css/screen/global/admin.css | 35 +- .../mandalay/css/screen/global/basic.css | 34 +- .../mandalay/images/icons/edit_link.png | Bin 1342 -> 3392 bytes .../mandalay/includes/bebop/bebopWidget.xsl | 10 + .../web/themes/mandalay/includes/cms.xsl | 1 + .../includes/cms/cmsContentViewMenu.xsl | 72 + .../mandalay/includes/cms/cmsImageBrowser.xsl | 65 +- .../includes/mandalay/layoutParser.xsl | 1338 +++++++++-------- .../includes/search/searchResults.xsl | 7 +- .../themes/mandalay/lang/de/SciDepartment.xml | 21 +- .../themes/mandalay/layout/content-center.xml | 1 + .../web/themes/mandalay/layout/navigation.xml | 21 +- .../mandalay/settings/SciDepartment.xml | 94 +- ccm-sci-bundle/web/themes/mandalay/start.xsl | 2 +- .../public-personal-profile.xsl | 10 + .../themes/mandalay/user/includes/types.xsl | 1 + .../types/SciDepartment/SciDepartment.xsl | 926 ++++++++---- .../SciDepartment/SciDepartmentSummaryTab.xsl | 504 ++++--- .../types/SciProject/SciProjectSummaryTab.xsl | 36 +- .../user/includes/types/sci-common.xsl | 34 + .../sci-common/GenericOrgaUnitTextTab.xsl | 62 + 21 files changed, 2017 insertions(+), 1257 deletions(-) create mode 100644 ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsContentViewMenu.xsl create mode 100644 ccm-sci-bundle/web/themes/mandalay/user/includes/types/sci-common.xsl create mode 100644 ccm-sci-bundle/web/themes/mandalay/user/includes/types/sci-common/GenericOrgaUnitTextTab.xsl diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css index e34c5a5dc..5b477acbb 100644 --- a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css +++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css @@ -25,6 +25,7 @@ /* Colors */ h1, h2, h3 { + margin: 0; color: #4a4a4a; } @@ -79,7 +80,7 @@ h2 { height:100%; width: 100%; min-height: 100%; - overflow: hidden; + ove rflow: hidden; position:absolute; } @@ -443,6 +444,7 @@ div#right div.columnHead .contenttitle { } div#right div.columnHead .contenttitle h1 { + margin: 0; border: none; font:inherit; color: inherit; @@ -463,6 +465,11 @@ div#right div.columnHead #contentviewmenu{ line-height: 30px; } +div#right div.columnHead #contentviewmenu .cmsContentViewMenu, +div#right div.columnHead #contentviewmenu .cmsGlobalNavigation { + float: left; +} + div#right div.columnHead #contentviewmenu a { color:white; } @@ -1294,7 +1301,7 @@ a:focus, a:hover, a:active, #left { position: static; float: left; - width: 14em; + m in-width: 14em; height: 100%; overflow: hidden; margin: 0.3em; @@ -1318,9 +1325,9 @@ a:focus, a:hover, a:active, background-color: #ffffff; } #content { - margin: 0; - border: 0; - padding: 0; + margin: 0 !important; + border: 0 !important; + padding: 0 !important; min-height: inherit; color: #4a4a4a; background-color: inherit; @@ -1418,3 +1425,21 @@ a#preview_link:visited{ div.bebopGridPanel{ margin-top: 15px; } + +.hint:hover:after { + position: absolute; + box-shadow: 0 0 5px #4a4a4a; + border-radius: 0.3em; + padding: 0.5em; + content: attr(content); + top: 1em; + right: 1em; + width: 30%; + background-image: inear-gradient(top, #eeeeee, #cccccc); + background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #eeeeee),color-stop(1, #cccccc)); + background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc); + background-image: -moz-linear-gradient(top, #eeeeee, #cccccc); + background-image: -ms-linear-gradient(top, #eeeeee, #cccccc); + background-image: -o-linear-gradient(top, #eeeeee, #cccccc); +} + diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css index adb5835ef..6c84a3122 100755 --- a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css +++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css @@ -436,7 +436,6 @@ body, /* Layout-Boxen */ - .marginRight { margin-right: 290px !important; } @@ -905,26 +904,28 @@ div.image .imageZoom:after { content: url('../../../images/icons/imageZoom.png'); } +div.image .imageGallery:after { + content: url('../../../images/icons/imageGallery.png'); +} + +div.image a:after { + position: absolute; + bottom: 0; + right: 0; + border: 1px solid rgba(255,255,255,0.75); + padding: 2px; + background-color: rgba(0, 0, 0, 0.5); +} + +div.image .imageZoom:after { + content: url('../../../images/icons/imageZoom.png'); +} + div.image .imageGallery:after { content: url('../../../images/icons/imageGallery.png'); } /* Images in CT Ende */ - - - - - - - - - - - - - - - /* Header Menu */ /* #quicksearch { @@ -1231,7 +1232,6 @@ div.image .imageGallery:after { display: none; } - /* Info */ #info { margin-left: 1.2em; diff --git a/ccm-sci-bundle/web/themes/mandalay/images/icons/edit_link.png b/ccm-sci-bundle/web/themes/mandalay/images/icons/edit_link.png index 15119a1ea90197cfa1e200d798229c441d9e0a08..514e5dd9807011f36607b4137a82ee11969a4720 100644 GIT binary patch literal 3392 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 diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopWidget.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopWidget.xsl index ecc602ce7..cc265cbce 100644 --- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopWidget.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopWidget.xsl @@ -199,4 +199,14 @@ + +
+ + + + + +
+ + diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms.xsl index 6c53d5f2d..a8370b5af 100644 --- a/ccm-sci-bundle/web/themes/mandalay/includes/cms.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms.xsl @@ -45,6 +45,7 @@ + diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsContentViewMenu.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsContentViewMenu.xsl new file mode 100644 index 000000000..665edd037 --- /dev/null +++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsContentViewMenu.xsl @@ -0,0 +1,72 @@ + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
  • + +
    • +     +
+ + + + + diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageBrowser.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageBrowser.xsl index e1e0d5339..be088d58e 100644 --- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageBrowser.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageBrowser.xsl @@ -63,28 +63,77 @@ - + - + + + + + + + + this.href=' + + '; + + + + + + + + + doubleClickProtect(this); + + + + + + + + + + + + + + + + - + + + + + + + + + + + + {$alt} + - + - --> - diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl index dc2d8f7d3..b93ffb111 100755 --- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl @@ -21,689 +21,743 @@ --> + xmlns:bebop="http://www.arsdigita.com/bebop/1.0" + xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" + xmlns:ui="http://www.arsdigita.com/ui/1.0" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + xmlns:docs="http://www.redhat.com/docs/1.0" + xmlns:nav="http://ccm.redhat.com/navigation" + xmlns:search="http://rhea.redhat.com/search/1.0" + xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" + xmlns:forum="http://www.arsdigita.com/forum/1.0" + xmlns:subsite="http://ccm.redhat.com/subsite/1.0" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + xmlns:ppp="http://www.arsdigita.com/PublicPersonalProfile/1.0" + xmlns:mandalay="http://mandalay.quasiweb.de" + xmlns:atoz="http://xmlns.redhat.com/atoz/1.0" + exclude-result-prefixes="xsl aplaws bebop cms docs forum mandalay nav portal ppp search subsite terms ui" + version="1.0"> - + - - - - - - + + + + + + - - - - - - - - + + + + + + + - cms - - - site - - - - - - + cms + + + site + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -