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-94f89814c4dfmaster
parent
7e646e8be6
commit
33a0ee169b
|
|
@ -275,7 +275,7 @@
|
||||||
<xsl:call-template name="mandalay:getSetting">
|
<xsl:call-template name="mandalay:getSetting">
|
||||||
<xsl:with-param name="module" select="'SciMember'"/>
|
<xsl:with-param name="module" select="'SciMember'"/>
|
||||||
<xsl:with-param name="setting" select="concat('contactentry/',./keyId,'/show')"/>
|
<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:call-template>
|
||||||
</xsl:variable>
|
</xsl:variable>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -316,9 +316,13 @@
|
||||||
<xsl:value-of select="./contacts/contact[@contactType='commonContact']/address/address"/>
|
<xsl:value-of select="./contacts/contact[@contactType='commonContact']/address/address"/>
|
||||||
</span>
|
</span>
|
||||||
<span class="postalCodeCity">
|
<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> </span>
|
<span> </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>
|
||||||
</span>
|
</span>
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
|
|
@ -332,7 +336,7 @@
|
||||||
<xsl:with-param name="setting"
|
<xsl:with-param name="setting"
|
||||||
select="concat('contactentry/',./keyId,'/show')" />
|
select="concat('contactentry/',./keyId,'/show')" />
|
||||||
<xsl:with-param name="default"
|
<xsl:with-param name="default"
|
||||||
select="true" />
|
select="'true'" />
|
||||||
</xsl:call-template>
|
</xsl:call-template>
|
||||||
</xsl:variable>
|
</xsl:variable>
|
||||||
<xsl:if test="($showContactEntry = 'true') or (string-length($showContactEntry) = 0)">
|
<xsl:if test="($showContactEntry = 'true') or (string-length($showContactEntry) = 0)">
|
||||||
|
|
|
||||||
|
|
@ -21,15 +21,14 @@
|
||||||
along with Mandalay. If not, see <http://www.gnu.org/licenses/>.
|
along with Mandalay. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<xsl:stylesheet
|
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
|
||||||
xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
|
xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
|
||||||
xmlns:nav="http://ccm.redhat.com/navigation"
|
xmlns:nav="http://ccm.redhat.com/navigation"
|
||||||
xmlns:cms="http://www.arsdigita.com/cms/1.0"
|
xmlns:cms="http://www.arsdigita.com/cms/1.0"
|
||||||
xmlns:mandalay="http://mandalay.quasiweb.de"
|
xmlns:mandalay="http://mandalay.quasiweb.de"
|
||||||
exclude-result-prefixes="xsl bebop cms nav mandalay"
|
exclude-result-prefixes="xsl bebop cms nav mandalay"
|
||||||
version="1.0"
|
version="1.0"
|
||||||
>
|
>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
****************************************************
|
****************************************************
|
||||||
|
|
@ -264,7 +263,7 @@
|
||||||
<xsl:call-template name="mandalay:getSetting">
|
<xsl:call-template name="mandalay:getSetting">
|
||||||
<xsl:with-param name="module" select="'SciInstitute'"/>
|
<xsl:with-param name="module" select="'SciInstitute'"/>
|
||||||
<xsl:with-param name="setting" select="concat('membersTab/',$selectedStatus,'/contactentry/',./keyId,'/show')"/>
|
<xsl:with-param name="setting" select="concat('membersTab/',$selectedStatus,'/contactentry/',./keyId,'/show')"/>
|
||||||
<xsl:with-param name="default" select="false"/>
|
<xsl:with-param name="default" select="'false'"/>
|
||||||
</xsl:call-template>
|
</xsl:call-template>
|
||||||
</xsl:variable>
|
</xsl:variable>
|
||||||
|
|
||||||
|
|
@ -306,7 +305,7 @@
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
<br/>
|
<br/>
|
||||||
<!-- <xsl:text> </xsl:text>-->
|
<!-- <xsl:text> </xsl:text>-->
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
</xsl:for-each>
|
</xsl:for-each>
|
||||||
<xsl:if test="($showAddress = 'true') and (string-length(./contacts/address/address) > 0)">
|
<xsl:if test="($showAddress = 'true') and (string-length(./contacts/address/address) > 0)">
|
||||||
|
|
@ -333,7 +332,7 @@
|
||||||
</span>
|
</span>
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
|
|
||||||
<!-- <xsl:if test="($showPhone = 'true') and (./contacts/contactentries[keyId='phoneOffice'])">
|
<!-- <xsl:if test="($showPhone = 'true') and (./contacts/contactentries[keyId='phoneOffice'])">
|
||||||
<span class="contactentry phoneOffice">
|
<span class="contactentry phoneOffice">
|
||||||
<span class="contactentryKey">
|
<span class="contactentryKey">
|
||||||
<xsl:value-of select="./contacts/contactentries[keyId='phoneOffice']/key"/>
|
<xsl:value-of select="./contacts/contactentries[keyId='phoneOffice']/key"/>
|
||||||
|
|
|
||||||
|
|
@ -275,8 +275,7 @@
|
||||||
|
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
<xsl:template name="CT_SciProject_UlList"
|
<xsl:template name="CT_SciProject_UlList">
|
||||||
mode="list_view">
|
|
||||||
<xsl:param name="linkProject" select="'true'"/>
|
<xsl:param name="linkProject" select="'true'"/>
|
||||||
<xsl:param name="showLifespan" select="'true'"/>
|
<xsl:param name="showLifespan" select="'true'"/>
|
||||||
<xsl:param name="showMembers" select="'true'"/>
|
<xsl:param name="showMembers" select="'true'"/>
|
||||||
|
|
@ -302,8 +301,7 @@
|
||||||
</li>
|
</li>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
<xsl:template name="CT_SciProject_ListItem"
|
<xsl:template name="CT_SciProject_ListItem">
|
||||||
mode="list_view">
|
|
||||||
<xsl:param name="linkProject" select="'true'"/>
|
<xsl:param name="linkProject" select="'true'"/>
|
||||||
<xsl:param name="showLifespan" select="'true'"/>
|
<xsl:param name="showLifespan" select="'true'"/>
|
||||||
<xsl:param name="showMembers" select="'true'"/>
|
<xsl:param name="showMembers" select="'true'"/>
|
||||||
|
|
|
||||||
|
|
@ -563,7 +563,7 @@
|
||||||
|
|
||||||
<xsl:with-param name="surname" select="./surname" />
|
<xsl:with-param name="surname" select="./surname" />
|
||||||
<xsl:with-param name="givenName" select="./givenname" />
|
<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="authorsCount" select="count(../author)" />
|
||||||
<xsl:with-param name="position" select="position()" />
|
<xsl:with-param name="position" select="position()" />
|
||||||
</xsl:apply-templates>
|
</xsl:apply-templates>
|
||||||
|
|
|
||||||
|
|
@ -471,7 +471,7 @@
|
||||||
<xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $formatDefFile))/bibrefFormat/bibrefAuthorFormat">
|
<xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $formatDefFile))/bibrefFormat/bibrefAuthorFormat">
|
||||||
<xsl:with-param name="surname" select="./surname"/>
|
<xsl:with-param name="surname" select="./surname"/>
|
||||||
<xsl:with-param name="givenName" select="./givenname" />
|
<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="authorsCount" select="count(../author)" />
|
||||||
<xsl:with-param name="position" select="position()" />
|
<xsl:with-param name="position" select="position()" />
|
||||||
</xsl:apply-templates>
|
</xsl:apply-templates>
|
||||||
|
|
|
||||||
|
|
@ -709,7 +709,7 @@
|
||||||
<xsl:param name="authors" />
|
<xsl:param name="authors" />
|
||||||
<xsl:param name="authorText" />
|
<xsl:param name="authorText" />
|
||||||
<xsl:param name="authorsText" />
|
<xsl:param name="authorsText" />
|
||||||
<xsl:param name="setEditorText" select="true" />
|
<xsl:param name="setEditorText" select="'true'" />
|
||||||
<xsl:variable name="formatDefFile">
|
<xsl:variable name="formatDefFile">
|
||||||
<xsl:call-template name="mandalay:getSetting">
|
<xsl:call-template name="mandalay:getSetting">
|
||||||
<xsl:with-param name="module" select="'SciPublications'" />
|
<xsl:with-param name="module" select="'SciPublications'" />
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue