D3Public/GoogleServices
8
0
Fork 0
Code Pull Requests Releases Activity

merge rel_3.x changes to trunk

Browse Source
This commit is contained in:
Daniel Seifert 2014-07-31 12:24:02 +00:00
commit b133f1bd5c
16 changed files with 361 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -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

BIN
Sources/Google Analytics-Installation.docx
View File

Binary file not shown.

1
changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl
View File

@ -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}]

24
changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl Normal file
View File

@ -0,0 +1,24 @@
[{$smarty.block.parent}]
[{if $oD3GASettings->getValue('blD3GAUseOptOut')}]
<div id="d3GAOptOut">
<a href="javascript:gaOptout();">[{oxmultilang ident="D3_GOOGLEANALYTICS_OPTOUT"}]</a>
[{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();
}"}]
</div>
[{/if}]

15
changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl
View File

@ -1,6 +1,21 @@
[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}]
[{capture name="d3GATrackCode"}]
[{strip}]
[{if $oD3GASettings->getValue('blD3GAUseOptOut')}]
<script type="text/javascript">
var gaProperty = '[{$oD3GASettings->getValue('sD3GAId')}]';
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;
}
</script>
[{/if}]
<script type="text/javascript">
(function(i,s,o,g,r,a,m){
i['GoogleAnalyticsObject']=r;

7
copy_this/modules/d3/d3_googleanalytics/metadata.php
View File

@ -38,7 +38,7 @@ $aModule = array(
'en' => 'Provides a quick and easy integration with your Google Analytics account to your shop.',
),
'thumbnail' => 'picture.png',
'version' => '3.2.0.0',
'version' => '3.2.1.0',
'author' => 'D&sup3; Data Development (Inh. Thomas Dartsch)',
'email' => 'support@shopmodule.com',
'url' => 'http://www.oxidmodule.com/',
@ -103,5 +103,10 @@ $aModule = array(
'block'=>'base_js',
'file'=>'/views/blocks/layout/d3_base_googleadwordscode.tpl'
),
array(
'template' => 'layout/footer.tpl',
'block' => 'footer_main',
'file' => '/views/blocks/layout/d3_base_optout.tpl',
),
),
);

16
copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics.css Normal file
View File

@ -0,0 +1,16 @@
#d3GAOptOut {
position : fixed;
bottom : -3px;
left : -5px;
font-size : 11px;
padding : 4px 20px 6px 17px;
background : none repeat scroll 0 0 #fff;
opacity : 0.6;
z-index : 9999;
border : 1px solid #d3d3d3;
border-radius : 3px;
}
#d3GAOptOut a {
display : block;
}

16
copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php
View File

@ -21,18 +21,18 @@ class d3_googleanalytics_update extends d3install_updatebase
public $sModName = 'Google Analytics Schnittstelle';
public $sModVersion = '3.2.0.0';
public $sModVersion = '3.2.1.0';
public $sModRevision = '160';
public $sModRevision = '171';
// heredoc syntax using for class members is available from PHP 5.3 up
public $sBaseConf =
"5IMVHBFY1o4enRHdU9YZ1VvQlhIbFI5K3V0MjlJZUVHTVV4WEtGb1BPeVBvMUJvN3hrbGl3cXB1RzU3W
GJrNTFuV0N5MHVUM1oyKzBURGU3QjJVdXkwUmtYOWNmUklWVFJJN0x3TTVrSzZmTXVUVWRRbEdFRjdIR
Go0RWNSZm1GQVBhbitKMVluYzJsS2szbmNCSkh2OWVqZ08zM051RGtKQ2pkSi9kMTlZMmREVHFhMmFtV
3pPa1RGNmpoU21iRVB1d0lkRWcvUDB5SFZVdW5lSW9SUUp5bS9YaWhoU0R2dGphODdMRUxOY0dWN3JmZ
Gl5UmJGRnp5SEtwL1BmOVJsYldGbk1QdnNsYzZvRGNrSGxQSDBsT2s1cndGNHNSbXFaUlZNK2RXV1VsT
FE9";
"tYxMWQ3cjRoZHVTZjBya3J5Q3FINkFCOElrc1lScTJyczZIUzVmRHR5U3VIUGlKbjlGOXVuVzgraHAwR
UVnbjZKODdOUkk1KzBITURySjNIWDFtWGZWeW1zdTQ3MHRLOWhaYWdCQ3M2Q1pIbFdsL0lzeSsrTi94N
y9qWHZLM3pGdlhHdVBadGFvMmVPVTZJMGYyTW5QYUh0ZDEwUkhpRTFhQVZPQlF1SVcvcDErQUpDOTNXT
mFtemw4K2ZpL1Brb2dpdW41R1hqRVIwK2NiU3YvUk9FR2RRUGRtcjlPTGliRWo2bjY1TUw0YU9acEplN
VRtQUVJVHRVd2Y2OWRpZkZlV3J1Qys2UjJZSFZOWTduUVVtTW5CQUdZbytGZ3Q3TnZyMGd1OHZmeWdRM
zA9";
public $sRequirements = '';

