From d11fbcb347e3071a6f728a0dd0befbb00568e21e Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Mon, 12 Aug 2013 23:13:36 +0200
Subject: [PATCH] fixed some html markup errors
---
plugins/Annotations/templates/getEvolutionIcons.twig | 4 ++--
plugins/DBStats/templates/index.twig | 4 ++--
plugins/Goals/templates/_listGoalEdit.twig | 2 +-
plugins/PDFReports/templates/_listReports.twig | 2 +-
plugins/SegmentEditor/templates/getSelector.twig | 2 +-
plugins/UserCountry/templates/adminIndex.twig | 2 +-
plugins/VisitorGenerator/templates/generate.twig | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/plugins/Annotations/templates/getEvolutionIcons.twig b/plugins/Annotations/templates/getEvolutionIcons.twig
index 705738845d..583d0573a7 100755
--- a/plugins/Annotations/templates/getEvolutionIcons.twig
+++ b/plugins/Annotations/templates/getEvolutionIcons.twig
@@ -7,7 +7,7 @@
{% 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>
+ <img src="plugins/Zeitgeist/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/>
+ </span>
{% endfor %}
</div>
diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig
index 8e6e2a07fe..a052c092e7 100755
--- a/plugins/DBStats/templates/index.twig
+++ b/plugins/DBStats/templates/index.twig
@@ -18,9 +18,9 @@
<h3 style="margin-top:0">{{ 'General_GeneralInformation'|translate }}</h3><br/>
<p style="font-size:1.4em;padding-left:21px;line-height:1.8em">
- <strong><em>{{ userCount }}</strong></em> {% if userCount == 1 %}{{ 'UsersManager_User'|translate }}{% else %}{{ 'UsersManager_MenuUsers'|translate }}{% endif %}
+ <strong><em>{{ userCount }}</em></strong> {% if userCount == 1 %}{{ 'UsersManager_User'|translate }}{% else %}{{ 'UsersManager_MenuUsers'|translate }}{% endif %}
<br/>
- <strong><em>{{ siteCount }}</strong></em> {% if siteCount == 1 %}{{ 'General_Website'|translate }}{% else %}{{ 'Referers_Websites'|translate }}{% endif %}
+ <strong><em>{{ siteCount }}</em></strong> {% if siteCount == 1 %}{{ 'General_Website'|translate }}{% else %}{{ 'Referers_Websites'|translate }}{% endif %}
</p><br/>
{% set clickDeleteLogSettings %}{{ 'PrivacyManager_DeleteDataSettings'|translate }}{% endset %}
<h3 style="margin-top:0">{{ 'PrivacyManager_DeleteDataSettings'|translate }}</h3><br/>
diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig
index b8803ff577..457a20f6a3 100644
--- a/plugins/Goals/templates/_listGoalEdit.twig
+++ b/plugins/Goals/templates/_listGoalEdit.twig
@@ -17,7 +17,7 @@
<td><span class='matchAttribute'>{{ goal.match_attribute }}</span>
{% if goal.pattern_type is defined %}
<br/>
- {{ 'Goals_Pattern'|translate }} {{ goal.pattern_type }}: {{ goal.pattern|raw }}</b>
+ {{ 'Goals_Pattern'|translate }} {{ goal.pattern_type }}: {{ goal.pattern|raw }}
{% endif %}
</td>
<td>{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %}</td>
diff --git a/plugins/PDFReports/templates/_listReports.twig b/plugins/PDFReports/templates/_listReports.twig
index 78ab41e69d..2e6668a9c9 100644
--- a/plugins/PDFReports/templates/_listReports.twig
+++ b/plugins/PDFReports/templates/_listReports.twig
@@ -17,7 +17,7 @@
<td colspan='7'>
<br/>
{{ 'PDFReports_MustBeLoggedIn'|translate }}
- <br/>› <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a></strong>
+ <br/>› <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a>
<br/><br/>
</td>
</tr>
diff --git a/plugins/SegmentEditor/templates/getSelector.twig b/plugins/SegmentEditor/templates/getSelector.twig
index 2cecd2dd31..1ca6f34414 100644
--- a/plugins/SegmentEditor/templates/getSelector.twig
+++ b/plugins/SegmentEditor/templates/getSelector.twig
@@ -15,7 +15,7 @@
{% else %}
<ul class="submenu">
<li> <span class='youMustBeLoggedIn'>{{ 'SegmentEditor_YouMustBeLoggedInToCreateSegments'|translate }}
- <br/>› <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a> </span></strong>
+ <br/>› <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a> </span>
</li>
</ul>
{% endif %}
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index 79699ed088..27e2fc5722 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -79,7 +79,7 @@
{% endif %}
{% if provider.statusMessage is defined and provider.statusMessage %}
{% set brokenReason %}
- {% if provider.status == 2 %}<strong><em>{{ 'General_Error'|translate }}:</strong></em> {% endif %}{{ provider.statusMessage }}
+ {% if provider.status == 2 %}<strong><em>{{ 'General_Error'|translate }}:</em></strong> {% endif %}{{ provider.statusMessage }}
{% endset %}
{{ piwik.inlineHelp(brokenReason) }}
{% endif %}
diff --git a/plugins/VisitorGenerator/templates/generate.twig b/plugins/VisitorGenerator/templates/generate.twig
index 5fb29ffb66..969ec0298b 100644
--- a/plugins/VisitorGenerator/templates/generate.twig
+++ b/plugins/VisitorGenerator/templates/generate.twig
@@ -6,7 +6,7 @@
Generated visits for {{ siteName }} and for {{ 'General_LastDays'|translate(days) }}.<br/>
Generated {{ 'General_NbActions'|translate }}: {{ nbActionsTotal }}<br/>
{{ 'VisitorGenerator_NbRequestsPerSec'|translate }}: {{ nbRequestsPerSec }}<br/>
-{{ timer }}</p>
+{{ timer }}<br/>
<p><strong>
{% if browserArchivingEnabled %}
The reports will be reprocessed the next time you visit the Piwik reports, it might take a few minutes.
--
GitLab