* Some more fixes

Refs #4019

8 files changed, 15 insertions, 13 deletions

diff --git a/plugins/Annotations/templates/getEvolutionIcons.twig b/plugins/Annotations/templates/getEvolutionIcons.twig
index f2475c2416..705738845d 100755
--- a/plugins/Annotations/templates/getEvolutionIcons.twig
+++ b/plugins/Annotations/templates/getEvolutionIcons.twig
@@ -4,7 +4,8 @@
         {% set counts=dateCountPair[1] %}
         <span data-date="{{ date }}" data-count="{{ counts.count }}" data-starred="{{ counts.starred }}"
               {% if counts.count == 0 %}title="{{ 'Annotations_AddAnnotationsFor_js'|translate(date) }}"
-              {% elseif counts.count == 1 %}title="{{ 'Annotations_AnnotationOnDate'|translate(date,counts.note) }}{{ 'Annotations_ClickToEditOrAdd'|translate }}"
+              {% elseif counts.count == 1 %}title="{{ 'Annotations_AnnotationOnDate'|translate(date,
+              counts.note)|raw }}{{ 'Annotations_ClickToEditOrAdd'|translate }}"
               {% else %}}title="{{ 'Annotations_ViewAndAddAnnotations_js'|translate(date) }}"{% endif %}>
 		<img src="plugins/Zeitgeist/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/>
 	</span>
diff --git a/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig
index acea8389b3..184d6fe56a 100644
--- a/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig
+++ b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig
@@ -2,11 +2,12 @@
 
     <div class="entityList">
         {% for category, dimensions in dimensionCategories %}
+        {% set firstCategory = (loop.index0 == 0) %}
             <div class='dimensionCategory'>
                 {{ category|translate }}
                 <ul class='listCircle'>
                     {% for idx, dimension in dimensions %}
-                        <li class="reportDimension {% if idx == 0 and loop.parent.index0 == 0 %}activeDimension{% endif %}"
+                        <li class="reportDimension {% if idx == 0 and firstCategory %}activeDimension{% endif %}"
                             data-url="{{ dimension.url }}">
                             <span class='dimension'>{{ dimension.title|translate }}</span>
                         </li>
diff --git a/plugins/CoreHome/templates/_dataTableActions_recursive.twig b/plugins/CoreHome/templates/_dataTableActions_recursive.twig
index 6667fe2350..3426dd11ed 100644
--- a/plugins/CoreHome/templates/_dataTableActions_recursive.twig
+++ b/plugins/CoreHome/templates/_dataTableActions_recursive.twig
@@ -1,6 +1,6 @@
 <div class="dataTable" data-table-type="actionDataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
     <div class="dataTableActionsWrapper">
-        {% if arrayDataTable.result is define and arrayDataTable.result == 'error' %}
+        {% if arrayDataTable.result is defined and arrayDataTable.result == 'error' %}
             {{ arrayDataTable.message }}
         {% else %}
             {% if arrayDataTable|length == 0 %}
diff --git a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
index 8cf72bbd4e..daf93f91b7 100644
--- a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
+++ b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
@@ -14,7 +14,7 @@
                     <td class="text">
                         {% import 'macros.twig' as piwik %}
                         {{ piwik.logoHtml(metric, "") }}
-                        <span style="color:{{ metric.color }}">{{ metric.label }}</span><br/>
+                        <span style="color:{{ metric.color }}">{{ metric.label|raw }}</span><br/>
                         <span class="details">{{ metric.details }}</span>
                     </td>
                 </tr>
diff --git a/plugins/CoreHome/templates/getRowEvolutionPopover.twig b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
index be6b659934..6179cfd5cf 100644
--- a/plugins/CoreHome/templates/getRowEvolutionPopover.twig
+++ b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
@@ -16,7 +16,7 @@
                         {{ metric.sparkline | raw }}
                     </td>
                     <td class="text">
