Some small changes to make Mandalay work with SaxonHE 9.5

git-svn-id: https://svn.libreccm.org/ccm/trunk@2879 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-09-26 07:36:49 +00:00
parent 7e646e8be6
commit 33a0ee169b
8 changed files with 421 additions and 420 deletions

View File

@ -275,7 +275,7 @@
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciMember'"/>
<xsl:with-param name="setting" select="concat('contactentry/',./keyId,'/show')"/>
<xsl:with-param name="default" select="true"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>

View File

@ -21,13 +21,13 @@
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:mandalay="http://mandalay.quasiweb.de"
xmlns:dabin="http://dabin.quasiweb.de"
exclude-result-prefixes="xsl bebop cms mandalay dabin"
version="1.0">
xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:mandalay="http://mandalay.quasiweb.de"
xmlns:dabin="http://dabin.quasiweb.de"
exclude-result-prefixes="xsl bebop cms mandalay dabin"
version="1.0">
<xsl:import href="Organization/Organization.xsl"/>
<xsl:import href="Organization/Organization.xsl"/>
</xsl:stylesheet>

View File

@ -27,76 +27,76 @@
xmlns:mandalay="http://mandalay.quasiweb.de"
exclude-result-prefixes="xsl bebop cms nav"
version="1.0">
<!-- DE Leadtext -->
<!-- EN lead text view -->
<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="lead">
<xsl:variable name="setLeadText">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setLeadText'"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<!-- DE Leadtext -->
<!-- EN lead text view -->
<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="lead">
<xsl:variable name="setLeadText">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setLeadText'"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<xsl:if test="./lead and $setLeadText = 'true'">
<div class="lead">
<xsl:value-of disable-output-escaping="yes" select="./lead"/>
</div>
</xsl:if>
</xsl:template>
<xsl:if test="./lead and $setLeadText = 'true'">
<div class="lead">
<xsl:value-of disable-output-escaping="yes" select="./lead"/>
</div>
</xsl:if>
</xsl:template>
<!-- DE Bild -->
<!-- EN image -->
<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="image">
<!-- DE Bild -->
<!-- EN image -->
<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="image">
<!-- DE Hole alle benötigten Einstellungen-->
<!-- EN Getting all needed setting-->
<xsl:variable name="setImage">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setImage'"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="setImageMaxHeight">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setImageMaxHeight'"/>
<xsl:with-param name="default" select="''"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="setImageMaxWidth">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setImageMaxWidth'"/>
<xsl:with-param name="default" select="''"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="setImageCaption">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setImageCaption'"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<!-- DE Hole alle benötigten Einstellungen-->
<!-- EN Getting all needed setting-->
<xsl:variable name="setImage">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setImage'"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="setImageMaxHeight">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setImageMaxHeight'"/>
<xsl:with-param name="default" select="''"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="setImageMaxWidth">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setImageMaxWidth'"/>
<xsl:with-param name="default" select="''"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="setImageCaption">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'Organization'"/>
<xsl:with-param name="setting" select="'setImageCaption'"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<xsl:if test="$setImage = 'true'">
<xsl:call-template name="mandalay:imageAttachment">
<xsl:with-param name="showCaption" select="$setImageCaption"/>
<xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
<xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
</xsl:call-template>
</xsl:if>
</xsl:template>
<xsl:if test="$setImage = 'true'">
<xsl:call-template name="mandalay:imageAttachment">
<xsl:with-param name="showCaption" select="$setImageCaption"/>
<xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
<xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
</xsl:call-template>
</xsl:if>
</xsl:template>
<xsl:template name="CT_Organization_graphics"
match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']"
mode="detailed_view">
<!-- DE Hole alle benötigten Einstellungen-->
<!-- EN Getting all needed setting-->
<p>
<xsl:value-of select="./OrganizationDescription" />
</p>
<p>
<xsl:value-of select="./OrganizationDescription" />
</p>
</xsl:template>
<xsl:template name="CT_OrganizationList"
match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.Organization']"
@ -204,17 +204,17 @@
</xsl:call-template>
</xsl:variable>
<xsl:if test="$setImage = 'true'">
<xsl:call-template name="mandalay:imageAttachment">
<xsl:with-param name="showCaption"
<xsl:call-template name="mandalay:imageAttachment">
<xsl:with-param name="showCaption"
select="$setImageCaption" />
<xsl:with-param name="maxHeight"
<xsl:with-param name="maxHeight"
select="$setImageMaxHeight" />
<xsl:with-param name="maxWidth"
<xsl:with-param name="maxWidth"
select="$setImageMaxWidth" />
<xsl:with-param name="setZoomLink"
<xsl:with-param name="setZoomLink"
select="false"/>
</xsl:call-template>
</xsl:if>
</xsl:call-template>
</xsl:if>
<xsl:choose>
<xsl:when test="$setLinkToDetails = 'true' or (string-length(nav:attribute[@name='lead']) &gt; $setLeadTextLength and $setLeadTextLength != '0')">
<a class="CIname">
@ -316,9 +316,13 @@
<xsl:value-of select="./contacts/contact[@contactType='commonContact']/address/address"/>
</span>
<span class="postalCodeCity">
<span class="postalCode"><xsl:value-of select="./contacts/contact[@contactType='commonContact']/address/postalCode"/></span>
<span class="postalCode">
<xsl:value-of select="./contacts/contact[@contactType='commonContact']/address/postalCode"/>
</span>
<span>&nbsp;</span>
<span class="postalCode"><xsl:value-of select="./contacts/contact[@contactType='commonContact']/address/city"/></span>
<span class="postalCode">
<xsl:value-of select="./contacts/contact[@contactType='commonContact']/address/city"/>
</span>
</span>
</span>
</xsl:if>
@ -332,7 +336,7 @@
<xsl:with-param name="setting"
select="concat('contactentry/',./keyId,'/show')" />
<xsl:with-param name="default"
select="true" />
select="'true'" />
</xsl:call-template>
</xsl:variable>
<xsl:if test="($showContactEntry = 'true') or (string-length($showContactEntry) = 0)">

