From 5aa7b36bdc24897f088da5008c1d81d46ac5151e Mon Sep 17 00:00:00 2001
From: DanielSeifert <ds@shopmodule.com>
Date: Mon, 21 Nov 2016 14:47:57 +0000
Subject: [PATCH] fix admin headlines, change icon to Google logo

---
 .../admin/d3_cfg_googleanalytics_adwords.php         |  3 +++
 .../admin/d3_cfg_googleanalytics_campaigns.php       |  3 +++
 .../admin/d3_cfg_googleanalytics_licence.php         |  1 +
 .../admin/d3_cfg_googleanalytics_main.php            |  2 ++
 .../admin/d3_cfg_googleanalytics_trustedstore.php    |  2 ++
 .../views/admin/de/d3_googleanalytics_lang.php       |  2 +-
 .../admin/tpl/d3_cfg_googleanalytics_adwords.tpl     | 12 +-----------
 .../admin/tpl/d3_cfg_googleanalytics_campaigns.tpl   | 10 ----------
 .../views/admin/tpl/d3_cfg_googleanalytics_main.tpl  | 11 -----------
 .../tpl/d3_cfg_googleanalytics_trustedstore.tpl      | 11 -----------
 10 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_adwords.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_adwords.php
index ecf56fd..b3dfff0 100644
--- a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_adwords.php
+++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_adwords.php
@@ -24,6 +24,9 @@ class d3_cfg_googleanalytics_adwords extends d3_cfg_mod_main
 
     protected $_sModId = 'd3_googleanalytics';
 
+    protected $_sMenuItemTitle = 'd3mxgoogleanalytics';
+    protected $_sMenuSubItemTitle = 'd3tbclgoogleanalytics_adwords';
+
     /**
      * @return mixed
      */
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php
index 454e2aa..6feef4e 100644
--- a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php
+++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php
@@ -24,6 +24,9 @@ class d3_cfg_googleanalytics_campaigns extends d3_cfg_mod_main
 
     protected $_sModId = 'd3_googleanalytics';
 
+    protected $_sMenuItemTitle = 'd3mxgoogleanalytics';
+    protected $_sMenuSubItemTitle = 'd3tbclgoogleanalytics_campaigns';
+
     /**
      * @return mixed
      */
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php
index ccbe696..2dfe4b2 100644
--- a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php
+++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php
@@ -35,4 +35,5 @@ class d3_cfg_googleanalytics_licence extends d3_cfg_mod_licence
      * @var string
      */
     protected $_sHelpLinkMLAdd = '';
+    protected $_sMenuItemTitle = 'd3mxgoogleanalytics';
 }
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php
index e830b05..ef34c9a 100644
--- a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php
+++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php
@@ -24,6 +24,8 @@ class d3_cfg_googleanalytics_main extends d3_cfg_mod_main
     protected $_sModId = 'd3_googleanalytics';
     protected $_blHasDebugSwitch = true;
     protected $_sDebugHelpTextIdent = 'D3_GOOGLEANALYTICS_MAIN_DEBUG';