-                        <span style="color:{{ metric.color }}">{{ metric.label }}</span>
+                        <span style="color:{{ metric.color }}">{{ metric.label|raw }}</span>
                         {% if metric.details %}:
                             <span class="details">{{ metric.details }}</span>
                         {% endif %}
@@ -29,7 +29,7 @@
         <h2>{{ 'RowEvolution_CompareRows'|translate }}</h2>
 
         <div class="rowevolution-documentation">
-            {{ 'RowEvolution_CompareDocumentation'|translate }}
+            {{ 'RowEvolution_CompareDocumentation'|translate|raw }}
         </div>
         <a href="#" class="rowevolution-startmulti">&raquo; {{ 'RowEvolution_PickARow'|translate }}</a>
     </div>
diff --git a/plugins/Live/templates/getVisitorLog.twig b/plugins/Live/templates/getVisitorLog.twig
index 28c5631bf5..7714999684 100644
--- a/plugins/Live/templates/getVisitorLog.twig
+++ b/plugins/Live/templates/getVisitorLog.twig
@@ -3,7 +3,7 @@
 {% if not isWidget %}
     <h2>{% if javascriptVariablesToSet.filterEcommerce %}{{ 'Goals_EcommerceLog'|translate }}{% else %}{{ 'Live_VisitorLog'|translate }}{% endif %}</h2>
     {% if reportDocumentation is not empty %}
-        <div class="reportDocumentation"><p>{{ reportDocumentation }}</p></div>
+        <div class="reportDocumentation"><p>{{ reportDocumentation|raw }}</p></div>
     {% endif %}
 {% endif %}
 {% set displayVisitorsInOwnColumn %}{% if isWidget %}0{% else %}1{% endif %}{% endset %}
@@ -186,7 +186,7 @@
                         {% else %}
                             {{ 'Live_Actions'|translate }}
                         {% endif %}
-                        {% if visitor.columns.visitDuration > 0 %}- {{ visitor.columns.visitDurationPretty }}{% endif %}
+                        {% if visitor.columns.visitDuration > 0 %}- {{ visitor.columns.visitDurationPretty|raw }}{% endif %}
                     </strong>
                     <br/>
                     <ol class='visitorLog'>
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index d699e17a6c..b9073bb55b 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -82,11 +82,11 @@
             {% endif %}
 
             {% if AccessErrorString %}
-                <div id="login_error"><strong>{{ 'General_Error'|translate }}</strong>: {{ AccessErrorString }}<br/></div>
+                <div id="login_error"><strong>{{ 'General_Error'|translate }}</strong>: {{ AccessErrorString|raw }}<br/></div>
             {% endif %}
 
             {% if infoMessage %}
-                <p class="message">{{ infoMessage}}</p>
+                <p class="message">{{ infoMessage|raw }}</p>
             {% endif %}
         </div>
         <form {{ form_data.attributes|raw }}>
diff --git a/plugins/SegmentEditor/templates/getSelector.twig b/plugins/SegmentEditor/templates/getSelector.twig
index 6a3d4f4ff7..181c97bd84 100644
--- a/plugins/SegmentEditor/templates/getSelector.twig
+++ b/plugins/SegmentEditor/templates/getSelector.twig
@@ -22,11 +22,11 @@
     </div>
 
     <div class="initial-state-rows">{# no space here important for jquery #}<div class="segment-add-row initial"><div>
-        <span>+ {{ 'SegmentEditor_DragDropCondition'|translate }}</span>
+        <span>+ {{ 'SegmentEditor_DragDropCondition'|translate|raw }}</span>
     </div></div>
-    <div class="segment-and">{{ 'SegmentEditor_OperatorAND'|translate }}</div>
+    <div class="segment-and">{{ 'SegmentEditor_OperatorAND'|translate|raw }}</div>
     <div class="segment-add-row initial"><div>
-        <span>+ {{ 'SegmentEditor_DragDropCondition'|translate }}</span>
+        <span>+ {{ 'SegmentEditor_DragDropCondition'|translate|raw }}</span>
     </div></div>
     </div>