diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-03-17 03:13:08 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2016-03-29 02:12:09 +0300 |
commit | 2884da2b668cd0844e090982643dc4b0f1ef4517 (patch) | |
tree | 4263c4db2a1909c210c819b486d0aa6ea967be88 /plugins/SitesManager/templates | |
parent | a4c0f65f0ca93ee3c1ac6633a8bead7965998bc3 (diff) |
fix #9896 Keep Page URL fragments when tracking Page URLs" not persistent
Diffstat (limited to 'plugins/SitesManager/templates')
7 files changed, 3 insertions, 17 deletions
diff --git a/plugins/SitesManager/templates/dialogs/dialogs.html b/plugins/SitesManager/templates/dialogs/dialogs.html index 476505e7bf..2f3d5d8072 100644 --- a/plugins/SitesManager/templates/dialogs/dialogs.html +++ b/plugins/SitesManager/templates/dialogs/dialogs.html @@ -1,3 +1,2 @@ <div ng-include="'plugins/SitesManager/templates/dialogs/edit-dialog.html'"></div> - <div ng-include="'plugins/SitesManager/templates/dialogs/remove-dialog.html'"></div> diff --git a/plugins/SitesManager/templates/dialogs/edit-dialog.html b/plugins/SitesManager/templates/dialogs/edit-dialog.html index afb9910869..1bb6067f47 100644 --- a/plugins/SitesManager/templates/dialogs/edit-dialog.html +++ b/plugins/SitesManager/templates/dialogs/edit-dialog.html @@ -1,5 +1,4 @@ <div class="ui-confirm" piwik-dialog="site.editDialog.show"> - <h2>{{ site.editDialog.title }}</h2> <input role="no" type="button" value="{{ 'General_Ok'|translate }}"/> diff --git a/plugins/SitesManager/templates/displayJavascriptCode.twig b/plugins/SitesManager/templates/displayJavascriptCode.twig index 9b514b69c0..05d867030e 100644 --- a/plugins/SitesManager/templates/displayJavascriptCode.twig +++ b/plugins/SitesManager/templates/displayJavascriptCode.twig @@ -1,6 +1,5 @@ {% extends 'admin.twig' %} {% block content %} - {% include "@SitesManager/_displayJavascriptCode.twig" %} {% endblock %}
\ No newline at end of file diff --git a/plugins/SitesManager/templates/help/timezone-help.html b/plugins/SitesManager/templates/help/timezone-help.html index 0308b783b5..f77ad7863e 100644 --- a/plugins/SitesManager/templates/help/timezone-help.html +++ b/plugins/SitesManager/templates/help/timezone-help.html @@ -9,10 +9,7 @@ </span> <br/> - {{ 'SitesManager_UTCTimeIs'| translate : (utcTime | date : 'yyyy-MM-dd HH:mm:ss') }} - <br/> - {{ 'SitesManager_ChangingYourTimezoneWillOnlyAffectDataForward'|translate }} </div> diff --git a/plugins/SitesManager/templates/index.html b/plugins/SitesManager/templates/index.html index cfdca4a970..adedf3e644 100644 --- a/plugins/SitesManager/templates/index.html +++ b/plugins/SitesManager/templates/index.html @@ -1,17 +1,9 @@ <div ng-controller="SitesManagerController" class="SitesManager"> - <div ng-include="'plugins/SitesManager/templates/sites-manager-header.html?cb=' + cacheBuster" class="sites-manager-header"></div> - <div ng-include="'plugins/SitesManager/templates/loading.html?cb=' + cacheBuster"></div> - <div ng-include="'plugins/SitesManager/templates/sites-list/add-site-link.html?cb=' + cacheBuster"></div> - <div ng-include="'plugins/SitesManager/templates/sites-list/add-entity-dialog.html?cb=' + cacheBuster"></div> - <div ng-include="'plugins/SitesManager/templates/sites-list/sites-list.html?cb=' + cacheBuster"></div> - <div class="bottomButtonBar" ng-include="'plugins/SitesManager/templates/sites-list/add-site-link.html?cb=' + cacheBuster"></div> - <div ng-include="'plugins/SitesManager/templates/global-settings.html?cb=' + cacheBuster"></div> - </div> diff --git a/plugins/SitesManager/templates/siteWithoutData.twig b/plugins/SitesManager/templates/siteWithoutData.twig index 498d2ee765..b1a659f31a 100644 --- a/plugins/SitesManager/templates/siteWithoutData.twig +++ b/plugins/SitesManager/templates/siteWithoutData.twig @@ -33,7 +33,7 @@ {{ 'SitesManager_SiteWithoutDataSetupTracking'|translate('<a href="' ~ linkTo({ 'module': 'CoreAdminHome', 'action': 'trackingCodeGenerator', - }) ~ '">', '</a>')|raw }} + }) ~ '">', "</a>")|raw }} </p> <p> @@ -41,7 +41,7 @@ {{ 'SitesManager_SiteWithoutDataSetupGoals'|translate('<a href="' ~ linkTo({ 'module': 'Goals', 'action': 'manage', - }) ~ '">', '</a>')|raw }} + }) ~ '">', "</a>")|raw }} </p> {{ trackingHelp|raw }} diff --git a/plugins/SitesManager/templates/sites-list/site-fields.html b/plugins/SitesManager/templates/sites-list/site-fields.html index 200e935e27..2f0eaa7b76 100644 --- a/plugins/SitesManager/templates/sites-list/site-fields.html +++ b/plugins/SitesManager/templates/sites-list/site-fields.html @@ -94,7 +94,7 @@ <div class="form-group"> <label>{{ 'SitesManager_KeepURLFragmentsLong'|translate }}</label> - <select ng-options="key as value for (key, value) in keepURLFragmentsOptions" + <select ng-options="option.key as option.value for option in keepURLFragmentsOptions" ng-model="site.keep_url_fragment"></select> </div> |