From cff6d31ce6f6b0d46e03c9a83715e25c37ab14d3 Mon Sep 17 00:00:00 2001
From: DanielSeifert <ds@shopmodule.com>
Date: Mon, 20 Oct 2014 11:39:32 +0000
Subject: [PATCH] optical changes for mobile theme use (#2998)

---
 .gitattributes                                        |  1 +
 .../views/blocks/layout/d3_base_googleanalytics.tpl   |  3 +++
 copy_this/modules/d3/d3_googleanalytics/metadata.php  |  4 ++--
 .../components/d3_oxcmp_utils_googleanalytics.php     | 11 +++++++++++
 .../out/src/d3_googleanalytics_mobile.css             |  3 +++
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css

diff --git a/.gitattributes b/.gitattributes
index d5c009a..3db4ae3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -45,6 +45,7 @@ copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasket_googleanalyti
 copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasketitem_googleanalytics.php -text
 copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php -text
 copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics.css -text
+copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css -text
 copy_this/modules/d3/d3_googleanalytics/picture.png -text
 copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php -text
 copy_this/modules/d3/d3_googleanalytics/translations/de/d3_googleanalytics_lang.php -text
diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl
index bb24611..c0508da 100644
--- a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl
+++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl
@@ -8,4 +8,7 @@
         Because of this reason, it can't included in d3modcfgcheck block. *}]
     [{include file=$sD3GATTpl}]
     [{oxstyle include=$oViewConf->getModuleUrl('d3_googleanalytics', 'out/src/d3_googleanalytics.css')}]
+    [{if $blD3GAIsMobile}]
+        [{oxstyle include=$oViewConf->getModuleUrl('d3_googleanalytics', 'out/src/d3_googleanalytics_mobile.css')}]
+    [{/if}]
 [{/if}]
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/metadata.php b/copy_this/modules/d3/d3_googleanalytics/metadata.php
index a07dae3..1b47b7e 100644
--- a/copy_this/modules/d3/d3_googleanalytics/metadata.php
+++ b/copy_this/modules/d3/d3_googleanalytics/metadata.php
@@ -34,8 +34,8 @@ $aModule = array(
             'de'   => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-'.
                 'Kontos in Ihren Shop zur Verf&uuml;gung. Hierbei werden &uuml;ber standardisierte Schnittstellen die '.
                 'Besucherdaten und eCommerce-Daten zu Google &uuml;bertragen. Ebenfalls &uuml;bermittelt werden Daten '.
-                'der Website-Suche. Weiterhin können über das Modul Shopdaten an Google Adwords und Google Trusted '.
-                'Shops übertragen werden.',
+                'der Website-Suche. Weiterhin k&ouml;nnen &uuml;ber das Modul Shopdaten an Google Adwords und Google '.
+                'Trusted Shops &uuml;bertragen werden.',
             'en'   => 'Provides a quick and easy integration with your Google Analytics, Google Adwords and Google '.
                 'Trusted Shops account to your shop.',
     ),
diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php b/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
index 9f431e3..27d8f01 100644
--- a/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
+++ b/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
@@ -52,6 +52,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
             $oParentView->addTplParam('sAFEGetMoreUrls', $this->afGetMoreUrls());
             $oParentView->addTplParam('sD3GASendPageViewParameter', $this->d3getSendPageViewParameters());
             $oParentView->addTplParam('sD3CurrentShopUrl', $this->d3GetCreateCurrentShopUrl());
+            $oParentView->addTplParam('blD3GAIsMobile', $this->d3isMobile());
 
             if ($oSet->getValue('sD3GATSActive') && $oSet->getValue('sD3GATSShoppingActive')) {
                 $aInfos = $this->d3GATSGetProdInfos();
@@ -524,4 +525,14 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
 
         return $aParameter;
     }
+
+    /**
+     * @return bool
+     */
+    public function d3isMobile()
+    {
+        /** @var oeThemeSwitcherThemeManager $oThemeManager */
+        $oThemeManager = oxNew('oeThemeSwitcherThemeManager');
+        return $oThemeManager->isMobileThemeRequested();
+    }
 }
diff --git a/copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css b/copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css
new file mode 100644
index 0000000..2a2ec50
--- /dev/null
+++ b/copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css
@@ -0,0 +1,3 @@
+#d3GAOptOut {
+    font-size     : 14px;
+}
\ No newline at end of file