From 07f11b292049271123615b5bfd1fb44e1294a38a Mon Sep 17 00:00:00 2001 From: DanielSeifert Date: Sun, 27 Feb 2011 20:21:16 +0000 Subject: [PATCH] basic implementation --- .gitattributes | 1 + .../out/admin/de/d3_googleanalytics_lang.php | 34 +++- .../admin/tpl/d3_cfg_googleanalytics_main.tpl | 152 ++++++++++++++++-- .../out/basic/tpl/inc/d3GoogleAnalytics.tpl | 78 ++++----- copy_this/admin/d3_cfg_googleanalytics.php | 2 +- .../admin/d3_cfg_googleanalytics_adwords.php | 39 +++++ .../admin/d3_cfg_googleanalytics_list.php | 2 +- .../admin/d3_cfg_googleanalytics_main.php | 7 + copy_this/modules/d3GoogleAnalytics/menu.xml | 1 + .../views/d3_oxcmp_utils_googleAnalytics.php | 14 +- 10 files changed, 273 insertions(+), 57 deletions(-) create mode 100644 copy_this/admin/d3_cfg_googleanalytics_adwords.php diff --git a/.gitattributes b/.gitattributes index c90ff89..504abdc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -155,6 +155,7 @@ changed_full/440-447/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text changed_full/440-447/out/basic/tpl/inc/popup_basket.tpl -text changed_full/440-447/out/basic/tpl/user.tpl -text copy_this/admin/d3_cfg_googleanalytics.php -text +copy_this/admin/d3_cfg_googleanalytics_adwords.php -text copy_this/admin/d3_cfg_googleanalytics_licence.php -text copy_this/admin/d3_cfg_googleanalytics_list.php -text copy_this/admin/d3_cfg_googleanalytics_main.php -text diff --git a/changed_full/440-447/out/admin/de/d3_googleanalytics_lang.php b/changed_full/440-447/out/admin/de/d3_googleanalytics_lang.php index f987054..44ba234 100644 --- a/changed_full/440-447/out/admin/de/d3_googleanalytics_lang.php +++ b/changed_full/440-447/out/admin/de/d3_googleanalytics_lang.php @@ -9,13 +9,35 @@ $iLangNr = 0; $aLang = array( //Navigation -'charset' => 'ISO-8859-15', -'d3mxd3modules' => 'D³ Module', -'d3mxgoogleanalytics' => 'Google Analytics', -'d3mxgoogleanalytics_settings' => 'Einstellungen', -'d3tbclgoogleanalytics_main' => 'Stamm', +'charset' => 'ISO-8859-15', +'d3mxd3modules' => 'D³ Module', +'d3mxgoogleanalytics' => 'Google Analytics', +'d3mxgoogleanalytics_settings' => 'Einstellungen', +'d3tbclgoogleanalytics_main' => 'Analytics', +'d3tbclgoogleanalytics_adwords' => 'AdWords', + +'D3_GOOGLEANALYTICS_CFG_TITLE' => 'Google Analytics Schnittstelle - Einstellungen', + +'D3_GOOGLEANALYTICS_MAIN' => 'Grundeinstellungen', +'D3_GOOGLEANALYTICS_MAIN_GAID' => 'Account ID', +'D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP' => 'IP-Adressen anonymisiert übertragen (empfohlen)', + +'D3_GOOGLEANALYTICS_ECOMMERCE' => 'eCommerce-Einstellungen', +'D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA' => 'eCommerce-Daten übertragen', + +'D3_GOOGLEANALYTICS_DOMAIN' => 'Multi-Domain-Einstellungen', +'D3_GOOGLEANALYTICS_DOMAIN_ALLOWXDOMAIN' => 'Trackingdaten von unterschiedlichen Domains verwenden', +'D3_GOOGLEANALYTICS_DOMAIN_XDOMAIN' => 'zu verwendende Domains', +'D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATH' => 'nur folgendes Verzeichnis tracken', + +'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten übertragen', + +'D3_GOOGLEANALYTICS_ADWORDSCODE_GENERAL' => 'Kampagnendaten übertragen', + +'D3_GOOGLEANALYTICS_ADWORDSMAIN_CAMPAIGNTIMEOUT' => 'Kampagnenlaufzeit', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_CUSTCAMPAIGNFIELDS' => 'benutzerdefinierte Kampagnenfelder', + -'D3_GOOGLEANALYTICS_CFG_TITLE' => 'Google Analytics Schnittstelle - Einstellungen', ); diff --git a/changed_full/440-447/out/admin/tpl/d3_cfg_googleanalytics_main.tpl b/changed_full/440-447/out/admin/tpl/d3_cfg_googleanalytics_main.tpl index 8057f85..a35030d 100644 --- a/changed_full/440-447/out/admin/tpl/d3_cfg_googleanalytics_main.tpl +++ b/changed_full/440-447/out/admin/tpl/d3_cfg_googleanalytics_main.tpl @@ -89,6 +89,8 @@ dl dt{ td.edittext { white-space: normal; } + +div.box{background: white url([{$oView->getBGLogoUrl()}]) no-repeat bottom right;} --> @@ -184,32 +186,162 @@ td.edittext {
- [{oxmultilang ident="D3_MULTIVAR_MAIN"}] + [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN"}]
- [{oxmultilang ident="D3_MULTIVAR_MAIN_USEAJAX"}] + [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GAID"}] +[{* _gaq.push(['_setAccount', 'UA_XXX']); *}]
- - d3_cfg_mod__blMultiVariants_useAjax == 1}]checked[{/if}]> - [{ oxinputhelp ident="D3_MULTIVAR_MAIN_USEAJAX_DESC" }] + + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_GAID_DESC" }]
- [{oxmultilang ident="D3_MULTIVAR_MAIN_SEPARATOR"}] + [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP"}] +[{* _gaq.push(['_gat._anonymizeIp']); *}]
- - [{ oxinputhelp ident="D3_MULTIVAR_MAIN_SEPARATOR_DESC" }] + + d3_cfg_mod__blD3GAAnonymizeIP}]checked[{/if}] name="value[d3_cfg_mod__blD3GAAnonymizeIP]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }]
+ +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA"}] +
+
+ + d3_cfg_mod__blD3GASendECommerce}]checked[{/if}] name="value[d3_cfg_mod__blD3GASendECommerce]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }] +
+
+
+
+
+ +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_ALLOWXDOMAIN"}] +[{* _gaq.push(['_setAllowLinker', true]); *}] +
+
+ + d3_cfg_mod__blD3GAAllowDomainLinker}]checked[{/if}] name="value[d3_cfg_mod__blD3GAAllowDomainLinker]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_XDOMAIN"}] +_gaq.push(['_setDomainName', '.example-petstore.com']); +// wenn benutzt: +_gaq.push(['_setAllowHash', false]); ??? +
+
+ + d3_cfg_mod__blD3GoogleAnalyticsSendECommerce}]checked[{/if}] name="value[d3_cfg_mod__blD3GoogleAnalyticsSendECommerce]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATH"}] +_gaq.push(['_setCookiePath', '/path/of/cookie/']); +
+
+ + d3_cfg_mod__blD3GoogleAnalyticsSendECommerce}]checked[{/if}] name="value[d3_cfg_mod__blD3GoogleAnalyticsSendECommerce]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }] +
+
+
+
+
+ +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA"}] +_gaq.push(['_setClientInfo', false]); +
+
+ + d3_cfg_mod__blD3GoogleAnalyticsSendECommerce}]checked[{/if}] name="value[d3_cfg_mod__blD3GoogleAnalyticsSendECommerce]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA"}] +_gaq.push(['_setAllowHash', false]); +
+
+ + d3_cfg_mod__blD3GoogleAnalyticsSendECommerce}]checked[{/if}] name="value[d3_cfg_mod__blD3GoogleAnalyticsSendECommerce]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA"}] +_gaq.push(['_setDetectFlash', false]); +
+
+ + d3_cfg_mod__blD3GoogleAnalyticsSendECommerce}]checked[{/if}] name="value[d3_cfg_mod__blD3GoogleAnalyticsSendECommerce]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA"}] +_gaq.push(['_setDetectTitle', false]); +
+
+ + d3_cfg_mod__blD3GoogleAnalyticsSendECommerce}]checked[{/if}] name="value[d3_cfg_mod__blD3GoogleAnalyticsSendECommerce]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }] +
+
+
+
+
+ @@ -230,8 +362,8 @@ td.edittext { \ No newline at end of file + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + [{/strip}] +[{/if}] \ No newline at end of file diff --git a/copy_this/admin/d3_cfg_googleanalytics.php b/copy_this/admin/d3_cfg_googleanalytics.php index 122a062..809912d 100644 --- a/copy_this/admin/d3_cfg_googleanalytics.php +++ b/copy_this/admin/d3_cfg_googleanalytics.php @@ -18,7 +18,7 @@ * @copyright (C) D3 Data Development */ -class d3_cfg_multivariants extends d3_cfg_mod_ +class d3_cfg_googleanalytics extends d3_cfg_mod_ { public function render() diff --git a/copy_this/admin/d3_cfg_googleanalytics_adwords.php b/copy_this/admin/d3_cfg_googleanalytics_adwords.php new file mode 100644 index 0000000..7a2917b --- /dev/null +++ b/copy_this/admin/d3_cfg_googleanalytics_adwords.php @@ -0,0 +1,39 @@ +. + * + * @link http://www.oxidmodule.com + * @link http://www.shopmodule.com + * @copyright (C) D3 Data Development + */ + +class d3_cfg_googleanalytics_adwords extends d3_cfg_mod_main +{ + protected $_sThisTemplate = 'd3_cfg_googleanalytics_adwords.tpl'; + + protected $_sModId = 'd3_googleanalytics'; + + public function checkD3Log() + { + // there are no reasons to log anything + return false; + } +/* + public function render() + { +dumpvar($this->oSet); + return parent::render(); + } +*/ +} \ No newline at end of file diff --git a/copy_this/admin/d3_cfg_googleanalytics_list.php b/copy_this/admin/d3_cfg_googleanalytics_list.php index 868e0de..a2b233d 100644 --- a/copy_this/admin/d3_cfg_googleanalytics_list.php +++ b/copy_this/admin/d3_cfg_googleanalytics_list.php @@ -18,7 +18,7 @@ * @copyright (C) D3 Data Development */ -class d3_cfg_multivariants_list extends d3_cfg_mod_list +class d3_cfg_googleanalytics_list extends d3_cfg_mod_list { protected $_blD3ShowLangSwitch = true; diff --git a/copy_this/admin/d3_cfg_googleanalytics_main.php b/copy_this/admin/d3_cfg_googleanalytics_main.php index 5ff8069..181a3f4 100644 --- a/copy_this/admin/d3_cfg_googleanalytics_main.php +++ b/copy_this/admin/d3_cfg_googleanalytics_main.php @@ -29,4 +29,11 @@ class d3_cfg_googleanalytics_main extends d3_cfg_mod_main // there are no reasons to log anything return false; } +/* + public function render() + { +dumpvar($this->oSet); + return parent::render(); + } +*/ } \ No newline at end of file diff --git a/copy_this/modules/d3GoogleAnalytics/menu.xml b/copy_this/modules/d3GoogleAnalytics/menu.xml index 7f227d3..3098d28 100644 --- a/copy_this/modules/d3GoogleAnalytics/menu.xml +++ b/copy_this/modules/d3GoogleAnalytics/menu.xml @@ -4,6 +4,7 @@ + diff --git a/copy_this/modules/d3GoogleAnalytics/views/d3_oxcmp_utils_googleAnalytics.php b/copy_this/modules/d3GoogleAnalytics/views/d3_oxcmp_utils_googleAnalytics.php index ab3eafd..48db63a 100644 --- a/copy_this/modules/d3GoogleAnalytics/views/d3_oxcmp_utils_googleAnalytics.php +++ b/copy_this/modules/d3GoogleAnalytics/views/d3_oxcmp_utils_googleAnalytics.php @@ -2,11 +2,23 @@ class d3_oxcmp_utils_googleAnalytics extends d3_oxcmp_utils_googleAnalytics_parent { + private $_sModId = 'd3_googleanalytics'; + + private $_oSet; + public function render() { $ret = parent::render(); - $this->_oParent->addTplParam('d3GoogleAnalyticsId', $this->getConfig()->getConfigParam('sD3GoogleAnalyticsId')); + // load module config + $this->_oSet = oxNew('d3_cfg_mod'); + $this->_oSet->Load($this->_oSet->getModOxid($this->_sModId), true); + + $this->_oParent->addTplParam('d3GoogleAnalyticsActive', $this->_oSet->getFieldData('oxactive')); + $this->_oParent->addTplParam('d3GoogleAnalyticsId', $this->_oSet->getValue('sD3GAId')); + $this->_oParent->addTplParam('d3GoogleAnalyticsAnonymizeIP', $this->_oSet->getValue('blD3GAAnonymizeIP')); + $this->_oParent->addTplParam('d3GoogleAnalyticsSendECommerce', $this->_oSet->getValue('blD3GASendECommerce')); + $this->_oParent->addTplParam('d3GoogleAnalyticsXDomain', $this->_oSet->getValue('blD3GAAllowDomainLinker')); return $ret; }