LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Neueste Version von Mandalay mit weiteren Verbesserungen im ContentCenter 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2307 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2013-08-16 18:55:13 +00:00
parent 860088e3c0
commit ed9b7d50e3
42 changed files with 1000 additions and 943 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1229
ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
View File

File diff suppressed because it is too large Load Diff

34
ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
View File

@ -41,6 +41,7 @@
* { * {
margin: 0em; margin: 0em;
padding: 0em; padding: 0em;
word-wrap: break-word;
} }
html { html {
@ -52,6 +53,17 @@ body {
font-family: Verdana, Helvetica, Arial, sans-serif; font-family: Verdana, Helvetica, Arial, sans-serif;
color: #4a4a4a; color: #4a4a4a;
background-color: #ffffff; background-color: #ffffff;
text-align: justify;
hyphens: auto;
-o-hyphens: auto;
-ie-hyphens: auto;
-moz-hyphens: auto;
-webkit-hyphens: auto;
}
.contentWidth {
width: 1000px !important;
margin: 0 auto !important;
} }
#pageWrap { #pageWrap {
@ -143,26 +155,12 @@ p + p {
margin-top: 1em; margin-top: 1em;
} }
/* Tabellen */
table {
}
th {
}
td {
}
/* Listen-Elemente */ /* Listen-Elemente */
#content ul, #content ul,
#content ol { #content ol {
margin: 1em 0em; margin: 1em 0em;
margin-left: 2.5em ; margin-left: 2.5em ;
/* color: #75051d !important; */
}
#content li {
/* color: #75051d; */
} }
#itemList ul, #itemList ul,
@ -1008,6 +1006,7 @@ div.endFloat {
/*--------Images in CT---------------*/ /*--------Images in CT---------------*/
#content div.image { #content div.image {
position: relative;
float: right; float: right;
margin: 2em 1em 0.75em 1.25em; margin: 2em 1em 0.75em 1.25em;
} }
@ -1039,7 +1038,6 @@ div.image.right {
float: right !important; float: right !important;
} }
/*-------CT NewsItem--------*/ /*-------CT NewsItem--------*/
#content #newsDate { #content #newsDate {
@ -1100,12 +1098,14 @@ div.image.right {
/*-------Key / Value------------------*/ /*-------Key / Value------------------*/
.key { .key {
display: table-cell;
width: 12em; width: 12em;
padding-right: 0.8em; padding-right: 0.8em;
font-weight: bold; font-weight: bold;
} }
.value { .value {
display: table-cell;
font-weight: normal; font-weight: normal;
} }
@ -1369,8 +1369,8 @@ margin-top: 1em;
} }
#content form.multiline input[type="submit"] { #content form.multiline input[type="submit"] {
clear: both; clear: both;
margin-left : 12.7em; margin-left : 12.7em;
} }
/*---Profile-----*/ /*---Profile-----*/

2
ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl
View File

@ -126,7 +126,7 @@
<!-- DE Ein Text-Label --> <!-- DE Ein Text-Label -->
<!-- EN A text label --> <!-- EN A text label -->
<xsl:template match="bebop:label"> <xsl:template match="bebop:label">
<xsl:call-template name="mandalay:bebopLabelText"> <xsl:call-template name="mandalay:bebopLabelText">
<xsl:with-param name="text"> <xsl:with-param name="text">
<xsl:value-of select="."/> <xsl:value-of select="."/>
</xsl:with-param> </xsl:with-param>

3
ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTabbedPane.xsl
View File

@ -45,6 +45,9 @@
<xsl:param name="layoutTree" select="."/> <xsl:param name="layoutTree" select="."/>
<div id="bebopTabbedPane"> <div id="bebopTabbedPane">
<xsl:call-template name="mandalay:setIdAndClass">
<xsl:with-param name="currentLayoutNode" select="$layoutTree"/>
</xsl:call-template>
<xsl:apply-templates select="bebop:tabStrip"> <xsl:apply-templates select="bebop:tabStrip">
<xsl:with-param name="setTabPaneMode"> <xsl:with-param name="setTabPaneMode">
<!-- DE Hole alle benötigten Einstellungen--> <!-- DE Hole alle benötigten Einstellungen-->

4
ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageDisplay.xsl
View File

@ -79,12 +79,12 @@
<xsl:if test="@width"> <xsl:if test="@width">
<xsl:attribute name="width"> <xsl:attribute name="width">
<xsl:value-of select="@width"/> <xsl:value-of select="@width"/>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="@height"> <xsl:if test="@height">
<xsl:attribute name="height"> <xsl:attribute name="height">
<xsl:value-of select="@height"/> <xsl:value-of select="@height"/>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<div class="cmsImageInfoOverlay"> <div class="cmsImageInfoOverlay">
<xsl:if test="$setImageName = 'true'"> <xsl:if test="$setImageName = 'true'">

292
ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsSummary.xsl
View File

