From 6fdc39c8d91401a8030c3898d471192b64504cb2 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 7 Apr 2014 09:03:42 +0000
Subject: [PATCH] - 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
---
 .../mandalay/user/includes/piwik/piwik.xsl    |  4 +--
 .../includes/types/SciMember/SciMember.xsl    | 32 +++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
index 32ed1433c..84d4cebd7 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
@@ -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>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
index 5376e4c2f..e52732122 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
@@ -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, '@')">