diff --git a/.gitattributes b/.gitattributes index 0f9f554..7b4adc6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -155,6 +155,7 @@ Sources/doku/12_gaTrackingOverview-Dateien/star_off.gif -text Sources/doku/12_gaTrackingOverview.html -text changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl -text changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl -text +changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl -text changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl -text changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl -text changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl -text @@ -183,8 +184,11 @@ copy_this/modules/d3/d3_googleanalytics/modules/core/d3_oxutilsview_googleanalyt copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasket_googleanalytics.php -text 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/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 +copy_this/modules/d3/d3_googleanalytics/translations/en/d3_googleanalytics_lang.php -text copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php -text copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php -text copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl -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 47a4eaa..bb24611 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 @@ -7,4 +7,5 @@ [{* Content shouldn't rendered in disabled module! 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}] \ No newline at end of file diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl new file mode 100644 index 0000000..a3d6797 --- /dev/null +++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl @@ -0,0 +1,24 @@ +[{$smarty.block.parent}] +[{if $oD3GASettings->getValue('blD3GAUseOptOut')}] +
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_OPTOUT"}] + [{assign var='sGaId' value=$oD3GASettings->getValue('sD3GAId')}] + [{oxscript add=" + var gaProperty = '`$sGaId`'; + + var disableStr = 'ga-disable-' + gaProperty; + if (document.cookie.indexOf(disableStr + '=true') > -1) { + window[disableStr] = true; + } + + function gaOptout() { + document.cookie = disableStr + '=true; expires=Thu, 31 Dec 2099 23:59:59 UTC; path=/'; + window[disableStr] = true; + $('#d3GAOptOut').remove(); + } + + if (window[disableStr]) { + $('#d3GAOptOut').remove(); + }"}] +
+[{/if}] diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl index 5337a83..ef16275 100644 --- a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl +++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl @@ -1,6 +1,21 @@ [{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] [{capture name="d3GATrackCode"}] [{strip}] + [{if $oD3GASettings->getValue('blD3GAUseOptOut')}] + + [{/if}] +