@ -49,40 +49,52 @@
<xsl:with-param name="id" select="'summary/itemSummary/header'"/> <xsl:with-param name="id" select="'summary/itemSummary/header'"/>
</xsl:call-template> </xsl:call-template>
</h3> </h3>
<div class="cmsSummaryBody"> <div class="cmsSummaryBody table">
<span class="key"> <div class="tableRow">
<xsl:call-template name="mandalay:getStaticText"> <span class="key">
<xsl:with-param name="module" select="'cms'"/> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="id" select="'summary/itemSummary/type'"/> <xsl:with-param name="module" select="'cms'"/>
</xsl:call-template> <xsl:with-param name="id" select="'summary/itemSummary/type'"/>
</span> </xsl:call-template>
<xsl:value-of select="@objectType"/> </span>
<br /> <span class="value">
<span class="key"> <xsl:value-of select="@objectType"/>
<xsl:call-template name="mandalay:getStaticText"> </span>
<xsl:with-param name="module" select="'cms'"/> </div>
<xsl:with-param name="id" select="'summary/itemSummary/name'"/> <div class="tableRow">
</xsl:call-template> <span class="key">
</span> <xsl:call-template name="mandalay:getStaticText">
<xsl:value-of select="@name"/> <xsl:with-param name="module" select="'cms'"/>
<br /> <xsl:with-param name="id" select="'summary/itemSummary/name'"/>
<span class="key"> </xsl:call-template>
<xsl:call-template name="mandalay:getStaticText"> </span>
<xsl:with-param name="module" select="'cms'"/> <span class="value">
<xsl:with-param name="id" select="'summary/itemSummary/title'"/> <xsl:value-of select="@name"/>
</xsl:call-template> </span>
</span> </div>
<xsl:value-of select="@title"/> <div class="tableRow">
<br /> <span class="key">
<xsl:apply-templates select="cms:subjectCategories"/> <xsl:call-template name="mandalay:getStaticText">
<span class="key"> <xsl:with-param name="module" select="'cms'"/>
<xsl:call-template name="mandalay:getStaticText"> <xsl:with-param name="id" select="'summary/itemSummary/title'"/>
<xsl:with-param name="module" select="'cms'"/> </xsl:call-template>
<xsl:with-param name="id" select="'summary/itemSummary/description'"/> </span>
</xsl:call-template> <span class="value">
</span> <xsl:value-of select="@title"/>
<xsl:value-of disable-output-escaping="yes" select="@description"/> </span>
<br /> </div>
<xsl:apply-templates select="cms:subjectCategories"/>
<div class="tableRow">
<span class="key">
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'cms'"/>
<xsl:with-param name="id" select="'summary/itemSummary/description'"/>
</xsl:call-template>
</span>
<span class="value">
<xsl:value-of disable-output-escaping="yes" select="@description"/>
</span>
</div>
</div> </div>
</div> </div>
</xsl:template> </xsl:template>
@ -90,23 +102,27 @@
<!-- DE Zeigt die subjectCategories an --> <!-- DE Zeigt die subjectCategories an -->
<!-- EN show subject categories --> <!-- EN show subject categories -->
<xsl:template match="cms:subjectCategories"> <xsl:template match="cms:subjectCategories">
<span class="key"> <div class="tableRow">
<xsl:call-template name="mandalay:getStaticText"> <span class="key">
<xsl:with-param name="module" select="'cms'"/> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="id" select="'summary/itemSummary/subjectCategories'"/> <xsl:with-param name="module" select="'cms'"/>
</xsl:call-template> <xsl:with-param name="id" select="'summary/itemSummary/subjectCategories'"/>
</span> </xsl:call-template>
<xsl:apply-templates/> </span>
<br /> <span class="value">
<xsl:apply-templates/>
</span>
</div>
</xsl:template> </xsl:template>
<!-- DE Zeigt eine subjectCategory an --> <!-- DE Zeigt eine subjectCategory an -->
<!-- EN Shows a subject category --> <!-- EN Shows a subject category -->
<xsl:template match="cms:subjectCategory"> <xsl:template match="cms:subjectCategory">
<xsl:value-of disable-output-escaping="yes" select="."/> <ul>
<xsl:if test="position() != last()"> <li>
<br /> <xsl:value-of disable-output-escaping="yes" select="."/>
</xsl:if> </li>
</ul>
</xsl:template> </xsl:template>
<!-- DE Zeigt die Kategorien an--> <!-- DE Zeigt die Kategorien an-->
@ -132,8 +148,11 @@
<!-- EN cms:category is using to different syntax. The other one is located <!-- EN cms:category is using to different syntax. The other one is located
in cmsCategoryStep. --> in cmsCategoryStep. -->
<xsl:template match="cms:category" mode="summary"> <xsl:template match="cms:category" mode="summary">
<xsl:value-of disable-output-escaping="yes" select="."/> <ul class="categoryList">
<br /> <li>
<xsl:value-of disable-output-escaping="yes" select="."/>
</li>
</ul>
</xsl:template> </xsl:template>
<!-- DE Zeigt den stabilen Link an--> <!-- DE Zeigt den stabilen Link an-->
@ -164,7 +183,7 @@
<xsl:with-param name="id" select="'summary/lifecycle/header'"/> <xsl:with-param name="id" select="'summary/lifecycle/header'"/>
</xsl:call-template> </xsl:call-template>
</h3> </h3>
<div class="cmsSummaryBody"> <div class="cmsSummaryBody table">
<xsl:choose> <xsl:choose>
<xsl:when test="@noLifecycle"> <xsl:when test="@noLifecycle">
<span class="noInfo"> <span class="noInfo">
@ -175,57 +194,61 @@
</span> </span>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="@name"/> <span class="key">
<xsl:choose> <xsl:value-of select="@name"/>
<xsl:when test="@hasBegun='false'"> </span>
<xsl:call-template name="mandalay:getStaticText"> <span class="value">
<xsl:with-param name="module" select="'cms'"/> <xsl:choose>
<xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/startText'"/> <xsl:when test="@hasBegun='false'">
</xsl:call-template> <xsl:call-template name="mandalay:getStaticText">
<xsl:value-of select="@startDate"/> <xsl:with-param name="module" select="'cms'"/>
<xsl:call-template name="mandalay:getStaticText"> <xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/startText'"/>
<xsl:with-param name="module" select="'cms'"/> </xsl:call-template>
<xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/middleText'"/> <xsl:value-of select="@startDate"/>
</xsl:call-template> <xsl:call-template name="mandalay:getStaticText">
<xsl:value-of select="@endDateString"/> <xsl:with-param name="module" select="'cms'"/>
<xsl:call-template name="mandalay:getStaticText"> <xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/middleText'"/>
<xsl:with-param name="module" select="'cms'"/> </xsl:call-template>
<xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/endText'"/> <xsl:value-of select="@endDateString"/>
</xsl:call-template> <xsl:call-template name="mandalay:getStaticText">
</xsl:when> <xsl:with-param name="module" select="'cms'"/>
<xsl:when test="@hasEnded='true'"> <xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/endText'"/>
<xsl:call-template name="mandalay:getStaticText"> </xsl:call-template>
<xsl:with-param name="module" select="'cms'"/> </xsl:when>
<xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/startText'"/> <xsl:when test="@hasEnded='true'">
</xsl:call-template> <xsl:call-template name="mandalay:getStaticText">
<xsl:value-of select="@startDate"/> <xsl:with-param name="module" select="'cms'"/>
<xsl:call-template name="mandalay:getStaticText"> <xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/startText'"/>
<xsl:with-param name="module" select="'cms'"/> </xsl:call-template>
<xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/middleText'"/> <xsl:value-of select="@startDate"/>
</xsl:call-template> <xsl:call-template name="mandalay:getStaticText">
<xsl:value-of select="@endDate"/> <xsl:with-param name="module" select="'cms'"/>
<xsl:call-template name="mandalay:getStaticText"> <xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/middleText'"/>
<xsl:with-param name="module" select="'cms'"/> </xsl:call-template>
<xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/endText'"/> <xsl:value-of select="@endDate"/>
</xsl:call-template> <xsl:call-template name="mandalay:getStaticText">
</xsl:when> <xsl:with-param name="module" select="'cms'"/>
<xsl:otherwise> <xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/endText'"/>
<xsl:call-template name="mandalay:getStaticText"> </xsl:call-template>
<xsl:with-param name="module" select="'cms'"/> </xsl:when>
<xsl:with-param name="id" select="'summary/lifecycle/itemPublished/startText'"/> <xsl:otherwise>
</xsl:call-template> <xsl:call-template name="mandalay:getStaticText">
<xsl:value-of select="@startDate"/> <xsl:with-param name="module" select="'cms'"/>
<xsl:call-template name="mandalay:getStaticText"> <xsl:with-param name="id" select="'summary/lifecycle/itemPublished/startText'"/>
<xsl:with-param name="module" select="'cms'"/> </xsl:call-template>
<xsl:with-param name="id" select="'summary/lifecycle/itemPublished/middleText'"/> <xsl:value-of select="@startDate"/>
</xsl:call-template> <xsl:call-template name="mandalay:getStaticText">
<xsl:value-of select="@endDateString"/> <xsl:with-param name="module" select="'cms'"/>
<xsl:call-template name="mandalay:getStaticText"> <xsl:with-param name="id" select="'summary/lifecycle/itemPublished/middleText'"/>
<xsl:with-param name="module" select="'cms'"/> </xsl:call-template>
<xsl:with-param name="id" select="'summary/lifecycle/itemPublished/endText'"/> <xsl:value-of select="@endDateString"/>
</xsl:call-template> <xsl:call-template name="mandalay:getStaticText">
</xsl:otherwise> <xsl:with-param name="module" select="'cms'"/>
</xsl:choose> <xsl:with-param name="id" select="'summary/lifecycle/itemPublished/endText'"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</span>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</div> </div>
@ -274,19 +297,21 @@
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<div class="cmsTask"> <div class="cmsTask tableRow">
<span class="key"> <span class="tableCell">
<span class="key">
<xsl:value-of select="@name"/> <xsl:value-of select="@name"/>
</span> </span>
<span class="status"> <span class="status tableCell">
( (
<xsl:value-of select="@state"/> <xsl:value-of select="@state"/>
) )
</span>
</span> </span>
<xsl:if test="$setComments = 'true'"> <xsl:if test="$setComments = 'true'">
<xsl:if test="not(cms:taskComment)"> <xsl:if test="not(cms:taskComment)">
<xsl:if test="setNoComment = 'true'"> <xsl:if test="setNoComment = 'true'">
<span class="noInfo"> <span class="noInfo tableCell">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'cms'"/> <xsl:with-param name="module" select="'cms'"/>
<xsl:with-param name="id" select="'summary/workflow/noComment'"/> <xsl:with-param name="id" select="'summary/workflow/noComment'"/>
@ -325,25 +350,30 @@
<xsl:with-param name="id" select="'summary/revisionSummary/header'"/> <xsl:with-param name="id" select="'summary/revisionSummary/header'"/>
</xsl:call-template> </xsl:call-template>
</h3> </h3>
<div class="cmsSummaryBody"> <div class="cmsSummaryBody table">
<span class="cmsCurrentRevision"> <div class="tableRow">
<xsl:value-of select="@lastModifiedDate"/> <span class="cmsCurrentRevision tableCell">
&nbsp; <xsl:value-of select="@lastModifiedDate"/>
<xsl:call-template name="mandalay:getStaticText"> </span>
<xsl:with-param name="module" select="'cms'"/> <span class="cmsCurrentRevision tableCell">
<xsl:with-param name="id" select="'summary/revisionSummary/currentRevision'"/> <xsl:call-template name="mandalay:getStaticText">
</xsl:call-template> <xsl:with-param name="module" select="'cms'"/>
</span> <xsl:with-param name="id" select="'summary/revisionSummary/currentRevision'"/>
<br /> </xsl:call-template>
</span>
</div>
<xsl:apply-templates/> <xsl:apply-templates/>
<span class="cmsInitialRevision"> <div class="tableRow">
<xsl:value-of select="@creationDate"/> <span class="cmsInitialRevision tableCell">
&nbsp; <xsl:value-of select="@creationDate"/>
<xsl:call-template name="mandalay:getStaticText"> </span>
<xsl:with-param name="module" select="'cms'"/> <span class="cmsInitialRevision tableCell">
<xsl:with-param name="id" select="'summary/revisionSummary/initialRevision'"/> <xsl:call-template name="mandalay:getStaticText">
</xsl:call-template> <xsl:with-param name="module" select="'cms'"/>
</span> <xsl:with-param name="id" select="'summary/revisionSummary/initialRevision'"/>
</xsl:call-template>
</span>
</div>
</div> </div>
</div> </div>
</xsl:template> </xsl:template>
@ -351,8 +381,8 @@
<!-- DE Zeigt Informationen über eine Transaktion an --> <!-- DE Zeigt Informationen über eine Transaktion an -->
<!-- EN Shows information about transactions --> <!-- EN Shows information about transactions -->
<xsl:template match="cms:transaction"> <xsl:template match="cms:transaction">
<div class="cmsTransaction"> <div class="cmsTransaction tableRow">
<span class="cmsTransactionDate"> <span class="cmsTransactionDate tableCell">
<a href="/ccm{@url}"> <a href="/ccm{@url}">
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
@ -369,12 +399,10 @@
<xsl:value-of select="@date"/> <xsl:value-of select="@date"/>
</a> </a>
</span> </span>
&nbsp; <span class="cmsTransactionAuthor tableCell">
<span class="cmsTransactionAuthor">
<xsl:value-of select="@author"/> <xsl:value-of select="@author"/>
</span> </span>
&nbsp; <span class="cmsTransactionLink tableCell">
<span class="cmsTransactionLink">
</span> </span>
</div> </div>
</xsl:template> </xsl:template>

