From 1b35b77d93df7d28c33a3d5483829d41343e9227 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 1 Jul 2013 15:02:21 +1200
Subject: [PATCH] * Fixing some missing |raw using global search
\{\{.*<{1,}.*\}\} Refs #4019
---
plugins/API/templates/listAllAPI.twig | 2 +-
plugins/Dashboard/templates/embeddedIndex.twig | 2 +-
plugins/DevicesDetection/API.php | 4 ++++
plugins/PrivacyManager/templates/privacySettings.twig | 4 ++--
plugins/SitesManager/javascripts/SitesManager.js | 6 ++++--
plugins/SitesManager/templates/index.twig | 4 ++--
plugins/Zeitgeist/templates/macros.twig | 2 +-
7 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig
index 6eee427f6b..85ad4792cb 100644
--- a/plugins/API/templates/listAllAPI.twig
+++ b/plugins/API/templates/listAllAPI.twig
@@ -26,7 +26,7 @@
<p>
{{ 'API_UsingTokenAuth'|translate('<b>','</b>',"")|raw }}<br/>
<span id='token_auth'>&token_auth=<b>{{ token_auth }}</b></span><br/>
- {{ 'API_KeepTokenSecret'|translate('<b>','</b>') }}
+ {{ 'API_KeepTokenSecret'|translate('<b>','</b>')|raw }}
{{ list_api_methods_with_links|raw }}
<br/>
</div>
diff --git a/plugins/Dashboard/templates/embeddedIndex.twig b/plugins/Dashboard/templates/embeddedIndex.twig
index c5b037b0b8..a472b1b049 100644
--- a/plugins/Dashboard/templates/embeddedIndex.twig
+++ b/plugins/Dashboard/templates/embeddedIndex.twig
@@ -87,7 +87,7 @@
</div>
<div class="ui-confirm" id="removeDashboardConfirm">
- <h2>{{ 'Dashboard_RemoveDashboardConfirm'|translate('<span></span>') }}</h2>
+ <h2>{{ 'Dashboard_RemoveDashboardConfirm'|translate('<span></span>')|raw }}</h2>
<div class="popoverSubMessage">{{ 'Dashboard_NotUndo'|translate(resetDashboard) }}</div>
<input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php
index e3e7100328..8e82b49416 100644
--- a/plugins/DevicesDetection/API.php
+++ b/plugins/DevicesDetection/API.php
@@ -9,6 +9,10 @@
* @category Piwik_Plugins
* @package Piwik_DevicesDetection
*/
+
+/**
+ * The DevicesDetection API lets you access reports on your visitors devices, brands, models, Operating system, Browsers.
+ */
class Piwik_DevicesDetection_API
{
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index 976f032819..3adab8a383 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -103,14 +103,14 @@
{{ 'PrivacyManager_CannotLockSoDeleteLogActions'|translate(dbUser) }}
{% endif %}
{% endset %}
- {{ piwik.inlineHelp(deleteLogInfo)|raw }}
+ {{ piwik.inlineHelp(deleteLogInfo) }}
</td>
</tr>
<tr id="deleteLogSettings">
<td width="250"> </td>
<td width="500">
<label>{{ 'PrivacyManager_DeleteLogsOlderThan'|translate }}
- <input type="text" id="deleteOlderThan" value="{{ deleteData.config.delete_logs_older_than }}" style="width:30px;"
+ <input type="text" id="deleteOlderThan" value="{{ deleteData.config.delete_logs_older_than }}" style="width:35px;"
name="deleteOlderThan"/>
{{ 'CoreHome_PeriodDays'|translate }}</label><br/>
<span class="form-description">{{ 'PrivacyManager_LeastDaysInput'|translate("1") }}</span>
diff --git a/plugins/SitesManager/javascripts/SitesManager.js b/plugins/SitesManager/javascripts/SitesManager.js
index a854430732..3018906879 100644
--- a/plugins/SitesManager/javascripts/SitesManager.js
+++ b/plugins/SitesManager/javascripts/SitesManager.js
@@ -334,8 +334,10 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc
if (searchGlobalHasValues) {
var checkedStr = checked ? ' checked ' : '';
- html += '<label><span id="sitesearchUseDefault"' + (!enabled ? ' style="display:none" ' : '') + '><input type="checkbox" ' + checkedStr + ' id="sitesearchUseDefaultCheck" onclick="return onClickSiteSearchUseDefault();"> ' + sitesearchUseDefault + ' </span>';
- html += '</label>';
+ html += '<label><span id="sitesearchUseDefault"' + (!enabled ? ' style="display:none" ' : '') + '><input type="checkbox" '
+ + checkedStr + ' id="sitesearchUseDefaultCheck" onclick="return onClickSiteSearchUseDefault();"> '
+ + sitesearchUseDefault + ' </span>';
+ + '</label>';
html += '<div ' + ((checked && enabled) ? '' : 'style="display-none"') + ' class="searchDisplayParams form-description">'
+ searchKeywordLabel + ' (' + strDefault + ') ' + ': '
diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig
index 9a3d25ee1f..5d619b94b3 100644
--- a/plugins/SitesManager/templates/index.twig
+++ b/plugins/SitesManager/templates/index.twig
@@ -94,7 +94,7 @@ var searchKeywordLabel = '{{ searchKeywordLabel|e('js') }}';
var searchCategoryLabel = '{{ searchCategoryLabel|e('js') }}';
{% set sitesearchIntro='SitesManager_SiteSearchUse'|translate %}
var sitesearchIntro = '{{ piwik.inlineHelp(sitesearchIntro)|e('js') }}';
-var sitesearchUseDefault = '{% if isSuperUser %}{{ 'SitesManager_SearchUseDefault'|translate('<a href="#globalSiteSearch">','</a>')|e('js') }}{% else %}{{ 'SitesManager_SearchUseDefault'|translate('','')|e('js') }}{% endif %}';
+var sitesearchUseDefault = '{% if isSuperUser %}{{ 'SitesManager_SearchUseDefault'|translate('<a href="#globalSiteSearch">','</a>')|raw|e('js') }}{% else %}{{ 'SitesManager_SearchUseDefault'|translate('','')|e('js') }}{% endif %}';
var strDefault = '{{ 'General_Default'|translate|e('js') }}';
$(document).ready(function () {
@@ -353,7 +353,7 @@ $(document).ready(function () {
</span>
</td>
<td>
- {{ piwik.inlineHelp('SitesManager_EnableSiteSpecificUserAgentExclude_Help'|translate('<a href="#editSites">','</a>')) }}
+ {{ piwik.inlineHelp('SitesManager_EnableSiteSpecificUserAgentExclude_Help'|translate('<a href="#editSites">','</a>')|raw) }}
</td>
</tr>
diff --git a/plugins/Zeitgeist/templates/macros.twig b/plugins/Zeitgeist/templates/macros.twig
index 552534e705..fe24be5b0c 100644
--- a/plugins/Zeitgeist/templates/macros.twig
+++ b/plugins/Zeitgeist/templates/macros.twig
@@ -20,7 +20,7 @@
<div class="ui-widget">
<div class="ui-inline-help ui-state-highlight ui-corner-all">
<span class="ui-icon ui-icon-info" style="float:left;margin-right:.3em;"></span>
- {{ text }}
+ {{ text|raw }}
</div>
</div>
{% endmacro %}
\ No newline at end of file
--
GitLab