From d35d482c7a1bb97abbad92ff90e5dfbe2ed3f0c9 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 17 Mar 2014 16:48:46 +0000
Subject: [PATCH] Mandalay-YAML Branch auf aktuellen Stand gebracht

git-svn-id: https://svn.libreccm.org/ccm/trunk@2569 8810af33-2d31-482b-a856-94f89814c4df
---
 .../mandalay-yaml/lang/de/languageCodes.xml   | 34 ++++++++++
 .../mandalay-yaml/lang/en/languageCodes.xml   | 34 ++++++++++
 .../layout/PortletDataProvider.xml            | 12 ++++
 .../themes/mandalay-yaml/settings/start.xml   |  3 +
 .../user/includes/piwik/piwik.xsl             | 64 ++++++++++---------
 .../includes/types/SciPublications/common.xsl | 28 +++-----
 6 files changed, 124 insertions(+), 51 deletions(-)
 create mode 100644 ccm-sci-bundle/web/themes/mandalay-yaml/lang/de/languageCodes.xml
 create mode 100644 ccm-sci-bundle/web/themes/mandalay-yaml/lang/en/languageCodes.xml
 create mode 100644 ccm-sci-bundle/web/themes/mandalay-yaml/layout/PortletDataProvider.xml

diff --git a/ccm-sci-bundle/web/themes/mandalay-yaml/lang/de/languageCodes.xml b/ccm-sci-bundle/web/themes/mandalay-yaml/lang/de/languageCodes.xml
new file mode 100644
index 000000000..e2e00b9f7
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay-yaml/lang/de/languageCodes.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 
+    Copyright: 2014 Jens Pelzetter
+  
+    This file is part of Mandalay.
+
+    Mandalay is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Mandalay is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<translations>
+  <line id="lang">English</line>
+  <line id="version">0.1</line>
+  
+  <line id="de">Deutsch</line>
+  <line id="de_DE">Deutsch</line>
+  <line id="en">Englisch</line>
+  <line id="en_GB">Englisch</line>
+  <line id="en_US">Englisch</line>
+  <line id="fr">Französisch</line>
+  <line id="it">Italienisch</line>
+  
+</translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay-yaml/lang/en/languageCodes.xml b/ccm-sci-bundle/web/themes/mandalay-yaml/lang/en/languageCodes.xml
new file mode 100644
index 000000000..982dba373
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay-yaml/lang/en/languageCodes.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 
+    Copyright: 2014 Jens Pelzetter
+  
+    This file is part of Mandalay.
+
+    Mandalay is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Mandalay is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<translations>
+  <line id="lang">English</line>
+  <line id="version">0.1</line>
+  
+  <line id="de">German</line>
+  <line id="de_DE">German</line>
+  <line id="en">English</line>
+  <line id="en_GB">English</line>
+  <line id="en_US">English</line>
+  <line id="fr">France</line>
+  <line id="it">Italian</line>
+  
+</translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay-yaml/layout/PortletDataProvider.xml b/ccm-sci-bundle/web/themes/mandalay-yaml/layout/PortletDataProvider.xml
new file mode 100644
index 000000000..b60130578
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay-yaml/layout/PortletDataProvider.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<fragmentLayout>
+    
+    <showContent>
+        <useImage/>
+        <usePageTitle/>
+        <useLeadText/>
+        <useContent/>
+    </showContent>
+    
+</fragmentLayout>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay-yaml/settings/start.xml b/ccm-sci-bundle/web/themes/mandalay-yaml/settings/start.xml
index a3e13efd8..6cfc55eb1 100755
--- a/ccm-sci-bundle/web/themes/mandalay-yaml/settings/start.xml
+++ b/ccm-sci-bundle/web/themes/mandalay-yaml/settings/start.xml
@@ -52,4 +52,7 @@
   <entrypoint application="none" class="weblog">content-center.xml</entrypoint>
 
   <entrypoint application="atoz" class="simplePage">content-center.xml</entrypoint>
+  
+  <entrypoint application="PortletDataProvider" class="simplePage">PortletDataProvider.xml</entrypoint>
+  
 </settings>
diff --git a/ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/piwik/piwik.xsl b/ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/piwik/piwik.xsl
index 62b39a292..210315171 100644
--- a/ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/piwik/piwik.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/piwik/piwik.xsl
@@ -77,38 +77,40 @@ To use the templates definied here follow these steps:
                 exclude-result-prefixes="xsl bebop cms"
                 version="1.0">
 
-  <xsl:template name="piwikJsTracker">
-    <xsl:param name="piwikUrl"/>
-    <xsl:param name="idSite"/>
-    <script type="text/javascript">
-      var pkBaseURL = (("https:" == document.location.protocol) ? "https://<xsl:value-of select="$piwikUrl"/>/" : "http://<xsl:value-of select="$piwikUrl"/>/");
-      document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
-      try {
-      var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", <xsl:value-of select="$idSite"/>);
-      if (!window.location.pathname.match("/^/(preview)//")) {
-        piwikTracker.trackPageView();
-      }
-      piwikTracker.enableLinkTracking();
-      } catch( err ) {}
-    </script>
-  </xsl:template>
+    <xsl:template name="piwikJsTracker">
+        <xsl:param name="piwikUrl"/>
+        <xsl:param name="idSite"/>
+        <script type="text/javascript">
+            <xsl:value-of select="concat('var piwikUrl = &quot;', $piwikUrl, '&quot;')" />
+            <xsl:value-of select="concat('var idSite = ', $idSite)" />
+            var _paq = _paq || [];
+            _paq.push(["trackPageView"]);
+            _paq.push(["enableLinkTracking"]);
 