50
ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
View File

@ -33,7 +33,9 @@
xmlns:subsite="http://ccm.redhat.com/subsite/1.0" xmlns:subsite="http://ccm.redhat.com/subsite/1.0"
xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
xmlns:ppp="http://www.arsdigita.com/PublicPersonalProfile/1.0" xmlns:ppp="http://www.arsdigita.com/PublicPersonalProfile/1.0"
xmlns:atoz="http://www.arsdigita.com/atoz/1.0"
xmlns:mandalay="http://mandalay.quasiweb.de" 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" exclude-result-prefixes="xsl aplaws bebop cms docs forum mandalay nav portal ppp search subsite terms ui"
version="1.0"> version="1.0">
@ -71,35 +73,43 @@
<!-- DE Wichtig für die CSS-Auszeichung mit id und class und für die Colorset-Funktion --> <!-- DE Wichtig für die CSS-Auszeichung mit id und class und für die Colorset-Funktion -->
<!-- EN Helper function for block creating tags --> <!-- EN Helper function for block creating tags -->
<!-- EN needed for css-attributes id and class and for the colorset feature --> <!-- EN needed for css-attributes id and class and for the colorset feature -->
<xsl:template name="mandalay:setParameters"> <xsl:template name="mandalay:setIdAndClass">
<xsl:param name="currentLayoutNode" select="."/>
<xsl:variable name="condClass"> <xsl:variable name="condClass">
<xsl:if test="@classIf"> <xsl:if test="$currentLayoutNode/@classIf">
<!-- DE Funktioniert leider nicht in einer Zeile, daher die Hilfsvariable --> <!-- DE Funktioniert leider nicht in einer Zeile, daher die Hilfsvariable -->
<xsl:variable name="key" select="substring-before(@classIf, ',')"/> <xsl:variable name="key" select="substring-before($currentLayoutNode/@classIf, ',')"/>
<xsl:variable name="condition"> <xsl:variable name="condition">
<xsl:apply-templates select="//*[@id=$key]"/> <xsl:apply-templates select="//*[@id=$key]"/>
</xsl:variable> </xsl:variable>
<xsl:if test="normalize-space($condition)"> <xsl:if test="normalize-space($condition)">
<xsl:value-of select="substring-after(@classIf, ', ')"/> <xsl:value-of select="substring-after($currentLayoutNode/@classIf, ', ')"/>
</xsl:if> </xsl:if>
</xsl:if> </xsl:if>
</xsl:variable> </xsl:variable>
<xsl:variable name="typeClass">
<xsl:if test="$currentLayoutNode/@setTypeClass='true'">
<xsl:call-template name="mandalay:getContentTypeName"/>
</xsl:if>
</xsl:variable>
<xsl:variable name="colorClass"> <xsl:variable name="colorClass">
<xsl:if test="@withColorset='true'"> <xsl:if test="$currentLayoutNode/@withColorset='true'">
<xsl:call-template name="mandalay:getColorset"/> <xsl:call-template name="mandalay:getColorset"/>
</xsl:if> </xsl:if>
</xsl:variable> </xsl:variable>
<xsl:if test="@id"> <xsl:if test="$currentLayoutNode/@id">
<xsl:attribute name="id"> <xsl:attribute name="id">
<xsl:value-of select="@id"/> <xsl:value-of select="@id"/>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="@class or $condClass != '' or $colorClass != ''"> <xsl:if test="$currentLayoutNode/@class or $condClass != '' or $typeClass != '' or $colorClass != ''">
<xsl:attribute name="class"> <xsl:attribute name="class">
<xsl:value-of select="concat(@class, ' ', $condClass, ' ', $colorClass)"/> <xsl:value-of select="normalize-space(concat($currentLayoutNode/@class, ' ', $condClass, ' ', $typeClass, ' ', $colorClass))"/>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
@ -209,7 +219,7 @@
<xsl:template match="body"> <xsl:template match="body">
<body> <body>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<span id="top"/> <span id="top"/>
<a href="#startcontent" accesskey="S" class="navHide"> <a href="#startcontent" accesskey="S" class="navHide">
<xsl:attribute name="title"> <xsl:attribute name="title">
@ -227,14 +237,14 @@
<xsl:template match="span"> <xsl:template match="span">
<span> <span>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:apply-templates/> <xsl:apply-templates/>
</span> </span>
</xsl:template> </xsl:template>
<xsl:template match="div"> <xsl:template match="div">
<div> <div>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:apply-templates/> <xsl:apply-templates/>
</div> </div>
</xsl:template> </xsl:template>
@ -246,7 +256,7 @@
<xsl:if test="normalize-space($divContent)"> <xsl:if test="normalize-space($divContent)">
<div> <div>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:apply-templates/> <xsl:apply-templates/>
</div> </div>
</xsl:if> </xsl:if>
@ -425,7 +435,7 @@
<!-- DE Wenn die Liste nicht leer ist --> <!-- DE Wenn die Liste nicht leer ist -->
<xsl:if test="$resultTree//*[@id=$list]/*[name()!='nav:noContent']"> <xsl:if test="$resultTree//*[@id=$list]/*[name()!='nav:noContent']">
<div> <div>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:attribute name="id"><xsl:value-of select="$list"/></xsl:attribute> <xsl:attribute name="id"><xsl:value-of select="$list"/></xsl:attribute>
<xsl:apply-templates/> <xsl:apply-templates/>
</div> </div>
@ -457,7 +467,7 @@
<!-- DE Div-Container für die Suchergebnisse --> <!-- DE Div-Container für die Suchergebnisse -->
<xsl:template match="showSearch"> <xsl:template match="showSearch">
<!--<div>--> <!--<div>-->
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:apply-templates/> <xsl:apply-templates/>
<!--</div>--> <!--</div>-->
</xsl:template> </xsl:template>
@ -465,7 +475,7 @@
<!-- DE Suchformular --> <!-- DE Suchformular -->
<xsl:template match="useSearchForm"> <xsl:template match="useSearchForm">
<!--<div>--> <!--<div>-->
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:apply-templates select="$resultTree//bebop:form"> <xsl:apply-templates select="$resultTree//bebop:form">
<xsl:with-param name="layoutTree" select="."/> <xsl:with-param name="layoutTree" select="."/>
</xsl:apply-templates> </xsl:apply-templates>
@ -475,7 +485,7 @@
<!-- DE Ergebnisse der Suche --> <!-- DE Ergebnisse der Suche -->
<xsl:template match="useSearchResults"> <xsl:template match="useSearchResults">
<!--<div>--> <!--<div>-->
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:apply-templates select="$resultTree//search:results"> <xsl:apply-templates select="$resultTree//search:results">
<xsl:with-param name="layoutTree" select="."/> <xsl:with-param name="layoutTree" select="."/>
</xsl:apply-templates> </xsl:apply-templates>
@ -529,14 +539,14 @@
<xsl:template match="showImage"> <xsl:template match="showImage">
<div> <div>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:call-template name="mandalay:staticImage"/> <xsl:call-template name="mandalay:staticImage"/>
</div> </div>
</xsl:template> </xsl:template>
<xsl:template match="showStaticMenu"> <xsl:template match="showStaticMenu">
<div> <div>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:call-template name="mandalay:staticMenu"/> <xsl:call-template name="mandalay:staticMenu"/>
</div> </div>
</xsl:template> </xsl:template>
@ -545,7 +555,7 @@
<xsl:choose> <xsl:choose>
<xsl:when test="@id!='' or @class!='' or @withColorset='true'"> <xsl:when test="@id!='' or @class!='' or @withColorset='true'">
<span> <span>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="id" select="line"/> <xsl:with-param name="id" select="line"/>
</xsl:call-template> </xsl:call-template>
@ -563,7 +573,7 @@
<xsl:choose> <xsl:choose>
<xsl:when test="@id!='' or @class!='' or @withColorset='true'"> <xsl:when test="@id!='' or @class!='' or @withColorset='true'">
<span> <span>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:call-template name="mandalay:staticLink"/> <xsl:call-template name="mandalay:staticLink"/>
</span> </span>
</xsl:when> </xsl:when>