View File

@ -21,357 +21,356 @@
along with Mandalay. If not, see <http://www.gnu.org/licenses/>.
-->
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:mandalay="http://mandalay.quasiweb.de"
exclude-result-prefixes="xsl bebop cms nav mandalay"
version="1.0"
>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:mandalay="http://mandalay.quasiweb.de"
exclude-result-prefixes="xsl bebop cms nav mandalay"
version="1.0"
>
<!--
****************************************************
** Template for the Members Tab for a SciProject **
****************************************************
-->
<!--
****************************************************
** Template for the Members Tab for a SciProject **
****************************************************
-->
<xsl:template name="CT_SciInstitute_graphics"
match="instituteMembers"
mode="tabs">
<xsl:template name="CT_SciInstitute_graphics"
match="instituteMembers"
mode="tabs">
<xsl:variable name="setShowHeading">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="'tabs/setShowHeading'"/>
<xsl:with-param name="default" select="'false'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="linkMembers">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="'membersTab/linkMembers'"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="selectedStatus">
<xsl:value-of select="filters/filter[@label='memberStatus']/@selected"/>
</xsl:variable>
<xsl:variable name="showContactData">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/', $selectedStatus, '/showContactData')"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="showAddress">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/', $selectedStatus, '/showAddress')"/>
<xsl:with-param name="default" select="'false'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="setShowHeading">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="'tabs/setShowHeading'"/>
<xsl:with-param name="default" select="'false'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="linkMembers">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="'membersTab/linkMembers'"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="selectedStatus">
<xsl:value-of select="filters/filter[@label='memberStatus']/@selected"/>
</xsl:variable>
<xsl:variable name="showContactData">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/', $selectedStatus, '/showContactData')"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="showAddress">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/', $selectedStatus, '/showAddress')"/>
<xsl:with-param name="default" select="'false'"/>
</xsl:call-template>
</xsl:variable>
<div class="activeTab">
<div class="activeTab">
<xsl:if test="$setShowHeading = 'true'">
<h2>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/heading'"/>
</xsl:call-template>
</h2>
</xsl:if>
<xsl:if test="$setShowHeading = 'true'">
<h2>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/heading'"/>
</xsl:call-template>
</h2>
</xsl:if>
<xsl:if test="./filters">
<form action="" method="get" accept-charset="UTF-8">
<input type="hidden" name="selectedTab">
<xsl:attribute name="value">
<xsl:value-of select="../../availableTabs/availableTab[@selected='true']/@label"/>
</xsl:attribute>
</input>
<fieldset>
<legend>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/filters/heading'"/>
</xsl:call-template>
</legend>
<xsl:if test="./filters">
<form action="" method="get" accept-charset="UTF-8">
<input type="hidden" name="selectedTab">
<xsl:attribute name="value">
<xsl:value-of select="../../availableTabs/availableTab[@selected='true']/@label"/>
</xsl:attribute>
</input>
<fieldset>
<legend>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/filters/heading'"/>
</xsl:call-template>
</legend>
<xsl:for-each select="./filters/filter">
<xsl:choose>
<xsl:when test="./@type = 'compare'">
<label>
<xsl:attribute name="for">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="concat('membersTab/filters/', ./@label, '/label')"/>
</xsl:call-template>
</label>
<select size="1">
<xsl:attribute name="id">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:attribute name="name">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:for-each select="./option">
<option>
<xsl:if test="./@label = ../@selected">
<xsl:attribute name="selected">selected</xsl:attribute>
</xsl:if>
<xsl:attribute name="value">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="concat('membersTab/filters/', ../@label, '/', ./@label)"/>
</xsl:call-template>
</option>
</xsl:for-each>
</select>
</xsl:when>
<xsl:when test="./@type = 'text'">
<label>
<xsl:attribute name="for">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="concat('membersTab/filters/', ./@label, '/label')"/>
</xsl:call-template>
</label>
<input type="text">
<xsl:attribute name="id">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:attribute name="name">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:attribute name="size">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/filters/', ./@label, '/size')"/>
<xsl:with-param name="default" select="'16'"/>
</xsl:call-template>
</xsl:attribute>
<xsl:attribute name="maxlength">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/filters/', ./@label, '/maxlength')"/>
<xsl:with-param name="default" select="'256'"/>
</xsl:call-template>
</xsl:attribute>
<xsl:if test="./@value">
<xsl:attribute name="value">
<xsl:value-of select="./@value"/>
</xsl:attribute>
</xsl:if>
</input>
</xsl:when>
</xsl:choose>
</xsl:for-each>
<xsl:for-each select="./filters/filter">
<xsl:choose>
<xsl:when test="./@type = 'compare'">
<label>
<xsl:attribute name="for">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="concat('membersTab/filters/', ./@label, '/label')"/>
</xsl:call-template>
</label>
<select size="1">
<xsl:attribute name="id">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:attribute name="name">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:for-each select="./option">
<option>
<xsl:if test="./@label = ../@selected">
<xsl:attribute name="selected">selected</xsl:attribute>
</xsl:if>
<xsl:attribute name="value">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="concat('membersTab/filters/', ../@label, '/', ./@label)"/>
</xsl:call-template>
</option>
</xsl:for-each>
</select>
</xsl:when>
<xsl:when test="./@type = 'text'">
<label>
<xsl:attribute name="for">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="concat('membersTab/filters/', ./@label, '/label')"/>
</xsl:call-template>
</label>
<input type="text">
<xsl:attribute name="id">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:attribute name="name">
<xsl:value-of select="./@label"/>
</xsl:attribute>
<xsl:attribute name="size">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/filters/', ./@label, '/size')"/>
<xsl:with-param name="default" select="'16'"/>
</xsl:call-template>
</xsl:attribute>
<xsl:attribute name="maxlength">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/filters/', ./@label, '/maxlength')"/>
<xsl:with-param name="default" select="'256'"/>
</xsl:call-template>
</xsl:attribute>
<xsl:if test="./@value">
<xsl:attribute name="value">
<xsl:value-of select="./@value"/>
</xsl:attribute>
</xsl:if>
</input>
</xsl:when>
</xsl:choose>
</xsl:for-each>
<div class="filterSubmitResetSection">
<input type="submit">
<xsl:attribute name="value">
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/filters/submit'"/>
</xsl:call-template>
</xsl:attribute>
</input>
<a class="completeResetButtonLink">
<xsl:attribute name="href">?selectedTab=<xsl:value-of select="../../availableTabs/availableTab[@selected='true']/@label"/></xsl:attribute>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/filters/reset'"/>
</xsl:call-template>
</a>
<div class="filterSubmitResetSection">
<input type="submit">
<xsl:attribute name="value">
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/filters/submit'"/>
</xsl:call-template>
</xsl:attribute>
</input>
<a class="completeResetButtonLink">
<xsl:attribute name="href">?selectedTab=<xsl:value-of select="../../availableTabs/availableTab[@selected='true']/@label"/></xsl:attribute>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/filters/reset'"/>
</xsl:call-template>
</a>
<!--<input type="reset">
<xsl:attribute name="value">
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/filters/reset'"/>
</xsl:call-template>
</xsl:attribute>
</input>-->
</div>
</fieldset>
</form>
</xsl:if>
<!--<input type="reset">
<xsl:attribute name="value">
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'membersTab/filters/reset'"/>
</xsl:call-template>
</xsl:attribute>
</input>-->
</div>
</fieldset>
</form>
</xsl:if>
<xsl:apply-templates select="./nav:paginator" mode="header"/>
<xsl:apply-templates select="./nav:paginator" mode="navbar"/>
<xsl:apply-templates select="./nav:paginator" mode="header"/>
<xsl:apply-templates select="./nav:paginator" mode="navbar"/>
<ul class="memberList instituteMemberList">
<xsl:for-each select="./member">
<li class="sciMember">
<xsl:choose>
<xsl:when test="($linkMembers = 'true') and ($showContactData = 'true') and (string-length(./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']) &gt; 0)">
<a class="CIname memberName">
<xsl:attribute name="href">
<xsl:value-of select="./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value"/>
</xsl:attribute>
<xsl:if test="string-length(./titlepre) &gt; 0">
<xsl:value-of select="./titlepre"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./givenname"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="string-length(./titlepost) &gt; 0">
<xsl:text>, </xsl:text>
<xsl:value-of select="./titlepost"/>
</xsl:if>
</a>
</xsl:when>
<xsl:otherwise>
<span class="CIname memberName">
<xsl:if test="string-length(./titlepre) &gt; 0">
<xsl:value-of select="./titlepre"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./givenname"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="string-length(./titlepost) &gt; 0">
<xsl:text>, </xsl:text>
<xsl:value-of select="./titlepost"/>
</xsl:if>
</span>
</xsl:otherwise>
</xsl:choose>
<ul class="memberList instituteMemberList">
<xsl:for-each select="./member">
<li class="sciMember">
<xsl:choose>
<xsl:when test="($linkMembers = 'true') and ($showContactData = 'true') and (string-length(./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']) &gt; 0)">
<a class="CIname memberName">
<xsl:attribute name="href">
<xsl:value-of select="./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value"/>
</xsl:attribute>
<xsl:if test="string-length(./titlepre) &gt; 0">
<xsl:value-of select="./titlepre"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./givenname"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="string-length(./titlepost) &gt; 0">
<xsl:text>, </xsl:text>
<xsl:value-of select="./titlepost"/>
</xsl:if>
</a>
</xsl:when>
<xsl:otherwise>
<span class="CIname memberName">
<xsl:if test="string-length(./titlepre) &gt; 0">
<xsl:value-of select="./titlepre"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./givenname"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="string-length(./titlepost) &gt; 0">
<xsl:text>, </xsl:text>
<xsl:value-of select="./titlepost"/>
</xsl:if>
</span>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="$showContactData = 'true'">
<span class="contact">
<xsl:if test="$showContactData = 'true'">
<span class="contact">
<xsl:for-each select="./contacts/contact[@contactType='commonContact']/contactentries">
<xsl:sort select="key"/>
<xsl:variable name="showContactEntry">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/',$selectedStatus,'/contactentry/',./keyId,'/show')"/>
<xsl:with-param name="default" select="false"/>
</xsl:call-template>
</xsl:variable>
<xsl:for-each select="./contacts/contact[@contactType='commonContact']/contactentries">
<xsl:sort select="key"/>
<xsl:variable name="showContactEntry">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="setting" select="concat('membersTab/',$selectedStatus,'/contactentry/',./keyId,'/show')"/>
<xsl:with-param name="default" select="'false'"/>
</xsl:call-template>
</xsl:variable>
<xsl:if test="$showContactEntry = 'true'">
<span class="contactentry">
<span class="contactentryKey">
<xsl:value-of select="./key"/>
<xsl:variable name="separator">
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'GenericContact'"/>
<xsl:with-param name="id" select="'separator'"/>
</xsl:call-template>
</xsl:variable>
<xsl:call-template name="mandalay:string-replace">
<xsl:with-param name="string" select="$separator"/>
<xsl:with-param name="from" select="' '"/>
<xsl:with-param name="to" select="'&nbsp;'"/>
</xsl:call-template>
</span>
<span class="contactentryValue">
<xsl:choose>
<xsl:when test="contains(./value, '@')">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat('mailto:', ./value)"/>
</xsl:attribute>
<xsl:value-of select="./value"/>
</a>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="mandalay:string-replace">
<xsl:with-param name="string" select="./value"/>
<xsl:with-param name="from" select="' '"/>
<xsl:with-param name="to" select="'&nbsp;'"/>
</xsl:call-template>
<!--<xsl:value-of select="./value"/>-->
</xsl:otherwise>
</xsl:choose>
</span>
</span>
<br/>
<!-- <xsl:text> </xsl:text>-->
</xsl:if>
</xsl:for-each>
<xsl:if test="($showAddress = 'true') and (string-length(./contacts/address/address) &gt; 0)">
<br/>
<span class="address">
<xsl:variable name="addressTxt">
<xsl:call-template name="mandalay:string-replace">
<xsl:with-param name="string" select="./contacts/address/address"/>
<xsl:with-param name="from" select="'&#xA;'"/>
<xsl:with-param name="to" select="', '"/>
</xsl:call-template>
</xsl:variable>
<span class="addressTxt">
<xsl:value-of select="$addressTxt"/>
</span>
<xsl:text>, </xsl:text>
<span class="postalCode">
<xsl:value-of select="./contacts/address/postalCode"/>
</span>
<xsl:text> </xsl:text>
<span class="city">
<xsl:value-of select="./contacts/address/city"/>
</span>
</span>
</xsl:if>
<xsl:if test="$showContactEntry = 'true'">
<span class="contactentry">
<span class="contactentryKey">
<xsl:value-of select="./key"/>
<xsl:variable name="separator">
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'GenericContact'"/>
<xsl:with-param name="id" select="'separator'"/>
</xsl:call-template>
</xsl:variable>
<xsl:call-template name="mandalay:string-replace">
<xsl:with-param name="string" select="$separator"/>
<xsl:with-param name="from" select="' '"/>
<xsl:with-param name="to" select="'&nbsp;'"/>
</xsl:call-template>
</span>
<span class="contactentryValue">
<xsl:choose>
<xsl:when test="contains(./value, '@')">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat('mailto:', ./value)"/>
</xsl:attribute>
<xsl:value-of select="./value"/>
</a>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="mandalay:string-replace">
<xsl:with-param name="string" select="./value"/>
<xsl:with-param name="from" select="' '"/>
<xsl:with-param name="to" select="'&nbsp;'"/>
</xsl:call-template>
<!--<xsl:value-of select="./value"/>-->
</xsl:otherwise>
</xsl:choose>
</span>
</span>
<br/>
<!-- <xsl:text> </xsl:text>-->
</xsl:if>
</xsl:for-each>
<xsl:if test="($showAddress = 'true') and (string-length(./contacts/address/address) &gt; 0)">
<br/>
<span class="address">
<xsl:variable name="addressTxt">
<xsl:call-template name="mandalay:string-replace">
<xsl:with-param name="string" select="./contacts/address/address"/>
<xsl:with-param name="from" select="'&#xA;'"/>
<xsl:with-param name="to" select="', '"/>
</xsl:call-template>
</xsl:variable>
<span class="addressTxt">
<xsl:value-of select="$addressTxt"/>
</span>
<xsl:text>, </xsl:text>
<span class="postalCode">
<xsl:value-of select="./contacts/address/postalCode"/>
</span>
<xsl:text> </xsl:text>
<span class="city">
<xsl:value-of select="./contacts/address/city"/>
</span>
</span>
</xsl:if>
<!-- <xsl:if test="($showPhone = 'true') and (./contacts/contactentries[keyId='phoneOffice'])">
<span class="contactentry phoneOffice">
<span class="contactentryKey">
<xsl:value-of select="./contacts/contactentries[keyId='phoneOffice']/key"/>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'GenericContact'"/>
<xsl:with-param name="id" select="'separator'"/>
</xsl:call-template>
</span>
<span class="contactentryValue phone">
<xsl:value-of select="./contacts/contactentries[keyId='phoneOffice']/value"/>
</span>
</span>
</xsl:if>
<xsl:if test="($showEmail = 'true') and (./contacts/contactentries[keyId='email'])">
<span class="contactentry email">
<span class="contactentryKey">
<xsl:value-of select="./contacts/contactentries[keyId='email']/key"/>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'GenericContact'"/>
<xsl:with-param name="id" select="'separator'"/>
</xsl:call-template>
</span>
<span class="contactentryValue email">
<xsl:value-of select="./contacts/contactentries[keyId='email']/value"/>
</span>
</span>
</xsl:if>-->
</span>
</xsl:if>
</li>
</xsl:for-each>
</ul>
<!-- <xsl:if test="($showPhone = 'true') and (./contacts/contactentries[keyId='phoneOffice'])">
<span class="contactentry phoneOffice">
<span class="contactentryKey">
<xsl:value-of select="./contacts/contactentries[keyId='phoneOffice']/key"/>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'GenericContact'"/>
<xsl:with-param name="id" select="'separator'"/>
</xsl:call-template>
</span>
<span class="contactentryValue phone">
<xsl:value-of select="./contacts/contactentries[keyId='phoneOffice']/value"/>
</span>
</span>
</xsl:if>
<xsl:if test="($showEmail = 'true') and (./contacts/contactentries[keyId='email'])">
<span class="contactentry email">
<span class="contactentryKey">
<xsl:value-of select="./contacts/contactentries[keyId='email']/key"/>
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'GenericContact'"/>
<xsl:with-param name="id" select="'separator'"/>
</xsl:call-template>
</span>
<span class="contactentryValue email">
<xsl:value-of select="./contacts/contactentries[keyId='email']/value"/>
</span>
</span>
</xsl:if>-->
</span>
</xsl:if>
</li>
</xsl:for-each>
</ul>
<xsl:apply-templates select="./nav:paginator" mode="navbar"/>
<xsl:apply-templates select="./nav:paginator" mode="navbar"/>
<div class="endFloat"/>
</div>
<div class="endFloat"/>
</div>
</xsl:template>
</xsl:template>
</xsl:stylesheet>

