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

- BugFix for the Piwik-Integration in Mandalay 

- Integrated an extension from the IfS-Theme. It is now possible to suppress the label for specific contact entries in the list view of SciMember


git-svn-id: https://svn.libreccm.org/ccm/trunk@2605 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-04-07 09:03:42 +00:00
parent 702f03280f
commit 6fdc39c8d9
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
View File

@ -88,7 +88,7 @@ To use the templates definied here follow these steps:
_paq.push(["enableLinkTracking"]);
(function() {
var u=(("https:" == document.location.protocol) ? "https" : "http") + piwikUrl;
var u=(("https:" == document.location.protocol) ? "https" : "http") + '://' + piwikUrl + "/";
_paq.push(["setTrackerUrl", u+"piwik.php"]);
_paq.push(["setSiteId", idSite]);
var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
@ -104,7 +104,7 @@ To use the templates definied here follow these steps:
<img>
<xsl:attribute name="href">
<xsl:value-of disable-output-escaping="no"
select="concat('http://', $piwikUrl, '?idsite=', $idSite, '&amp;rec=1')"/>
select="concat('http://', $piwikUrl, '/piwik.php?idsite=', $idSite, '&amp;rec=1')"/>
</xsl:attribute>
<xsl:attribute name="style">border:0</xsl:attribute>
<xsl:attribute name="alt"></xsl:attribute>

32
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
View File

@ -332,19 +332,31 @@
</xsl:call-template>
</xsl:variable>
<xsl:variable name="omitContactEntryKey">
<xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciMember'"/>
<xsl:with-param name="setting" select="concat('contactentry/',$keyId,'/omitKey')"/>
<xsl:with-param name="default" select="'false'"/>
</xsl:call-template>
</xsl:variable>
<xsl:if test="($showContactEntry = 'true')">
<xsl:for-each select="../../contactentries[keyId=$keyId]">
<span class="contactentry">
<span class="contactentryKey">
<xsl:value-of select="./key"/>
<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>
<xsl:attribute name="class">
<xsl:value-of select="concat('contactentry contactentry_', $keyId)"/>
</xsl:attribute>
<xsl:if test="$omitContactEntryKey = 'false'">
<span class="contactentryKey">
<xsl:value-of select="./key"/>
<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>
</xsl:if>
<span class="contactentryValue">
<xsl:choose>
<xsl:when test="(substring(./value, 1, 7) = 'http://') or (substring(./value, 1, 3) = 'www') or contains(./value, '@')">