2
ccm-sci-bundle/web/themes/mandalay/includes/mandalay/staticMenu.xsl
View File

@ -195,4 +195,4 @@
</a> </a>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

2
ccm-sci-bundle/web/themes/mandalay/lang/de/cms.xml
View File

@ -63,7 +63,7 @@
<line id="summary/revisionSummary/viewRevision">Version ansehen</line> <line id="summary/revisionSummary/viewRevision">Version ansehen</line>
<line id="categoryStep/header">Kategorien zuweisen</line> <line id="categoryStep/header">Kategorien zuweisen</line>
<line id="categoryStep/addCategories">Kategorien ändern</line> <line id="categoryStep/addCategories">Kategoriezuweisung ändern</line>
<line id="categoryStep/noCategories">Es sind keine Kategorien dieses Kontextes zugewiesen</line> <line id="categoryStep/noCategories">Es sind keine Kategorien dieses Kontextes zugewiesen</line>
<line id="categoryStep/removeCategory">Zuweisung aufheben</line> <line id="categoryStep/removeCategory">Zuweisung aufheben</line>

4
ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml
View File

@ -43,8 +43,4 @@
<line id="layout/page/title/search">Suche</line> <line id="layout/page/title/search">Suche</line>
<line id="layout/page/title/login">Login</line> <line id="layout/page/title/login">Login</line>
<line id="layout/page/title/sitemap">Sitemap</line> <line id="layout/page/title/sitemap">Sitemap</line>
<line id="scicms/version">v2.1.0</line>
<line id="menu/title/scicms">Zur Homepage von ScientificCMS</line>
<line id="menu/name/scicms">ScientificCMS </line>
</translations> </translations>

