replaced presentational html tags

6 files changed, 41 insertions, 51 deletions

diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index ef2e60453d..a3585ba928 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -614,8 +614,8 @@ class Controller extends \Piwik\Controller\Admin
         if ($error) {
             \Piwik\Plugins\Login\Controller::clearSession();
             $message = Piwik_Translate('Installation_ErrorInvalidState',
-                array('<br /><b>',
-                      '</b>',
+                array('<br /><strong>',
+                      '</strong>',
                       '<a href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>',
                       '</a>')
             );
diff --git a/plugins/Installation/templates/_systemCheckLegend.twig b/plugins/Installation/templates/_systemCheckLegend.twig
index fdd8f7475a..0b3267ba71 100644
--- a/plugins/Installation/templates/_systemCheckLegend.twig
+++ b/plugins/Installation/templates/_systemCheckLegend.twig
@@ -1,5 +1,5 @@
 <div id="systemCheckLegend">
-    <small>
+    <span style="font-size: small;">
         <h2>{{ 'Installation_Legend'|translate }}</h2>
         <br/>
         <img src='plugins/Zeitgeist/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span>
@@ -7,7 +7,7 @@
         <img src='plugins/Zeitgeist/images/error.png'/> <span style="color:red;font-weight:bold;">{{ 'General_Error'|translate }}
             : {{ 'Installation_SystemCheckError'|translate }} </span><br/>
         <img src='plugins/Zeitgeist/images/ok.png'/> <span style="color:#26981C;font-weight:bold;">{{ 'General_Ok'|translate }}</span><br/>
-    </small>
+    </span>
 </div>
 
 <p class="nextStep">
diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig
index 2675e2467b..4ed944eee1 100755
--- a/plugins/Installation/templates/_systemCheckSection.twig
+++ b/plugins/Installation/templates/_systemCheckSection.twig
@@ -34,21 +34,19 @@
     {% endfor %}
     {% if infos.adapters|length == 0 %}
         <tr>
-            <td colspan="2" class="error">
-                <small>
-                    {{ 'Installation_SystemCheckDatabaseHelp'|translate }}
-                    <p>
-                        {% if infos.isWindows %}
-                            {{ 'Installation_SystemCheckWinPdoAndMysqliHelp'|translate("<br /><br /><code>extension=php_mysqli.dll</code><br /><code>extension=php_pdo.dll</code><br /><code>extension=php_pdo_mysql.dll</code><br />")|raw|nl2br }}
-                        {% else %}
-                            {{ 'Installation_SystemCheckPdoAndMysqliHelp'|translate("<br /><br /><code>--with-mysqli</code><br /><code>--with-pdo-mysql</code><br /><br />","<br /><br /><code>extension=mysqli.so</code><br /><code>extension=pdo.so</code><br /><code>extension=pdo_mysql.so</code><br />")|raw }}
-                        {% endif %}
-                        {{ 'Installation_RestartWebServer'|translate }}
-                        <br/>
-                        <br/>
-                        {{ 'Installation_SystemCheckPhpPdoAndMysqliSite'|translate }}
-                    </p>
-                </small>
+            <td colspan="2" class="error" style="font-size: small;">
+                {{ 'Installation_SystemCheckDatabaseHelp'|translate }}
+                <p>
+                    {% if infos.isWindows %}
+                        {{ 'Installation_SystemCheckWinPdoAndMysqliHelp'|translate("<br /><br /><code>extension=php_mysqli.dll</code><br /><code>extension=php_pdo.dll</code><br /><code>extension=php_pdo_mysql.dll</code><br />")|raw|nl2br }}
+                    {% else %}
+                        {{ 'Installation_SystemCheckPdoAndMysqliHelp'|translate("<br /><br /><code>--with-mysqli</code><br /><code>--with-pdo-mysql</code><br /><br />","<br /><br /><code>extension=mysqli.so</code><br /><code>extension=pdo.so</code><br /><code>extension=pdo_mysql.so</code><br />")|raw }}
+                    {% endif %}
+                    {{ 'Installation_RestartWebServer'|translate }}
+                    <br/>
+                    <br/>
+                    {{ 'Installation_SystemCheckPhpPdoAndMysqliSite'|translate }}
+                </p>
             </td>
         </tr>
     {% endif %}
@@ -70,14 +68,12 @@
     </tr>
     {% if infos.missing_extensions|length > 0 %}
         <tr>
-            <td colspan="2" class="error">
-                <small>
-                    {% for missing_extension in infos.missing_extensions %}
-                        <p>
-                            <i>{{ helpMessages[missing_extension]|translate }}</i>
-                        </p>
-                    {% endfor %}
-                </small>
+            <td colspan="2" class="error" style="font-size: small;">
+                {% for missing_extension in infos.missing_extensions %}
+                    <p>
+                        <em>{{ helpMessages[missing_extension]|translate }}</em>
+                    </p>
+                {% endfor %}
             </td>
         </tr>
     {% endif %}
@@ -90,7 +86,7 @@
                     <span class='err'>{{ needed_function }}</span>
                     {% set hasError %}1{% endset %}
                     <p>
-                        <i>{{ helpMessages[needed_function]|translate }}</i>
+                        <em>{{ helpMessages[needed_function]|translate }}</em>
                     </p>
                 {% else %}
                     {{ ok }} {{ needed_function }}
@@ -104,18 +100,16 @@
         <td valign="top">
             {{ 'Installation_SystemCheckWriteDirs'|translate }}
         </td>
-        <td>
-            <small>
-                {% for dir, bool in infos.directories %}
-                    {% if bool %}
-                        {{ ok }}
-                    {% else %}
-                        <span style="color:red;">{{ error }}</span>
-                    {% endif %}
-                    {{ dir }}
-                    <br/>
-                {% endfor %}
-            </small>
+        <td style="font-size: small;">
+            {% for dir, bool in infos.directories %}
+                {% if bool %}
+                    {{ ok }}
+                {% else %}
+                    <span style="color:red;">{{ error }}</span>
+                {% endif %}
+                {{ dir }}
+                <br/>
+            {% endfor %}
         </td>
     </tr>
     {% if problemWithSomeDirectories %}
@@ -147,10 +141,10 @@
             {% else %}
                 {% if infos.integrity %}
                     {{ warning }}
-                    <i>{{ infos.integrityErrorMessages[0] }}</i>
+                    <em>{{ infos.integrityErrorMessages[0] }}</em>
                 {% else %}
                     {{ error }}
-                    <i>{{ infos.integrityErrorMessages[0] }}</i>
+                    <em>{{ infos.integrityErrorMessages[0] }}</em>
                 {% endif %}
                 {% if infos.integrityErrorMessages|length > 1 %}
                     <button id="more-results" class="ui-button ui-state-default ui-corner-all">{{ 'General_Details'|translate }}</button>
diff --git a/plugins/Installation/templates/databaseCheck.twig b/plugins/Installation/templates/databaseCheck.twig
index e5c8e8bea8..36ce2614e2 100644
--- a/plugins/Installation/templates/databaseCheck.twig
+++ b/plugins/Installation/templates/databaseCheck.twig
@@ -20,9 +20,7 @@
     {% if clientVersionWarning is defined %}
         <tr>
             <td colspan="2">
-                <small>
-                    <span style="color:#FF7F00;">{{ clientVersionWarning }}</span>
-                </small>
+                <span style="font-size: small;color:#FF7F00;">{{ clientVersionWarning }}</span>
             </td>
         </tr>
     {% endif %}
diff --git a/plugins/Installation/templates/firstWebsiteSetup.twig b/plugins/Installation/templates/firstWebsiteSetup.twig
index feffadd1d2..d9852e0c19 100644
--- a/plugins/Installation/templates/firstWebsiteSetup.twig
+++ b/plugins/Installation/templates/firstWebsiteSetup.twig
@@ -23,5 +23,5 @@
     {% include "genericForm.twig" %}
 {% endif %}
 <br/>
-<p><i>{{ 'Installation_SiteSetupFootnote'|translate }}</i></p>
+<p><em>{{ 'Installation_SiteSetupFootnote'|translate }}</em></p>
 {% endblock %}
\ No newline at end of file
diff --git a/plugins/Installation/templates/tablesCreation.twig b/plugins/Installation/templates/tablesCreation.twig
index e6ad3e174b..cf2d2f348f 100644
--- a/plugins/Installation/templates/tablesCreation.twig
+++ b/plugins/Installation/templates/tablesCreation.twig
@@ -7,11 +7,9 @@
     <div class="warning">{{ 'Installation_TablesWithSameNamesFound'|translate("<span id='linkToggle'>","</span>")|raw }}
         <img src="plugins/Zeitgeist/images/warning_medium.png"/>
     </div>
-    <div id="toggle" style="display:none;color:#4F2410;">
-        <small>
-            <i>{{ 'Installation_TablesFound'|translate }}: <br/>
-                {{ tablesInstalled }} </i>
-        </small>
+    <div id="toggle" style="display:none;color:#4F2410;font-size: small;">
+            <em>{{ 'Installation_TablesFound'|translate }}: <br/>
+                {{ tablesInstalled }} </em>
     </div>
     {% if showReuseExistingTables is defined %}
         <p>{{ 'Installation_TablesWarningHelp'|translate }}</p>