+    protected $_sMenuItemTitle = 'd3mxgoogleanalytics';
+    protected $_sMenuSubItemTitle = 'd3tbclgoogleanalytics_main';
 
     /**
      * @return mixed
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php
index d1282bf..bb0942a 100644
--- a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php
+++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php
@@ -22,4 +22,6 @@ class d3_cfg_googleanalytics_trustedstore extends d3_cfg_mod_main
 {
     protected $_sThisTemplate = 'd3_cfg_googleanalytics_trustedstore.tpl';
     protected $_sModId = 'd3_googleanalytics';
+    protected $_sMenuItemTitle = 'd3mxgoogleanalytics';
+    protected $_sMenuSubItemTitle = 'd3tbclgoogleanalytics_trustedstore';
 }
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php b/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
index 835cf87..a783137 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
@@ -27,7 +27,7 @@ $aLang = array(
 
 //Navigation
     'charset'                                                      => 'ISO-8859-15',
-    'd3mxgoogleanalytics'                                          => "<i class='fa fa-area-chart'></i> Google Services",
+    'd3mxgoogleanalytics'                                          => "<i class='fa fa-google'></i> Google Services",
     'd3mxgoogleanalytics_settings'                                 => 'Einstellungen',
     'd3tbclgoogleanalytics_main'                                   => 'Analytics',
     'd3tbclgoogleanalytics_adwords'                                => 'AdWords',
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
index 893811e..ff2d46e 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
@@ -321,14 +321,4 @@ function _groupExp(el) {
     </tr>
 </table>
 
-[{include file="d3_cfg_mod_inc.tpl"}]
-
-<script type="text/javascript">
-    if (parent.parent) {
-        parent.parent.sShopTitle = "[{$actshopobj->oxshops__oxname->getRawValue()|oxaddslashes}]";
-        parent.parent.sMenuItem = "[{oxmultilang ident="d3mxgoogleanalytics"}]";
-        parent.parent.sMenuSubItem = "[{oxmultilang ident="d3tbclgoogleanalytics_adwords"}]";
-        parent.parent.sWorkArea = "[{$_act}]";
-        parent.parent.setTitle();
-    }
-</script>
\ No newline at end of file
+[{include file="d3_cfg_mod_inc.tpl"}]
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
index 3e7efc9..ad71275 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
@@ -174,13 +174,3 @@ function _groupExp(el) {
 </table>
 
 [{include file="d3_cfg_mod_inc.tpl"}]
-
-<script type="text/javascript">
-    if (parent.parent) {
-        parent.parent.sShopTitle = "[{$actshopobj->oxshops__oxname->getRawValue()|oxaddslashes}]";
-        parent.parent.sMenuItem = "[{oxmultilang ident="d3mxgoogleanalytics"}]";
-        parent.parent.sMenuSubItem = "[{oxmultilang ident="d3tbclgoogleanalytics_adwords"}]";
-        parent.parent.sWorkArea = "[{$_act}]";
-        parent.parent.setTitle();
-    }
-</script>
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
index 33b1dce..bfee3a0 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
@@ -428,15 +428,4 @@
 </table>
 </form>
 
-[{assign var="incpath" value=$oViewConf->getModulePath('d3modcfg_lib')|cat:"views/admin/tpl/d3_cfg_mod_inc.tpl"}]
 [{include file="d3_cfg_mod_inc.tpl"}]
-
-<script type="text/javascript">
-    if (parent.parent) {
-        parent.parent.sShopTitle = "[{$actshopobj->oxshops__oxname->getRawValue()|oxaddslashes}]";
-        parent.parent.sMenuItem = "[{oxmultilang ident="d3mxgoogleanalytics"}]";
-        parent.parent.sMenuSubItem = "[{oxmultilang ident="d3tbclgoogleanalytics_main"}]";
-        parent.parent.sWorkArea = "[{$_act}]";
-        parent.parent.setTitle();
-    }
-</script>
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
index cdf3721..19e120d 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
@@ -235,15 +235,4 @@
 </table>
 </form>
 
-[{assign var="incpath" value=$oViewConf->getModulePath('d3modcfg_lib')|cat:"views/admin/tpl/d3_cfg_mod_inc.tpl"}]
 [{include file="d3_cfg_mod_inc.tpl"}]
-
-<script type="text/javascript">
-    if (parent.parent) {
-        parent.parent.sShopTitle = "[{$actshopobj->oxshops__oxname->getRawValue()|oxaddslashes}]";
-        parent.parent.sMenuItem = "[{oxmultilang ident="d3mxgoogleanalytics"}]";
-        parent.parent.sMenuSubItem = "[{oxmultilang ident="d3tbclgoogleanalytics_main"}]";
-        parent.parent.sWorkArea = "[{$_act}]";
-        parent.parent.setTitle();
-    }
-</script>
\ No newline at end of file