2
ccm-sci-bundle/web/themes/mandalay/lang/en/cms.xml
View File

@ -63,7 +63,7 @@
<line id="summary/revisionSummary/viewRevision">View Revision</line> <line id="summary/revisionSummary/viewRevision">View Revision</line>
<line id="categoryStep/header">Assign Categories</line> <line id="categoryStep/header">Assign Categories</line>
<line id="categoryStep/addCategories">Change categories</line> <line id="categoryStep/addCategories">Change associated categories</line>
<line id="categoryStep/noCategories">There are no categories assigned in this context.</line> <line id="categoryStep/noCategories">There are no categories assigned in this context.</line>
<line id="categoryStep/removeCategory">Remove</line> <line id="categoryStep/removeCategory">Remove</line>

4
ccm-sci-bundle/web/themes/mandalay/lang/en/global.xml
View File

@ -43,8 +43,4 @@
<line id="layout/page/title/search">Search</line> <line id="layout/page/title/search">Search</line>
<line id="layout/page/title/login">Login</line> <line id="layout/page/title/login">Login</line>
<line id="layout/page/title/sitemap">Sitemap</line> <line id="layout/page/title/sitemap">Sitemap</line>
<line id="scicms/version">v2.1.0</line>
<line id="menu/title/scicms">Go to homepage of ScientificCMS</line>
<line id="menu/name/scicms">ScientificCMS </line>
</translations> </translations>

89
ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml
View File

