adding more |raw

Refs #4019
matomo-org · Jun 25, 2013 · 5aa8081 · 5aa8081
1 parent 7bbf305
commit 5aa8081
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig
@@ -19,14 +19,14 @@
     <td class="annotation-value">
         <div class="annotation-view-mode">
             <span {% if annotation.canEditOrDelete %}title="{{ 'Annotations_ClickToEdit'|translate }}"
-                  class="annotation-enter-edit-mode"{% endif %}>{{ annotation.note }}</span>
+                  class="annotation-enter-edit-mode"{% endif %}>{{ annotation.note|raw }}</span>
             {% if annotation.canEditOrDelete %}
                 <a href="#" class="edit-annotation annotation-enter-edit-mode" title="{{ 'Annotations_ClickToEdit'|translate }}">{{ 'General_Edit'|translate }}...</a>
             {% endif %}
         </div>
         {% if annotation.canEditOrDelete %}
             <div class="annotation-edit-mode" style="display:none">
-                <input class="annotation-edit" type="text" value="{{ annotation.note }}"/>
+                <input class="annotation-edit" type="text" value="{{ annotation.note|e('html') }}"/>
                 <br/>
                 <input class="annotation-save submit" type="button" value="{{ 'General_Save'|translate }}"/>
                 <input class="annotation-cancel submit" type="button" value="{{ 'General_Cancel'|translate }}"/>

diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig
@@ -1,6 +1,6 @@
 <div class="dataTable" data-table-type="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
     <div class="reportDocumentation">
-        {% if reportDocumentation is not empty %}<p>{{ reportDocumentation }}</p>{% endif %}
+        {% if reportDocumentation is not empty %}<p>{{ reportDocumentation|raw }}</p>{% endif %}
         {% if properties.metadata.archived_date is defined %}<span class='helpDate'>{{ properties.metadata.archived_date }}</span>{% endif %}
     </div>
     {% set class %}

diff --git a/plugins/CoreHome/templates/_dataTableCloud.twig b/plugins/CoreHome/templates/_dataTableCloud.twig
@@ -1,6 +1,6 @@
 <div class="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
     {% if reportDocumentation is not empty and javascriptVariablesToSet.viewDataTable != 'tableGoals' %}
-        <div class="reportDocumentation"><p>{{ reportDocumentation }}</p></div>
+        <div class="reportDocumentation"><p>{{ reportDocumentation|raw }}</p></div>
     {% endif %}
     <div class="tagCloud">
         {% if cloudValues|length == 0 %}

diff --git a/plugins/CoreHome/templates/_dataTableGraph.twig b/plugins/CoreHome/templates/_dataTableGraph.twig
@@ -1,7 +1,7 @@
 <div class="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
 
     <div class="reportDocumentation">
-        {% if reportDocumentation is not empty %}<p>{{ reportDocumentation }}</p>{% endif %}
+        {% if reportDocumentation is not empty %}<p>{{ reportDocumentation|raw }}</p>{% endif %}
         {% if properties.metadata.archived_date is defined %}<p>{{ properties.metadata.archived_date }}</p>{% endif %}
     </div>
 

diff --git a/plugins/CoreHome/templates/_siteSelect.twig b/plugins/CoreHome/templates/_siteSelect.twig
@@ -29,7 +29,7 @@
     <div class="custom_select">
 
         <a href="#" onclick="return false" class="custom_select_main_link" siteid="{% if idSite is defined %}{{ idSite }}{% else %}{{ sites[0].idsite }}{% endif %}">
-            {% if siteName is defined %}{{ siteName }}{% else %}{{ sites[0].name }}{% endif %}
+            {% if siteName is defined %}{{ siteName|raw }}{% else %}{{ sites[0].name|raw }}{% endif %}
         </a>
 
         <div class="custom_select_block">

diff --git a/plugins/CoreHome/templates/getRowEvolutionPopover.twig b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
@@ -4,7 +4,7 @@
         {{ graph|raw }}
     </div>
     <div class="metrics-container">
-        <h2>{{ availableMetricsText }}</h2>
+        <h2>{{ availableMetricsText|raw }}</h2>
 
         <div class="rowevolution-documentation">
             {{ 'RowEvolution_Documentation'|translate }}

diff --git a/plugins/DevicesDetection/templates/index.twig b/plugins/DevicesDetection/templates/index.twig
@@ -1,15 +1,15 @@
 <div id='leftcolumn'>
     <h2>{{ "DevicesDetection_DeviceType"|translate }}</h2>
-    {{ deviceTypes }}
+    {{ deviceTypes  | raw}}
     <h2>{{ "DevicesDetection_DeviceBrand"|translate }}</h2>
