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

Small addition for Foundry: The end date of an event is only shown when it is not equal to the start date (can be overridden by the 

show-always attribute)


git-svn-id: https://svn.libreccm.org/ccm/trunk@3550 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-08-05 17:08:34 +00:00
parent 0f2473a873
commit 049fb8e3bb
1 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/event.xsl
View File

@ -77,21 +77,45 @@
<xsl:template match="/content-item-layout//end-date"> <xsl:template match="/content-item-layout//end-date">
<xsl:param name="contentitem-tree" tunnel="yes"/> <xsl:param name="contentitem-tree" tunnel="yes"/>
<xsl:choose> <xsl:variable name="start-date">
<xsl:when test="$contentitem-tree/endDate"> <xsl:choose>
<xsl:call-template name="foundry:format-date"> <xsl:when test="$contentitem-tree/startDate">
<xsl:with-param name="date-elem" select="$contentitem-tree/endDate"/> <xsl:value-of select="$contentitem-tree/startDate"/>
<xsl:with-param name="date-format" select="./date-format"/> </xsl:when>
</xsl:call-template> <xsl:when test="$contentitem-tree/nav:attribute[@name = 'startDate']">
</xsl:when> <xsl:value-of select="$contentitem-tree/nav:attribute[@name = 'startDate']"/>
<xsl:when test="$contentitem-tree/nav:attribute[@name = 'endDate']"> </xsl:when>
<xsl:call-template name="foundry:format-date"> </xsl:choose>
<xsl:with-param name="date-elem" </xsl:variable>
<xsl:variable name="end-date">
<xsl:choose>
<xsl:when test="$contentitem-tree/endDate">
<xsl:value-of select="$contentitem-tree/endDate"/>
</xsl:when>
<xsl:when test="$contentitem-tree/nav:attribute[@name = 'endDate']">
<xsl:value-of select="$contentitem-tree/nav:attribute[@name = 'endDate']"/>
</xsl:when>
</xsl:choose>
</xsl:variable>
<xsl:if test="($start-date != $end-date) or foundry:boolean(./@show-always)">
<xsl:choose>
<xsl:when test="$contentitem-tree/endDate">
<xsl:call-template name="foundry:format-date">
<xsl:with-param name="date-elem" select="$contentitem-tree/endDate"/>
<xsl:with-param name="date-format" select="./date-format"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$contentitem-tree/nav:attribute[@name = 'endDate']">
<xsl:call-template name="foundry:format-date">
<xsl:with-param name="date-elem"
select="$contentitem-tree/nav:attribute[@name = 'endDate']"/> select="$contentitem-tree/nav:attribute[@name = 'endDate']"/>
<xsl:with-param name="date-format" select="./date-format"/> <xsl:with-param name="date-format" select="./date-format"/>
</xsl:call-template> </xsl:call-template>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:if>
</xsl:template> </xsl:template>
<foundry:doc section="user" type="template-tag"> <foundry:doc section="user" type="template-tag">
@ -177,7 +201,7 @@
<xsl:choose> <xsl:choose>
<xsl:when test="$contentitem-tree/location"> <xsl:when test="$contentitem-tree/location">
<xsl:value-of disable-output-escaping="yes" <xsl:value-of disable-output-escaping="yes"
select="$contentitem-tree/location"/> select="$contentitem-tree/location"/>
</xsl:when> </xsl:when>
<xsl:when test="$contentitem-tree/nav:attribute[@name = 'location']"> <xsl:when test="$contentitem-tree/nav:attribute[@name = 'location']">
<xsl:value-of disable-output-escaping="yes" <xsl:value-of disable-output-escaping="yes"
@ -226,7 +250,7 @@
</xsl:template> </xsl:template>
<foundry:doc section="user" type="template-tag"> <foundry:doc section="user" type="template-tag">
<foundry:doc-desc> <foundry:doc-desc>
<p> <p>
Outputs the value of the date addendum property of an event. Outputs the value of the date addendum property of an event.
@ -242,7 +266,7 @@
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
<foundry:doc section="user" type="template-tag"> <foundry:doc section="user" type="template-tag">
<foundry:doc-desc> <foundry:doc-desc>
<p> <p>
Outputs the value of the event date addendum text of an event. Outputs the value of the event date addendum text of an event.