@ -31,7 +31,7 @@
<useCSSLoader/> <useCSSLoader/>
</head> </head>
<body id="cmsPage"> <body id="cmsPage">
<div id="cmsHeader"> <div id="cmsHeader" class="headerHeight">
<div class="minWidth"> <div class="minWidth">
<showImage class="logo"> <showImage class="logo">
<src>images/logo.png</src> <src>images/logo.png</src>
@ -50,7 +50,7 @@
<useLogoutLink/> <useLogoutLink/>
</showCMSGlobalNavigation> </showCMSGlobalNavigation>
</div> </div>
<showTabbedPane/> <showTabbedPane class="minWidth"/>
</div> </div>
</div> </div>
<div id="cmsBreadcrumbs" class="minWidth"> <div id="cmsBreadcrumbs" class="minWidth">
@ -58,51 +58,54 @@
<separator> > </separator> <separator> > </separator>
</showBebopContextBar> </showBebopContextBar>
</div> </div>
<div id="cmsContent"> <div id="cmsContent" class="minWidth headerHeight">
<div id="left"> <div id="left">
<div class="columnHead"> <div class="columnHead">
<showContentType/> <showContentType/>
<span id="workflowwidget"> <span id="workflowwidget">
<!-- <!--
Workflow Widget Workflow Widget
--> -->
</span> </span>
</div>
<div class="columnContent">
<showLeftColumn/>
</div>
</div> </div>
<div class="columnContent"> <div id="right">
<showLeftColumn/> <div class="columnHead">
<div class="contenttitle">
<showBebopPageTitle/>
</div>
<div id="contentlanguagewidget">
<!--
Sprache
-->
</div>
<div id="contentviewmenu">
<showCMSGlobalNavigation>
<usePreviewLink/>
</showCMSGlobalNavigation>
</div>
</div>
<div id="content" class="columnContent">
<showBodyColumn/>
</div>
</div> </div>
<div class="endFloat"/>
</div> </div>
<div id="right">
<div class="columnHead">
<div class="contenttitle">
<showBebopPageTitle/>
</div>
<div id="contentlanguagewidget">
<!--
Sprache
-->
</div>
<div id="contentviewmenu">
<showCMSGlobalNavigation>
<usePreviewLink/>
</showCMSGlobalNavigation>
</div>
</div>
<div id="content" class="columnContent">
<showBodyColumn/>
</div>
</div>
<div class="endFloat"/>
</div>
<div id="cmsFooter"> <div id="cmsFooter">
<showSystemInformation/> <div class="minWidth">
<showCMSGlobalNavigation> <showSystemInformation/>
<useContentCenterLink/> <showCMSGlobalNavigation>
<useWorkspaceLink/> <useContentCenterLink/>
</showCMSGlobalNavigation> <useWorkspaceLink/>
<showCMSGlobalNavigation> </showCMSGlobalNavigation>
<useHelpLink/> <showCMSGlobalNavigation>
</showCMSGlobalNavigation> <useHelpLink/>
</showCMSGlobalNavigation>
</div>
</div> </div>
</body> </body>
</pageLayout> </pageLayout>

4
ccm-sci-bundle/web/themes/mandalay/settings/Address.xml
View File

@ -23,9 +23,9 @@
<!-- <setting id="csspath">Address</setting> --> <!-- <setting id="csspath">Address</setting> -->
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting>
<setting id="setImageMaxWidth"></setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>
<setting id="setShowKeys">false</setting> <setting id="setShowKeys">false</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/Article.xml
View File

@ -23,8 +23,8 @@
<!-- <setting id="csspath">Article</setting> --> <!-- <setting id="csspath">Article</setting> -->
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/Bookmark.xml
View File

@ -23,8 +23,8 @@
<!-- <setting id="csspath">Bookmark</setting> --> <!-- <setting id="csspath">Bookmark</setting> -->
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/Event.xml
View File

@ -27,8 +27,8 @@
<setting id="setDateFormat">S</setting> <setting id="setDateFormat">S</setting>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/FAQItem.xml
View File

@ -23,8 +23,8 @@
<!-- <setting id="csspath">FAQItem</setting> --> <!-- <setting id="csspath">FAQItem</setting> -->
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/FileStorageItem.xml
View File

@ -25,8 +25,8 @@
<setting id="separator"> | </setting> <setting id="separator"> | </setting>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>
<setting id="setViewLink">true</setting> <setting id="setViewLink">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/Form.xml
View File

@ -23,8 +23,8 @@
<!-- <setting id="csspath">Form</setting> --> <!-- <setting id="csspath">Form</setting> -->
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/GenericOrganization.xml
View File

@ -22,9 +22,9 @@
<settings> <settings>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting>
<setting id="setImageMaxWidth"></setting>
<setting id="setRoles">true</setting> <setting id="setRoles">true</setting>
<setting id="setSubUnits">true</setting> <setting id="setSubUnits">true</setting>

6
ccm-sci-bundle/web/themes/mandalay/settings/GenericPerson.xml
View File

@ -26,9 +26,9 @@
<setting id="setGender">false</setting> <setting id="setGender">false</setting>
<setting id="setDescription">false</setting> <setting id="setDescription">false</setting>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption"></setting> <setting id="setImageCaption">true</setting>
<setting id="listView/setLeadText">true</setting> <setting id="listView/setLeadText">true</setting>
<setting id="listView/setLeadTextLength">440</setting> <setting id="listView/setLeadTextLength">440</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/GlossaryItem.xml
View File

@ -23,8 +23,8 @@
<!-- <setting id="csspath">GlossaryItem</setting> --> <!-- <setting id="csspath">GlossaryItem</setting> -->
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="listView/setLinkToDetails">false</setting> <setting id="listView/setLinkToDetails">false</setting>

6
ccm-sci-bundle/web/themes/mandalay/settings/Image.xml
View File

@ -21,9 +21,9 @@
<settings> <settings>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>
<setting id="setImage">true</setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxHeight">200</setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageMaxWidth">200</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setShowKeys">true</setting> <setting id="setShowKeys">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/Member.xml
View File

@ -26,8 +26,8 @@
<setting id="setGender">false</setting> <setting id="setGender">false</setting>
<setting id="setDescription">false</setting> <setting id="setDescription">false</setting>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption"></setting> <setting id="setImageCaption"></setting>
<setting id="listView/setLeadText">true</setting> <setting id="listView/setLeadText">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/MultiPartArticle.xml
View File

