Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2020-06-24 17:42:13 +0300
committerGitHub <noreply@github.com>2020-06-24 17:42:13 +0300
commitbf38fded460899f4b668aaee6c3cb58211921588 (patch)
tree8efa74b700ffe89a1ac4549c64bf8cc6fedc4403 /plugins/SitesManager/templates
parent288a905ef5052119c7409153dbda88236d2f0fa4 (diff)
Remove custom variables requirement hint for site search categories (#16089)
* Remove custom variables requirement hint for site search categories * fix tests
Diffstat (limited to 'plugins/SitesManager/templates')
-rw-r--r--plugins/SitesManager/templates/global-settings.html5
-rw-r--r--plugins/SitesManager/templates/sites-list/site-search-field.html2
2 files changed, 1 insertions, 6 deletions
diff --git a/plugins/SitesManager/templates/global-settings.html b/plugins/SitesManager/templates/global-settings.html
index f95b079f85..a25d3d5f31 100644
--- a/plugins/SitesManager/templates/global-settings.html
+++ b/plugins/SitesManager/templates/global-settings.html
@@ -68,12 +68,7 @@
inline-help="{{ 'SitesManager_SearchKeywordParametersDesc' | translate }}">
</div>
- <div ng-hide="customVariablesActivated" class="alert alert-info">
- Note: you could also track your Internal Search Engine Categories, but the plugin Custom Variables is required. Please enable the plugin CustomVariables (or ask your Piwik admin).
- </div>
-
<div piwik-field uicontrol="text" name="searchCategoryParametersGlobal" var-type="array"
- ng-show="customVariablesActivated"
ng-model="globalSettings.searchCategoryParametersGlobal"
data-title="{{ 'SitesManager_SearchCategoryLabel'|translate }}"
inline-help="{{ 'Goals_Optional'|translate }} {{ 'SitesManager_SearchCategoryDesc'|translate }} {{ 'SitesManager_SearchCategoryParametersDesc'|translate }}">
diff --git a/plugins/SitesManager/templates/sites-list/site-search-field.html b/plugins/SitesManager/templates/sites-list/site-search-field.html
index 9aafda6dc7..c75901672b 100644
--- a/plugins/SitesManager/templates/sites-list/site-search-field.html
+++ b/plugins/SitesManager/templates/sites-list/site-search-field.html
@@ -51,7 +51,7 @@
<input ng-list ng-model="site.sitesearch_keyword_parameters">
</div>
- <div ng-show="customVariablesActivated" class="form-group">
+ <div class="form-group">
<label>{{ 'SitesManager_SearchCategoryLabel' | translate }}</label>
<div class="form-help">
{{ 'Goals_Optional' | translate }} {{ 'SitesManager_SearchCategoryParametersDesc' | translate }}