13
copy_this/modules/d3/d3_googleanalytics/translations/de/d3_googleanalytics_lang.php Normal file
View File

@ -0,0 +1,13 @@
<?php
$sLangName = "Deutsch";
// -------------------------------
// RESOURCE IDENTITFIER = STRING
// -------------------------------
$aLang = array(
//Navigation
'charset' => 'ISO-8859-15',
'D3_GOOGLEANALYTICS_OPTOUT' => 'Klicken Sie hier, um Google Analytics zu deaktivieren.',
);

13
copy_this/modules/d3/d3_googleanalytics/translations/en/d3_googleanalytics_lang.php Normal file
View File

@ -0,0 +1,13 @@
<?php
$sLangName = "English";
// -------------------------------
// RESOURCE IDENTITFIER = STRING
// -------------------------------
$aLang = array(
//Navigation
'charset' => 'ISO-8859-15',
'D3_GOOGLEANALYTICS_OPTOUT' => 'Click here to opt-out of Google Analytics.',
);

6
copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
View File

@ -256,6 +256,12 @@ $aLang = array(
'&uuml;ber standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google &uuml;bertragen. '.
'Ebenfalls &uuml;bermittelt werden Daten der Website-Suche. Dem Modul liegen angepa&szlig;te Templates bei, '.
'mit denen auch die Trichter ordentlich protokolliert werden.',
'D3_GOOGLEANALYTICS_MAIN_USEOPTOUT' => 'Opt Out anbieten',
'D3_GOOGLEANALYTICS_MAIN_USEOPTOUT_DESC' => 'Wird dieser Haken gesetzt, wird im Frontend '.
'ein Opt-Out-Bereich im Header angezeigt. In dem Bereich kann der Benutzer einen Link anklicken, '.
'mit dem das Tracking für diese Seite deaktiviert wird. Weitere Informationen finden Sie '.
'<a href="https://developers.google.com/analytics/devguides/collection/gajs/?hl=de#disable" target="gahelp">'.
'hier</a>.',
);

6
copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
View File

@ -256,6 +256,12 @@ $aLang = array(
'&uuml;ber standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google &uuml;bertragen. '.
'Ebenfalls &uuml;bermittelt werden Daten der Website-Suche. Dem Modul liegen angepa&szlig;te Templates bei, '.
'mit denen auch die Trichter ordentlich protokolliert werden.',
'D3_GOOGLEANALYTICS_MAIN_USEOPTOUT' => 'Opt Out anbieten',
'D3_GOOGLEANALYTICS_MAIN_USEOPTOUT_DESC' => 'Wird dieser Haken gesetzt, wird im Frontend '.
'ein Opt-Out-Bereich im Header angezeigt. In dem Bereich kann der Benutzer einen Link anklicken, '.
'mit dem das Tracking für diese Seite deaktiviert wird. Weitere Informationen finden Sie '.
'<a href="https://developers.google.com/analytics/devguides/collection/gajs/?hl=de#disable" target="gahelp">'.
'hier</a>.',
);

13
copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
View File

@ -101,8 +101,6 @@
<input type="submit" value="[{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_BTN"}]">
<span></span>
</span>
</form>
</div>
[{else}]
[{if $oView->getGaType() == 'universal'}]
@ -197,6 +195,16 @@
[{oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC"}]
</dd>
</dl>
<dl>
<dt>
<label for="blD3GAUseOptOut">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_USEOPTOUT"}]</label>
</dt>
<dd>
<input type="hidden" name="value[blD3GAUseOptOut]" value="0">
<input id="blD3GAUseOptOut" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GAUseOptOut')}]checked[{/if}] name="value[blD3GAUseOptOut]">
[{oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_USEOPTOUT_DESC"}]
</dd>
</dl>
</div>
</div>
@ -362,6 +370,7 @@
</td>
</tr>
</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"}]

BIN
setup+doku/Google Analytics-Installation.pdf
View File

Binary file not shown.

333
setup+doku/Precheck/d3precheck.php
View File

File diff suppressed because one or more lines are too long

3
setup+doku/changelog.txt
View File

@ -1,3 +1,6 @@
=> 3.2.1.0
- neue Option "Opt Out anzeigen lassen"
=> 3.2.0.0
- Tracking für gekaufte Artikel enthält Daten zur Kategorie / Seite, aus der die Artikel zuerst in den Warenkorb gelegt wurden
- Bugfix: Artikeltitel werden escaped, sofern Quotes enthalten sind