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

changed duplicated varname for "submit campaign code" (other campaigns and AdWords) #3098

This commit is contained in:
Daniel Seifert 2014-10-13 11:38:48 +00:00
parent f356606fdd
commit 16918787fd
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,37 +58,37 @@
_gaq.push(['_setDetectTitle', true]);
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack')}]
[{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')}]
_gaq.push(['_setCampaignTrack', true]);
[{else}]
_gaq.push(['_setCampaignTrack', false]);
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]
[{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]
_gaq.push(['_setCampaignCookieTimeout', '[{$oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]']);
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
[{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
_gaq.push(['_setCampNameKey', '[{$oD3GASettings->getValue('sD3GASetCampNameKey')}]']);
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
[{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
_gaq.push(['_setCampMediumKey', '[{$oD3GASettings->getValue('sD3GASetCampMediumKey')}]']);
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
[{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
_gaq.push(['_setCampSourceKey', '[{$oD3GASettings->getValue('sD3GASetCampSourceKey')}]']);
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
[{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
_gaq.push(['_setCampTermKey', '[{$oD3GASettings->getValue('sD3GASetCampTermKey')}]']);
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
[{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
_gaq.push(['_setCampContentKey', '[{$oD3GASettings->getValue('sD3GASetCampContentKey')}]']);
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
[{if !$oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
_gaq.push(['_setCampNOKey', 'ga_nooverride']);
[{/if}]

20
changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl
View File

@ -1,26 +1,32 @@
[{strip}]
[{if false == $oD3GASettings->getValue('blD3GASetCampaignTrack')}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
[{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')}]
[{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
&& $oD3GASettings->getValue('sD3GASetCampNameKey')}]
ga('set', 'campaignName', '[{$oD3GASettings->getValue('sD3GASetCampNameKey')}]');
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
[{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
&& $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
ga('set', 'campaignMedium', '[{$oD3GASettings->getValue('sD3GASetCampMediumKey')}]');
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
[{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
&& $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
ga('set', 'campaignSource', '[{$oD3GASettings->getValue('sD3GASetCampSourceKey')}]');
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
[{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
&& $oD3GASettings->getValue('sD3GASetCampTermKey')}]
ga('set', 'campaignKeyword', '[{$oD3GASettings->getValue('sD3GASetCampTermKey')}]');
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
[{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
&& $oD3GASettings->getValue('sD3GASetCampContentKey')}]
ga('set', 'campaignContent', '[{$oD3GASettings->getValue('sD3GASetCampContentKey')}]');
[{/if}]
[{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampIdKey')}]
[{if false == $oD3GASettings->getValue('blD3GASetAdWordsCampaignTrack')
&& $oD3GASettings->getValue('sD3GASetCampIdKey')}]
ga('set', 'campaignId', '[{$oD3GASettings->getValue('sD3GASetCampIdKey')}]');
[{/if}]
[{else}]

6
copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
View File

@ -121,12 +121,12 @@ function _groupExp(el) {
</a>
<dl>
<dt>
<label for="blD3GASetCampaignTrack">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK"}]</label>
<label for="blD3GASetAdWordsCampaignTrack">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK"}]</label>
[{* _gaq.push(['_setCampaignTrack', false]); *}]
</dt>
<dd>
<input type="hidden" name="value[blD3GASetCampaignTrack]" value="0">
<input id="blD3GASetCampaignTrack" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetCampaignTrack')}]checked[{/if}] name="value[blD3GASetCampaignTrack]">
<input type="hidden" name="value[blD3GASetAdWordsCampaignTrack]" value="0">
<input id="blD3GASetAdWordsCampaignTrack" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetAdWordsCampaignTrack')}]checked[{/if}] name="value[blD3GASetAdWordsCampaignTrack]">
[{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK_DESC"}]
</dd>
</dl>