From 86e928ba1c1788450e08999114884810f6bb7af3 Mon Sep 17 00:00:00 2001
From: Julien Verneuil <julien.verneuil@calexium.com>
Date: Tue, 28 Jun 2016 14:21:18 +0200
Subject: [PATCH] make "piwik_js_code" function return HTML_Head_Tag (meta) instead of a String

---
 web/piwik/CXM_piwik.anubis | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/web/piwik/CXM_piwik.anubis b/web/piwik/CXM_piwik.anubis
index b9c852b..7713e51 100644
--- a/web/piwik/CXM_piwik.anubis
+++ b/web/piwik/CXM_piwik.anubis
@@ -11,31 +11,33 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 
+read calexium_lib/web/CXM_making_a_web_site.anubis
 read tools/basis.anubis
 
 // this js code is to include in the <head> section of a webpage, it enable Piwik tracking for the given site/domains (Note: Only if the website was added to the Piwik tracker)
-public define String
+public define HTML_Head_Tag
   piwik_js_code
   (
     String       piwik_tracker,
     Int          site_id,
     List(String) piwik_domains
   )=
-  "
-    <!-- Piwik -->
-    <script type=\"text/javascript\">
-      var _paq = _paq || [];
-      _paq.push([\"setDomains\", [" + concat(piwik_domains, ",") + "]]);
-      _paq.push(['trackPageView']);
-      _paq.push(['enableLinkTracking']);
-      (function() {
-        var u=\"//" + piwik_tracker + "/\";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', " + site_id + " ]);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-      })();
-    </script>
-    <noscript><p><img src=\"//" + piwik_tracker + "/piwik.php?idsite=" + site_id + "\" style=\"border:0;\" alt=\"\" /></p></noscript>
-    <!-- End Piwik Code -->
-  ".
+    meta(literal(
+      "
+        <!-- Piwik -->
+        <script type=\"text/javascript\">
+          var _paq = _paq || [];
+          _paq.push([\"setDomains\", [" + concat(map((String domain) |-> "\"" + domain + "\"", piwik_domains), ",") + "]]);
+          _paq.push(['trackPageView']);
+          _paq.push(['enableLinkTracking']);
+          (function() {
+            var u=\"//" + piwik_tracker + "/\";
+            _paq.push(['setTrackerUrl', u+'piwik.php']);
+            _paq.push(['setSiteId', " + site_id + " ]);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+          })();
+        </script>
+        <noscript><p><img src=\"//" + piwik_tracker + "/piwik.php?idsite=" + site_id + "\" style=\"border:0;\" alt=\"\" /></p></noscript>
+        <!-- End Piwik Code -->
+      ")).
--
libgit2 0.21.4