@ -29,8 +29,8 @@
<setting id="setSectionListHeading">false</setting> <setting id="setSectionListHeading">false</setting>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>
<setting id="setLastLinkToTopAfter">false</setting> <setting id="setLastLinkToTopAfter">false</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
View File

@ -24,8 +24,8 @@
<setting id="setNewsDate">true</setting> <setting id="setNewsDate">true</setting>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/OrganizationalUnit.xml
View File

@ -22,9 +22,9 @@
<settings> <settings>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting>
<setting id="setImageMaxWidth"></setting>
<setting id="setDirection">true</setting> <setting id="setDirection">true</setting>
<setting id="directionSetLink">true</setting> <setting id="directionSetLink">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/Project.xml
View File

@ -22,9 +22,9 @@
<settings> <settings>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting>
<setting id="setImageMaxWidth"></setting>
<setting id="setTeam">true</setting> <setting id="setTeam">true</setting>
<setting id="setOrgaUnits">true</setting> <setting id="setOrgaUnits">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/ResearchNetwork.xml
View File

@ -22,9 +22,9 @@
<settings> <settings>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting>
<setting id="setImageMaxWidth"></setting>
<setting id="setDirection">true</setting> <setting id="setDirection">true</setting>
<setting id="setCoordination">true</setting> <setting id="setCoordination">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/SciDepartment.xml
View File

@ -23,8 +23,8 @@
<setting id="setImage">false</setting> <setting id="setImage">false</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setAddendum">true</setting> <setting id="setAddendum">true</setting>
<setting id="setShortDesc">true</setting> <setting id="setShortDesc">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/SciInstitute.xml
View File

@ -23,8 +23,8 @@
<setting id="setImage">false</setting> <setting id="setImage">false</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setAddendum">true</setting> <setting id="setAddendum">true</setting>
<setting id="setShortDesc">true</setting> <setting id="setShortDesc">true</setting>

2
ccm-sci-bundle/web/themes/mandalay/settings/SciMember.xml
View File

@ -28,4 +28,4 @@
<setting id="contactentry/homepage/show">false</setting> <setting id="contactentry/homepage/show">false</setting>
<setting id="contactentry/visitingHours/show">false</setting> <setting id="contactentry/visitingHours/show">false</setting>
</settings> </settings>

4
ccm-sci-bundle/web/themes/mandalay/settings/SciOrganization.xml
View File

@ -23,8 +23,8 @@
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setAddendum">true</setting> <setting id="setAddendum">true</setting>
<setting id="setShortDesc">true</setting> <setting id="setShortDesc">true</setting>

6
ccm-sci-bundle/web/themes/mandalay/settings/SciProject.xml
View File

@ -23,8 +23,8 @@
<setting id="setImage">false</setting> <setting id="setImage">false</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setAddendum">true</setting> <setting id="setAddendum">true</setting>
<setting id="setShortDesc">true</setting> <setting id="setShortDesc">true</setting>
@ -76,6 +76,4 @@
<setting id="memberList/showEmail">true</setting> <setting id="memberList/showEmail">true</setting>
<setting id="memberList/linkEmail">true</setting> <setting id="memberList/linkEmail">true</setting>
</settings> </settings>

4
ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
View File

@ -22,8 +22,8 @@
<settings> <settings>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="authorListMode">list</setting> <setting id="authorListMode">list</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/SiteProxy.xml
View File

@ -24,8 +24,8 @@
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>

4
ccm-sci-bundle/web/themes/mandalay/settings/Survey.xml
View File

@ -23,8 +23,8 @@
<!-- <setting id="csspath">Form</setting> --> <!-- <setting id="csspath">Form</setting> -->
<setting id="setImage">true</setting> <setting id="setImage">true</setting>
<setting id="setImageMaxHeight"></setting> <setting id="setImageMaxHeight">300</setting>
<setting id="setImageMaxWidth"></setting> <setting id="setImageMaxWidth">300</setting>
<setting id="setImageCaption">true</setting> <setting id="setImageCaption">true</setting>
<setting id="setLeadText">true</setting> <setting id="setLeadText">true</setting>

2
ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/layoutParser.xsl
View File

@ -51,7 +51,7 @@
<xsl:template match="showDynamicImage"> <xsl:template match="showDynamicImage">
<div> <div>
<xsl:call-template name="mandalay:setParameters"/> <xsl:call-template name="mandalay:setIdAndClass"/>
<xsl:call-template name="mandalay:dynamicImage"/> <xsl:call-template name="mandalay:dynamicImage"/>
</div> </div>
</xsl:template> </xsl:template>

1
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProjectSummaryTab.xsl
View File

@ -118,7 +118,6 @@
<xsl:with-param name="default" select="'true'"/> <xsl:with-param name="default" select="'true'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="setLifespan"> <xsl:variable name="setLifespan">
<xsl:call-template name="mandalay:getSetting"> <xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciProject'"/> <xsl:with-param name="module" select="'SciProject'"/>

8
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
View File

@ -266,10 +266,10 @@
</xsl:if> </xsl:if>
<ul> <ul>
<xsl:for-each select="./volumes/publication"> <xsl:for-each select="./volumes/publication">
<xsl:sort select="./@volume" data-type="number" order="descending"/> <xsl:sort select="./@volume" data-type="number" order="descending"/>
<xsl:sort select="./yearOfPublication" data-type="number" order="descending"/> <xsl:sort select="./yearOfPublication" data-type="number" order="descending"/>
<xsl:sort select="./title" data-type="text"/> <xsl:sort select="./title" data-type="text"/>
<li> <li>
<xsl:apply-templates select="." mode="list_view"/> <xsl:apply-templates select="." mode="list_view"/>
</li> </li>

111
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
View File