View File

@ -275,8 +275,7 @@
</xsl:template>
<xsl:template name="CT_SciProject_UlList"
mode="list_view">
<xsl:template name="CT_SciProject_UlList">
<xsl:param name="linkProject" select="'true'"/>
<xsl:param name="showLifespan" select="'true'"/>
<xsl:param name="showMembers" select="'true'"/>
@ -302,8 +301,7 @@
</li>
</xsl:template>
<xsl:template name="CT_SciProject_ListItem"
mode="list_view">
<xsl:template name="CT_SciProject_ListItem">
<xsl:param name="linkProject" select="'true'"/>
<xsl:param name="showLifespan" select="'true'"/>
<xsl:param name="showMembers" select="'true'"/>

View File

@ -563,7 +563,7 @@
<xsl:with-param name="surname" select="./surname" />
<xsl:with-param name="givenName" select="./givenname" />
<xsl:with-param name="isEditor" select="false" />
<xsl:with-param name="isEditor" select="'false'" />
<xsl:with-param name="authorsCount" select="count(../author)" />
<xsl:with-param name="position" select="position()" />
</xsl:apply-templates>

View File

@ -471,7 +471,7 @@
<xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $formatDefFile))/bibrefFormat/bibrefAuthorFormat">
<xsl:with-param name="surname" select="./surname"/>
<xsl:with-param name="givenName" select="./givenname" />
<xsl:with-param name="isEditor" select="false" />
<xsl:with-param name="isEditor" select="'false'" />
<xsl:with-param name="authorsCount" select="count(../author)" />
<xsl:with-param name="position" select="position()" />
</xsl:apply-templates>

View File

@ -709,7 +709,7 @@
<xsl:param name="authors" />
<xsl:param name="authorText" />
<xsl:param name="authorsText" />
<xsl:param name="setEditorText" select="true" />
<xsl:param name="setEditorText" select="'true'" />
<xsl:variable name="formatDefFile">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciPublications'" />