Merge pull request #341 from rivaldi8/DS-1524
DS-1524 Incorrect use of Creative Commons corporate logo.
After Width: | Height: | Size: 5.2 KiB |
After Width: | Height: | Size: 5.3 KiB |
After Width: | Height: | Size: 5.0 KiB |
After Width: | Height: | Size: 4.8 KiB |
After Width: | Height: | Size: 5.0 KiB |
After Width: | Height: | Size: 4.6 KiB |
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 1.1 KiB |
@@ -485,17 +485,10 @@
|
||||
alt="{$ccLicenseName}"
|
||||
title="{$ccLicenseName}"
|
||||
>
|
||||
<img>
|
||||
<xsl:attribute name="src">
|
||||
<xsl:value-of select="concat($theme-path,'/images/cc-ship.gif')"/>
|
||||
</xsl:attribute>
|
||||
<xsl:attribute name="alt">
|
||||
<xsl:value-of select="$ccLicenseName"/>
|
||||
</xsl:attribute>
|
||||
<xsl:attribute name="style">
|
||||
<xsl:text>float:left; margin:0em 1em 0em 0em; border:none;</xsl:text>
|
||||
</xsl:attribute>
|
||||
</img>
|
||||
<xsl:call-template name="cc-logo">
|
||||
<xsl:with-param name="ccLicenseName" select="$ccLicenseName"/>
|
||||
<xsl:with-param name="ccLicenseUri" select="$ccLicenseUri"/>
|
||||
</xsl:call-template>
|
||||
</a>
|
||||
<span>
|
||||
<xsl:attribute name="style">
|
||||
@@ -508,6 +501,66 @@
|
||||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="cc-logo">
|
||||
<xsl:param name="ccLicenseName"/>
|
||||
<xsl:param name="ccLicenseUri"/>
|
||||
<xsl:variable name="ccLogo">
|
||||
<xsl:choose>
|
||||
<xsl:when test="starts-with($ccLicenseUri,
|
||||
'http://creativecommons.org/licenses/by/')">
|
||||
<xsl:value-of select="'cc-by.png'" />
|
||||
</xsl:when>
|
||||
<xsl:when test="starts-with($ccLicenseUri,
|
||||
'http://creativecommons.org/licenses/by-sa/')">
|
||||
<xsl:value-of select="'cc-by-sa.png'" />
|
||||
</xsl:when>
|
||||
<xsl:when test="starts-with($ccLicenseUri,
|
||||
'http://creativecommons.org/licenses/by-nd/')">
|
||||
<xsl:value-of select="'cc-by-nd.png'" />
|
||||
</xsl:when>
|
||||
<xsl:when test="starts-with($ccLicenseUri,
|
||||
'http://creativecommons.org/licenses/by-nc/')">
|
||||
<xsl:value-of select="'cc-by-nc.png'" />
|
||||
</xsl:when>
|
||||
<xsl:when test="starts-with($ccLicenseUri,
|
||||
'http://creativecommons.org/licenses/by-nc-sa/')">
|
||||
<xsl:value-of select="'cc-by-nc-sa.png'" />
|
||||
</xsl:when>
|
||||
<xsl:when test="starts-with($ccLicenseUri,
|
||||
'http://creativecommons.org/licenses/by-nc-nd/')">
|
||||
<xsl:value-of select="'cc-by-nc-nd.png'" />
|
||||
</xsl:when>
|
||||
<xsl:when test="starts-with($ccLicenseUri,
|
||||
'http://creativecommons.org/publicdomain/zero/')">
|
||||
<xsl:value-of select="'cc-zero.png'" />
|
||||
</xsl:when>
|
||||
<xsl:when test="starts-with($ccLicenseUri,
|
||||
'http://creativecommons.org/publicdomain/mark/')">
|
||||
<xsl:value-of select="'cc-mark.png'" />
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="'cc-generic.png'" />
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="ccLogoImgSrc">
|
||||
<xsl:value-of select="$theme-path"/>
|
||||
<xsl:text>/images/creativecommons/</xsl:text>
|
||||
<xsl:value-of select="$ccLogo"/>
|
||||
</xsl:variable>
|
||||
<img>
|
||||
<xsl:attribute name="src">
|
||||
<xsl:value-of select="$ccLogoImgSrc"/>
|
||||
</xsl:attribute>
|
||||
<xsl:attribute name="alt">
|
||||
<xsl:value-of select="$ccLicenseName"/>
|
||||
</xsl:attribute>
|
||||
<xsl:attribute name="style">
|
||||
<xsl:text>float:left; margin:0em 1em 0em 0em; border:none;</xsl:text>
|
||||
</xsl:attribute>
|
||||
</img>
|
||||
</xsl:template>
|
||||
|
||||
<!-- Like the header, the footer contains various miscellaneous text, links, and image placeholders -->
|
||||
<xsl:template name="buildFooter">
|
||||
<div id="ds-footer-wrapper">
|
||||
|