-    {{ deviceBrands }}
+    {{ deviceBrands | raw }}
     <h2>{{ "DevicesDetection_DeviceModel"|translate }}</h2>
     {{ deviceModels | raw }}
 </div>
 
 <div id='rightcolumn'>
     <h2>{{ "DeviceDetection_OperatingSystemFamilies"|translate }}</h2>
-    {{ osReport }}
+    {{ osReport  | raw}}
     <h2>{{ "DevicesDetection_BrowsersFamily"|translate }}</h2>
     {{ browserReport | raw }}
 </div>
diff --git a/plugins/Goals/templates/_titleAndEvolutionGraph.twig b/plugins/Goals/templates/_titleAndEvolutionGraph.twig
@@ -1,7 +1,7 @@
 <a name="evolutionGraph" graphId="{{ nameGraphEvolution }}"></a>
 
 {% if displayFullReport %}
-    <h2>{% if goalName is defined %}{{ 'Goals_GoalX'|translate(goalName) }}{% else %}{{ 'Goals_GoalsOverview'|translate }}{% endif %}</h2>
+    <h2>{% if goalName is defined %}{{ 'Goals_GoalX'|translate(goalName)|raw }}{% else %}{{ 'Goals_GoalsOverview'|translate }}{% endif %}</h2>
 {% endif %}
 {{ graphEvolution|raw }}
 

diff --git a/plugins/Referers/templates/index.twig b/plugins/Referers/templates/index.twig
@@ -22,7 +22,7 @@
                 <strong>{{ visitorsFromSearchEnginesPercent }}%</strong> of visits
             {% endif %}
             {% if visitorsFromSearchEnginesEvolution is not empty %}
-                {{ visitorsFromSearchEnginesEvolution }}
+                {{ visitorsFromSearchEnginesEvolution|raw }}
             {% endif %}
         </div>
     </div>
@@ -33,7 +33,7 @@
                 <strong>{{ visitorsFromWebsitesPercent }}%</strong> of visits
             {% endif %}
             {% if visitorsFromWebsitesEvolution is not empty %}
-                {{ visitorsFromWebsitesEvolution }}
+                {{ visitorsFromWebsitesEvolution|raw }}
             {% endif %}
         </div>
         <div class="sparkline">{{ sparkline(urlSparklineCampaigns) }}
@@ -42,7 +42,7 @@
                 <strong>{{ visitorsFromCampaignsPercent }}%</strong> of visits
             {% endif %}
             {% if visitorsFromCampaignsEvolution is not empty %}
-                {{ visitorsFromCampaignsEvolution }}
+                {{ visitorsFromCampaignsEvolution|raw }}
             {% endif %}
         </div>
     </div>
@@ -64,13 +64,13 @@
                     <div class="sparkline">{{ sparkline(urlSparklineDistinctSearchEngines) }}
                         <strong>{{ numberDistinctSearchEngines }}</strong> {{ 'Referers_DistinctSearchEngines'|translate }}
                         {% if numberDistinctSearchEnginesEvolution is not empty %}
-                            {{ numberDistinctSearchEnginesEvolution }}
+                            {{ numberDistinctSearchEnginesEvolution|raw }}
                         {% endif %}
                     </div>
                     <div class="sparkline">{{ sparkline(urlSparklineDistinctKeywords) }}
                         <strong>{{ numberDistinctKeywords }}</strong> {{ 'Referers_DistinctKeywords'|translate }}
                         {% if numberDistinctKeywordsEvolution is not empty %}
-                            {{ numberDistinctKeywordsEvolution }}
+                            {{ numberDistinctKeywordsEvolution|raw }}
                         {% endif %}
                     </div>
                 </td>
@@ -79,13 +79,13 @@
                         <strong>{{ numberDistinctWebsites }}</strong> {{ 'Referers_DistinctWebsites'|translate }}
                         {{ 'Referers_UsingNDistinctUrls'|translate("<strong>"~numberDistinctWebsitesUrls~"</strong>") }}
                         {% if numberDistinctWebsitesEvolution is not empty %}
-                            {{ numberDistinctWebsitesEvolution }}
+                            {{ numberDistinctWebsitesEvolution|raw }}
                         {% endif %}
                     </div>
                     <div class="sparkline">{{ sparkline(urlSparklineDistinctCampaigns) }}
                         <strong>{{ numberDistinctCampaigns }}</strong> {{ 'Referers_DistinctCampaigns'|translate }}
                         {% if numberDistinctCampaignsEvolution is not empty %}
-                            {{ numberDistinctCampaignsEvolution }}
+                            {{ numberDistinctCampaignsEvolution|raw }}
                         {% endif %}
                     </div>
                 </td>