@ -38,76 +38,71 @@
--> -->
<!-- Process the format for an article in a collected volume --> <!-- Process the format for an article in a collected volume -->
<xsl:template name="bibrefArticleInCollectedVolume" <xsl:template name="bibrefArticleInCollectedVolume" match="bibrefArticleInCollectedVolumeFormat">
match="bibrefArticleInCollectedVolumeFormat">
<!-- Parameters for publication data --> <!-- Parameters for publication data -->
<xsl:param name="authors" /> <xsl:param name="authors"/>
<xsl:param name="chapter" /> <xsl:param name="chapter"/>
<xsl:param name="collectedVolume" /> <xsl:param name="collectedVolume"/>
<xsl:param name="misc" select="''" /> <xsl:param name="misc" select="''"/>
<xsl:param name="pagesFrom" /> <xsl:param name="pagesFrom"/>
<xsl:param name="pagesTo" /> <xsl:param name="pagesTo"/>
<xsl:param name="reviewed" /> <xsl:param name="reviewed"/>
<xsl:param name="series" /> <xsl:param name="series"/>
<xsl:param name="title" /> <xsl:param name="title"/>
<xsl:param name="year" /> <xsl:param name="year"/>
<!-- Technical parameters --> <!-- Technical parameters -->
<xsl:param name="oid" /> <xsl:param name="oid"/>
<xsl:param name="useRelativeUrl" select="'false'" /> <xsl:param name="useRelativeUrl" select="'false'"/>
<xsl:apply-templates> <xsl:apply-templates>
<!-- Publication data --> <!-- Publication data -->
<xsl:with-param name="authors" select="$authors" /> <xsl:with-param name="authors" select="$authors"/>
<xsl:with-param name="chapter" select="$chapter" /> <xsl:with-param name="chapter" select="$chapter"/>
<xsl:with-param name="collectedVolume" <xsl:with-param name="collectedVolume" select="$collectedVolume"/>
select="$collectedVolume" /> <xsl:with-param name="misc" select="$misc"/>
<xsl:with-param name="misc" select="$misc" /> <xsl:with-param name="pagesFrom" select="$pagesFrom"/>
<xsl:with-param name="pagesFrom" select="$pagesFrom" /> <xsl:with-param name="pagesTo" select="$pagesTo"/>
<xsl:with-param name="pagesTo" select="$pagesTo" /> <xsl:with-param name="reviewed" select="$reviewed"/>
<xsl:with-param name="reviewed" select="$reviewed" /> <xsl:with-param name="series" select="$series"/>
<xsl:with-param name="series" select="$series" /> <xsl:with-param name="title" select="$title"/>
<xsl:with-param name="title" select="$title" /> <xsl:with-param name="year" select="$year"/>
<xsl:with-param name="year" select="$year" />
<!-- Technical data --> <!-- Technical data -->
<xsl:with-param name="oid" select="$oid" /> <xsl:with-param name="oid" select="$oid"/>
<xsl:with-param name="useRelativeUrl" <xsl:with-param name="useRelativeUrl" select="$useRelativeUrl"/>
select="$useRelativeUrl" /> </xsl:apply-templates>
</xsl:apply-templates>
</xsl:template> </xsl:template>
<!-- Process the format for an article in a journal --> <!-- Process the format for an article in a journal -->
<xsl:template name="bibrefArticleInJournal" <xsl:template name="bibrefArticleInJournal" match="bibrefArticleInJournalFormat">
match="bibrefArticleInJournalFormat">
<!-- Publication data --> <!-- Publication data -->
<xsl:param name="authors" /> <xsl:param name="authors"/>
<xsl:param name="issue" /> <xsl:param name="issue"/>
<xsl:param name="journal" /> <xsl:param name="journal"/>
<xsl:param name="misc" select="''" /> <xsl:param name="misc" select="''"/>
<xsl:param name="pagesFrom" /> <xsl:param name="pagesFrom"/>
<xsl:param name="pagesTo" /> <xsl:param name="pagesTo"/>
<xsl:param name="publicationDate" /> <xsl:param name="publicationDate"/>
<xsl:param name="reviewed" /> <xsl:param name="reviewed"/>
<xsl:param name="series" /> <xsl:param name="series"/>
<xsl:param name="title" /> <xsl:param name="title"/>
<xsl:param name="volume" /> <xsl:param name="volume"/>
<xsl:param name="year" /> <xsl:param name="year"/>
<!-- Technical data --> <!-- Technical data -->
<xsl:param name="oid" /> <xsl:param name="oid"/>
<xsl:param name="useRelativeUrl" select="'false'" /> <xsl:param name="useRelativeUrl" select="'false'"/>
<xsl:apply-templates> <xsl:apply-templates>
<!-- Publication data --> <!-- Publication data -->
<xsl:with-param name="authors" select="$authors" /> <xsl:with-param name="authors" select="$authors"/>
<xsl:with-param name="issue" select="$issue" /> <xsl:with-param name="issue" select="$issue"/>
<xsl:with-param name="journal" select="$journal" /> <xsl:with-param name="journal" select="$journal"/>
<xsl:with-param name="misc" select="$misc" /> <xsl:with-param name="misc" select="$misc"/>
<xsl:with-param name="pagesFrom" select="$pagesFrom" /> <xsl:with-param name="pagesFrom" select="$pagesFrom"/>
<xsl:with-param name="pagesTo" select="$pagesTo" /> <xsl:with-param name="pagesTo" select="$pagesTo"/>
<xsl:with-param name="publicationDate" <xsl:with-param name="publicationDate" select="$publicationDate"/>
select="$publicationDate" /> <xsl:with-param name="reviewed" select="$reviewed"/>
<xsl:with-param name="reviewed" select="$reviewed" /> <xsl:with-param name="series" select="$series"/>
<xsl:with-param name="series" select="$series" /> <xsl:with-param name="title" select="$title"/>
<xsl:with-param name="title" select="$title" /> <xsl:with-param name="volume" select="$volume"/>
<xsl:with-param name="volume" select="$volume" /> <xsl:with-param name="year" select="$year"/>
<xsl:with-param name="year" select="$year" />
<!-- Technical data --> <!-- Technical data -->
<xsl:with-param name="oid" select="$oid" /> <xsl:with-param name="oid" select="$oid" />
<xsl:with-param name="useRelativeUrl" <xsl:with-param name="useRelativeUrl"