diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-01-30 10:36:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 10:36:57 +0300 |
| commit | dcba32ff480810c36c9e6965e3271b052a0262e3 (patch) | |
| tree | 9fc0f2299cb9177bd50a856a42764feec6ed4fab /plugins/CoreAdminHome/templates | |
| parent | dc99d9efd479e4ab47dbc280c6c14dc85b2c4183 (diff) | |
New "Enable cross domain linking" checkbox in Javascript Tracker Code generator (Advanced section) (#11295)
* enable set domains when enable cross domains
* fix disable cross domain when only one site url or less
* New "Enable cross domain linking" checkbox in Javascript Tracker Code generator (Advanced section)
* Integration test
* API has new parameter
Diffstat (limited to 'plugins/CoreAdminHome/templates')
| -rw-r--r-- | plugins/CoreAdminHome/templates/trackingCodeGenerator.twig | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig index 19f693f5aa..71834c676e 100644 --- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig +++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig @@ -142,6 +142,19 @@ </div> </div> + {# cross domain support #} + <div id="jsCrossDomain" class="inline-help-node"> + {{ "CoreAdminHome_JSTracking_CrossDomain"|translate }} + </div> + + <div piwik-field uicontrol="checkbox" name="javascript-tracking-cross-domain" + ng-model="jsTrackingCode.crossDomain" + ng-change="jsTrackingCode.updateTrackingCode();jsTrackingCode.onCrossDomainToggle();" + disabled="jsTrackingCode.isLoading || !jsTrackingCode.hasManySiteUrls" + title="{{ 'CoreAdminHome_JSTracking_EnableCrossDomainLinking'|translate|e('html_attr') }}" + value="" inline-help="#jsCrossDomain"> + </div> + {# do not track support #} <div id="jsDoNotTrackInlineHelp" class="inline-help-node"> {{ 'CoreAdminHome_JSTracking_EnableDoNotTrackDesc'|translate }} @@ -153,7 +166,7 @@ <div piwik-field uicontrol="checkbox" name="javascript-tracking-do-not-track" ng-model="jsTrackingCode.doNotTrack" - ng-change="jsTrackingCode.updateTrackingCode()" + ng-change="jsTrackingCode.updateTrackingCode() " disabled="jsTrackingCode.isLoading" title="{{ 'CoreAdminHome_JSTracking_EnableDoNotTrack'|translate|e('html_attr') }}" value="" inline-help="#jsDoNotTrackInlineHelp"> |