Merged some modifications from the FMS theme for the member list with the standard theme.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2603 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-04-03 17:19:08 +00:00
parent 04f4b7cb97
commit 702f03280f
2 changed files with 570 additions and 529 deletions

View File

@ -26,6 +26,9 @@
<setting id="setDescriptionLength">0</setting> <setting id="setDescriptionLength">0</setting>
<setting id="setImage">false</setting> <setting id="setImage">false</setting>
<setting id="linkMembers">true</setting>
<setting id="linkMemberItems">false</setting>
<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>

View File

@ -235,6 +235,13 @@
<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="linkMemberItems">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciMember'"/>
<xsl:with-param name="setting" select="'linkMemberItems'"/>
<xsl:with-param name="default" select="'true'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="separator"> <xsl:variable name="separator">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'GenericContact'"/> <xsl:with-param name="module" select="'GenericContact'"/>
@ -265,6 +272,28 @@
</xsl:if> </xsl:if>
</a> </a>
</xsl:when> </xsl:when>
<xsl:when test="($linkMemberItems = 'true')">
<a class="CIname memberName">
<xsl:attribute name="href">
<xsl:value-of select="normalize-space(nav:path)"/>
</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> <xsl:otherwise>
<span class="CIname memberName"> <span class="CIname memberName">
<xsl:if test="string-length(./titlepre) &gt; 0"> <xsl:if test="string-length(./titlepre) &gt; 0">
@ -391,17 +420,17 @@
</xsl:with-param> </xsl:with-param>
<xsl:with-param name="mode">dynamic</xsl:with-param> <xsl:with-param name="mode">dynamic</xsl:with-param>
</xsl:call-template> </xsl:call-template>
</a> </a>-->
<xsl:if test="nav:attribute[@name='lead'] and $setLeadText = 'true'"> <xsl:if test="./pageDescription and $setLeadText = 'true'">
<br /> <br />
<span class="intro"> <span class="intro">
<xsl:choose> <xsl:choose>
<xsl:when test="$setLeadTextLength = '0'"> <xsl:when test="$setLeadTextLength = '0'">
<xsl:value-of disable-output-escaping="yes" select="nav:attribute[@name='lead']" /> <xsl:value-of disable-output-escaping="yes" select="./pageDescription" />
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" /> <xsl:value-of disable-output-escaping="yes" select="substring(./pageDescription, 1, $setLeadTextLength)" />
<xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength"> <xsl:if test="string-length(./pageDescription) > $setLeadTextLength">
<xsl:text>...</xsl:text> <xsl:text>...</xsl:text>
<xsl:if test="$setMoreButton = 'true'"> <xsl:if test="$setMoreButton = 'true'">
<span class="moreButton"> <span class="moreButton">
@ -424,7 +453,7 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</span> </span>
</xsl:if>--> </xsl:if>
</xsl:template> </xsl:template>
<xsl:template name="CT_SciMember_Link" match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.SciMember']" mode="link_view"> <xsl:template name="CT_SciMember_Link" match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.SciMember']" mode="link_view">
@ -492,7 +521,10 @@
<!-- EN --> <!-- EN -->
<xsl:if test="./targetItem/imageAttachments and $setImage = 'true'"> <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
<a> <a>
<xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute> <xsl:attribute name="href">
<xsl:text>/redirect/?oid=</xsl:text>
<xsl:value-of select="./targetItem/@oid"/>
</xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:shying"> <xsl:call-template name="mandalay:shying">
<xsl:with-param name="title"> <xsl:with-param name="title">
@ -512,7 +544,10 @@
</xsl:if> </xsl:if>
<xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'"> <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
<a class="CIname"> <a class="CIname">
<xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute> <xsl:attribute name="href">
<xsl:text>/redirect/?oid=</xsl:text>
<xsl:value-of select="./targetItem/@oid"/>
</xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:shying"> <xsl:call-template name="mandalay:shying">
<xsl:with-param name="title"> <xsl:with-param name="title">
@ -541,7 +576,10 @@
<xsl:if test="$setMoreButton = 'true'"> <xsl:if test="$setMoreButton = 'true'">
<span class="moreButton"> <span class="moreButton">
<a> <a>
<xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute> <xsl:attribute name="href">
<xsl:text>/redirect/?oid=</xsl:text>
<xsl:value-of select="./targetItem/@oid"/>
</xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciMember'"/> <xsl:with-param name="module" select="'SciMember'"/>