-  <xsl:template name="piwikImageTracker">
-    <xsl:param name="piwikUrl"/>
-    <xsl:param name="idSite"/>
-    <noscript>
-      <img>
-	<xsl:attribute name="href">
-	  <xsl:value-of disable-output-escaping="no" 
-			select="concat('http://', $piwikUrl, '?idsite=', $idSite, '&amp;rec=1')"/>
-	</xsl:attribute>
-	<xsl:attribute name="style">border:0</xsl:attribute>
-	<xsl:attribute name="alt"></xsl:attribute>
-      </img>
-    </noscript>
+            (function() {
+            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";
+            g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+            })();
+        </script>
+    </xsl:template>
 
-  </xsl:template>
+    <xsl:template name="piwikImageTracker">
+        <xsl:param name="piwikUrl"/>
+        <xsl:param name="idSite"/>
+        <noscript>
+            <img>
+                <xsl:attribute name="href">
+                    <xsl:value-of disable-output-escaping="no" 
+                                  select="concat('http://', $piwikUrl, '?idsite=', $idSite, '&amp;rec=1')"/>
+                </xsl:attribute>
+                <xsl:attribute name="style">border:0</xsl:attribute>
+                <xsl:attribute name="alt"></xsl:attribute>
+            </img>
+        </noscript>
+
+    </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/types/SciPublications/common.xsl b/ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/types/SciPublications/common.xsl
index fbcb410e5..aef13124f 100644
--- a/ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/types/SciPublications/common.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/types/SciPublications/common.xsl
@@ -365,8 +365,7 @@
 
           <a>
             <xsl:attribute name="href">
-              <xsl:text>/redirect/?oid=</xsl:text>
-              <xsl:value-of select="./targetItem/@oid" />
+              <xsl:value-of select="concat('/redirect/?oid=', ./targetItem/@oid)" />
             </xsl:attribute>
             <xsl:attribute name="title">
               <xsl:call-template name="mandalay:shying">
@@ -410,10 +409,7 @@
 
           <a>
             <xsl:attribute name="href">
-              <xsl:text>
-/redirect/?oid=
-</xsl:text>
-              <xsl:value-of select="./targetItem/@oid" />
+              <xsl:value-of select="concat('/redirect/?oid=', ./targetItem/@oid)" />
             </xsl:attribute>
             <xsl:attribute name="title">
               <xsl:call-template name="mandalay:shying">
@@ -435,8 +431,8 @@
         </xsl:when>
         <xsl:otherwise>
           <a>
-            <xsl:attribute name="href">/redirect/?oid=
-              <xsl:value-of select="./targetItem/@oid" />
+            <xsl:attribute name="href">
+              <xsl:value-of select="concat('/redirect/?oid=', ./targetItem/@oid)" />
             </xsl:attribute>
             <xsl:call-template name="mandalay:shying">
               <xsl:with-param name="title">
@@ -464,8 +460,7 @@
                 <span class="moreButton">
                   <a>
                     <xsl:attribute name="href">
-                      <xsl:text>/redirect/?oid=</xsl:text>
-                      <xsl:value-of select="./targetItem/@oid" />
+                      <xsl:value-of select="concat('/redirect/?oid=', ./targetItem/@oid)" />
                     </xsl:attribute>
                     <xsl:attribute name="title">
                       <xsl:call-template name="mandalay:getStaticText">
@@ -600,10 +595,7 @@
 
           <a>
             <xsl:attribute name="href">
-              <xsl:text>
-/redirect/?oid=
-</xsl:text>
-              <xsl:value-of select="./targetItem/@oid" />
+              <xsl:value-of select="concat('/redirect/?oid=', ./targetItem/@oid)" />
             </xsl:attribute>
             <xsl:attribute name="title">
               <xsl:call-template name="mandalay:shying">
@@ -647,10 +639,7 @@
 
           <a>
             <xsl:attribute name="href">
-              <xsl:text>
-/redirect/?oid=
-</xsl:text>
-              <xsl:value-of select="./targetItem/@oid" />
+              <xsl:value-of select="concat('/redirect/?oid=', ./targetItem/@oid)" />
             </xsl:attribute>
             <xsl:attribute name="title">
               <xsl:call-template name="mandalay:shying">
@@ -693,8 +682,7 @@
                 <span class="moreButton">
                   <a>
                     <xsl:attribute name="href">
-                      <xsl:text>/redirect/?oid=</xsl:text>
-                      <xsl:value-of select="./targetItem/@oid"/>
+                      <xsl:value-of select="concat('/redirect/?oid=', ./targetItem/@oid)"/>
                     </xsl:attribute>
                     <xsl:attribute name="title">
                       <xsl:call-template name="mandalay:getStaticText">