diff --git a/core/Config.php b/core/Config.php
index ef3ad1dc8f89ac376b7561d5c30ec5f33271931e..c40484cb910b4aa213fc7f8daec36cbbb66bd879 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -279,7 +279,7 @@ class Config
}
if ($section === null) {
- throw new Exception("Error while trying to read a specific config file entry <b>'$name'</b> from your configuration files.</b>If you just completed a Piwik upgrade, please check that the file config/global.ini.php was overwritten by the latest Piwik version.");
+ throw new Exception("Error while trying to read a specific config file entry <strong>'$name'</strong> from your configuration files.</b>If you just completed a Piwik upgrade, please check that the file config/global.ini.php was overwritten by the latest Piwik version.");
}
// cache merged section for later
diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php
index 491962f5dbbfe31e9ca8d1a57f2685808f4217ff..a0be968af9e1315ff8fd5663a33aa4aa65f8ee9a 100644
--- a/core/DataTable/Renderer/Rss.php
+++ b/core/DataTable/Renderer/Rss.php
@@ -150,7 +150,7 @@ class Rss extends Renderer
protected function renderDataTable($table)
{
if ($table->getRowsCount() == 0) {
- return "<b><i>Empty table</i></b><br />\n";
+ return "<strong><em>Empty table</em></strong><br />\n";
}
$i = 1;
@@ -183,7 +183,7 @@ class Rss extends Renderer
if ($this->translateColumnNames) {
$name = $this->translateColumnName($name);
}
- $html .= "\n\t<td><b>$name</b></td>";
+ $html .= "\n\t<td><strong>$name</strong></td>";
}
}
$html .= "\n</tr>";
diff --git a/core/Log/ErrorScreenFormatter.php b/core/Log/ErrorScreenFormatter.php
index 5bd2953f11326ec79c31275101a095241c90dc37..17c312e91c7ae62bd3773fa40bdb98bfc95cdce4 100644
--- a/core/Log/ErrorScreenFormatter.php
+++ b/core/Log/ErrorScreenFormatter.php
@@ -97,7 +97,7 @@ class ErrorScreenFormatter extends ScreenFormatter
$strReturned .= "Unknown error ($errno)";
break;
}
- $strReturned .= ":</strong> <i>$errstr</i> in <b>$errfile</b> on line <b>$errline</b>\n";
+ $strReturned .= ":</strong> <em>$errstr</em> in <strong>$errfile</strong> on line <strong>$errline</strong>\n";
$strReturned .= "<br /><br />Backtrace --><div style=\"font-family:Courier;font-size:10pt\">";
$strReturned .= str_replace(array("\n", '#'), array("<br />\n", "<br />\n#"), $backtrace);
$strReturned .= "</div><br />";
diff --git a/core/Piwik.php b/core/Piwik.php
index 07713bc2cbcec9214077a4316568fdd54478e70c..e99f9f0d6c4060a894f7b8125007ff3c3dafdddb 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -1150,7 +1150,7 @@ class Piwik
}
uasort($infoIndexedByQuery, 'sortTimeDesc');
- $str = '<hr /><b>SQL Profiler</b><hr /><b>Summary</b><br/>';
+ $str = '<hr /><strong>SQL Profiler</strong><hr /><strong>Summary</strong><br/>';
$totalTime = $profiler->getTotalElapsedSecs();
$queryCount = $profiler->getTotalNumQueries();
$longestTime = 0;
@@ -1176,7 +1176,7 @@ class Piwik
*/
static private function getSqlProfilingQueryBreakdownOutput($infoIndexedByQuery)
{
- $output = '<hr /><b>Breakdown by query</b><br/>';
+ $output = '<hr /><strong>Breakdown by query</strong><br/>';
foreach ($infoIndexedByQuery as $query => $queryInfo) {
$timeMs = round($queryInfo['sumTimeMs'], 1);
$count = $queryInfo['count'];
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 64cc206d4427ef3cc7e83f18dbf32ba0381f9cbd..36ee1d183be003aad2d36137d214cd0bd37c9853 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -22,7 +22,7 @@ $piwik_minimumPHPVersion = '5.3';
$piwik_currentPHPVersion = PHP_VERSION;
$minimumPhpInvalid = version_compare($piwik_minimumPHPVersion, $piwik_currentPHPVersion) > 0;
if ($minimumPhpInvalid) {
- $piwik_errorMessage .= "<p><b>To run Piwik you need at least PHP version $piwik_minimumPHPVersion</b></p>
+ $piwik_errorMessage .= "<p><strong>To run Piwik you need at least PHP version $piwik_minimumPHPVersion</strong></p>
<p>Unfortunately it seems your webserver is using PHP version $piwik_currentPHPVersion. </p>
<p>Please try to update your PHP version, Piwik is really worth it! Nowadays most web hosts
support PHP $piwik_minimumPHPVersion.</p>
@@ -30,25 +30,25 @@ if ($minimumPhpInvalid) {
} else {
$piwik_zend_compatibility_mode = ini_get("zend.ze1_compatibility_mode");
if ($piwik_zend_compatibility_mode == 1) {
- $piwik_errorMessage .= "<p><b>Piwik is not compatible with the directive <code>zend.ze1_compatibility_mode = On</code></b></p>
+ $piwik_errorMessage .= "<p><strong>Piwik is not compatible with the directive <code>zend.ze1_compatibility_mode = On</code></strong></p>
<p>It seems your php.ini file has <pre>zend.ze1_compatibility_mode = On</pre>It makes PHP5 behave like PHP4.
If you want to use Piwik you need to set <pre>zend.ze1_compatibility_mode = Off</pre> in your php.ini configuration file, and restart your web server. You may have to ask your system administrator.</p>";
}
if (!class_exists('ArrayObject')) {
- $piwik_errorMessage .= "<p><b>Piwik and Zend Framework require the SPL extension</b></p>
+ $piwik_errorMessage .= "<p><strong>Piwik and Zend Framework require the SPL extension</strong></p>
<p>It appears your PHP was compiled with <pre>--disable-spl</pre>.
To enjoy Piwik, you need PHP compiled without that configure option.</p>";
}
if (!extension_loaded('session')) {
- $piwik_errorMessage .= "<p><b>Piwik and Zend_Session require the session extension</b></p>
+ $piwik_errorMessage .= "<p><strong>Piwik and Zend_Session require the session extension</strong></p>
<p>It appears your PHP was compiled with <pre>--disable-session</pre>.
To enjoy Piwik, you need PHP compiled without that configure option.</p>";
}
if (!function_exists('ini_set')) {
- $piwik_errorMessage .= "<p><b>Piwik and Zend_Session require the <code>ini_set()</code> function</b></p>
+ $piwik_errorMessage .= "<p><strong>Piwik and Zend_Session require the <code>ini_set()</code> function</strong></p>
<p>It appears your PHP has disabled this function.
To enjoy Piwik, you need remove <pre>ini_set</pre> from your <pre>disable_functions</pre> directive in php.ini, and restart your webserver.</p>";
}
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php
index ac8e31ac84897ef40e7dbd33e7a5ad9d96a2968c..5c391425aa18e53357bda46865e33965b7532adc 100644
--- a/plugins/API/Controller.php
+++ b/plugins/API/Controller.php
@@ -108,12 +108,12 @@ class Controller extends \Piwik\Controller
}
echo "
- <b>Dimensions</b>
+ <strong>Dimensions</strong>
<table>
$tableDimensions
</table>
<br/>
- <b>Metrics</b>
+ <strong>Metrics</strong>
<table>
$tableMetrics
</table>
diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig
index b30bc150d03b837c6845f348b7d9da8a79e4c315..fd052328516a06f32668e50366389f1225c98ca0 100644
--- a/plugins/API/templates/listAllAPI.twig
+++ b/plugins/API/templates/listAllAPI.twig
@@ -20,14 +20,14 @@
{% endif %}
<p>
- <b>{{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api/reference'>","</a>")|raw }}</b>
+ <strong>{{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api/reference'>","</a>")|raw }}</strong>
</p>
<h2>{{ 'API_UserAuthentication'|translate }}</h2>
<p>
{{ 'API_UsingTokenAuth'|translate('<b>','</b>',"")|raw }}<br/>
- <span id='token_auth'>&token_auth=<b>{{ token_auth }}</b></span><br/>
+ <span id='token_auth'>&token_auth=<strong>{{ token_auth }}</strong></span><br/>
{{ 'API_KeepTokenSecret'|translate('<b>','</b>')|raw }}
{{ list_api_methods_with_links|raw }}
<br/>
diff --git a/plugins/CoreHome/templates/_periodSelect.twig b/plugins/CoreHome/templates/_periodSelect.twig
index b0b3b811238e7b1e9be5df0a8e2b52fbd879deb5..3c383830927507714eecc407b7e75ea5fa2f94ff 100644
--- a/plugins/CoreHome/templates/_periodSelect.twig
+++ b/plugins/CoreHome/templates/_periodSelect.twig
@@ -1,7 +1,7 @@
{{ loadJavascriptTranslations(['CoreHome'])|raw }}
<div id="periodString">
- <div id="date">{{ 'General_DateRange'|translate }} <b>{{ prettyDate }}</b></div>
+ <div id="date">{{ 'General_DateRange'|translate }} <strong>{{ prettyDate }}</strong></div>
<div class="calendar-icon"></div>
<div id="periodMore">
<div class="period-date">
diff --git a/plugins/CoreHome/templates/_topBarTopMenu.twig b/plugins/CoreHome/templates/_topBarTopMenu.twig
index 6e7992e7ac8f72b3d6cfee46ad3e48ec02503571..d403a87ca31caa19e4aadcc358c40f8f7ed9112a 100644
--- a/plugins/CoreHome/templates/_topBarTopMenu.twig
+++ b/plugins/CoreHome/templates/_topBarTopMenu.twig
@@ -3,7 +3,7 @@
{% if menu._html is defined %}
{{ menu._html|raw }}
{% elseif (menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %}
- <span class="topBarElem topBarElemActive"><b>{{ label|translate }}</b></span> |
+ <span class="topBarElem topBarElemActive"><strong>{{ label|translate }}</strong></span> |
{% else %}
<span class="topBarElem" {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %}>
<a id="topmenu-{{ menu._url.module|lower }}" href="index.php{{ menu._url|urlRewriteWithParameters }}">{{ label|translate }}</a>
diff --git a/plugins/CorePluginsAdmin/templates/extend.twig b/plugins/CorePluginsAdmin/templates/extend.twig
index e72a479c75b8437ece54ed7adcf48094004aef32..6c5c22158021c105e4cd63d038d662b044f748df 100644
--- a/plugins/CorePluginsAdmin/templates/extend.twig
+++ b/plugins/CorePluginsAdmin/templates/extend.twig
@@ -11,8 +11,8 @@
The <a href='?module=Proxy&action=redirect&url=http://plugins.piwik.org/' target='_blank'>Marketplace</a> is where
developers publish their plugins and themes to make them available to all Piwik users.</p>
- <i>Note: all plugins are available for free at present; in the future we will enable Paid Plugins in the Marketplace
+ <em>Note: all plugins are available for free at present; in the future we will enable Paid Plugins in the Marketplace
(<a href='mailto:hello@piwik.org?subject=Marketplace - Sell Plugin'>contact us</a> for early access).
- </i>
+ </em>
</div>
{% endblock %}
diff --git a/plugins/CoreUpdater/templates/newVersionAvailable.twig b/plugins/CoreUpdater/templates/newVersionAvailable.twig
index 2e4bbb07618b883c9f4da89b83791bddba6caa7a..f77728e2258f4b84677930b19f76617f1567b478 100644
--- a/plugins/CoreUpdater/templates/newVersionAvailable.twig
+++ b/plugins/CoreUpdater/templates/newVersionAvailable.twig
@@ -2,7 +2,7 @@
{% block content %}
<br/>
-<p><b>{{ 'CoreUpdater_ThereIsNewVersionAvailableForUpdate'|translate }}</b></p>
+<p><strong>{{ 'CoreUpdater_ThereIsNewVersionAvailableForUpdate'|translate }}</strong></p>
{% if can_auto_update %}
<p>{{ 'CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage'|translate(piwik_new_version) }}</p>
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
index 99546054dce3e62047219f39eb39188fcd9c32e4..16a30b9672bc893737f98aeda2e789de352dddea 100644
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
@@ -69,7 +69,7 @@
{% endif %}
{% if warningMessages|length > 0 %}
- <p><i>{{ warningMessages[0] }}</i>
+ <p><em>{{ warningMessages[0] }}</em>
{% if warningMessages|length > 1 %}
<button id="more-results" class="ui-button ui-state-default ui-corner-all">{{ 'General_Details'|translate }}</button>
{% endif %}
diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js
index 358486ddadd599f4c695de92919c4cc072983c59..499e14bfe16d68a8cc68e4653c228f7bce4e9779 100644
--- a/plugins/CoreVisualizations/javascripts/jqplot.js
+++ b/plugins/CoreVisualizations/javascripts/jqplot.js
@@ -174,7 +174,7 @@ JQPlot.prototype = {
}
var label = self.params.axes.xaxis.labels[i];
- var text = '<b>' + value + '</b> ' + series + percentage;
+ var text = '<strong>' + value + '</strong> ' + series + percentage;
$(this).tooltip({
track: true,
items: '*',
@@ -190,7 +190,7 @@ JQPlot.prototype = {
var label = self.data[0][i][0];
- var text = '<b>' + percentage + '%</b> (' + value + ' ' + series + ')';
+ var text = '<strong>' + percentage + '%</strong> (' + value + ' ' + series + ')';
$(this).tooltip({
track: true,
items: '*',
@@ -391,7 +391,7 @@ JQPlot.prototype = {
for (var d = 0; d < self.data.length; d++) {
var value = self.formatY(self.data[d][tick], d);
var series = self.params.series[d].label;
- text.push('<b>' + value + '</b> ' + series);
+ text.push('<strong>' + value + '</strong> ' + series);
}
$(this).tooltip({
track: true,
diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php
index dc71ef2cbdc8dbd611ba448c339fb07f9881bd06..866428bd8aa7f80dec24d94b335e00e3440aab3e 100644
--- a/plugins/ExamplePlugin/Controller.php
+++ b/plugins/ExamplePlugin/Controller.php
@@ -43,7 +43,7 @@ class Controller extends \Piwik\Controller
echo "<p>Hello world! <br /> You can output whatever you want in widgets, and put them on dashboard or everywhere on the web (in your blog, website, etc.).
<br />Widgets can include graphs, tables, flash, text, images, etc.
<br />It's very easy to create a new plugin and widgets in Piwik. Have a look at this example file (/plugins/ExamplePlugin/ExamplePlugin.php).
- <div id='happycoding'><i>Happy coding!</i></div>
+ <div id='happycoding'><em>Happy coding!</em></div>
<div id='jsenabled'>You can easily use Jquery in widgets</div>
<p>
<script type=\"text/javascript\">$('#happycoding').hide().fadeIn(5000);$('#jsenabled').hide().css({'color':'red'}).fadeIn(10000);</script>";
@@ -73,13 +73,13 @@ class Controller extends \Piwik\Controller
public function index()
{
$out = '';
- $out .= '<i>This page aims to list the different functions you can use when programming plugins for Piwik.</i><br />';
- $out .= '<b>Be careful, the following APIs may change in the near future as Piwik is still in development.</b><br />';
+ $out .= '<em>This page aims to list the different functions you can use when programming plugins for Piwik.</em><br />';
+ $out .= '<strong>Be careful, the following APIs may change in the near future as Piwik is still in development.</strong><br />';
$out .= '<h2>General</h2>';
$out .= '<h3>Accessible from your plugin controller</h3>';
- $out .= '<code>$this->date</code> = current selected <b>Date</b> object (<a href="https://github.com/piwik/piwik/blob/master/core/Date.php">class</a>)<br />';
+ $out .= '<code>$this->date</code> = current selected <strong>Date</strong> object (<a href="https://github.com/piwik/piwik/blob/master/core/Date.php">class</a>)<br />';
$out .= '<code>$period = Common::getRequestVar("period");</code> - Get the current selected period<br />';
$out .= '<code>$idSite = Common::getRequestVar("idSite");</code> - Get the selected idSite<br />';
$out .= '<code>$site = new Site($idSite);</code> - Build the Site object (<a href="https://github.com/piwik/piwik/tree/master/core/Site.php">class</a>)<br />';
diff --git a/plugins/Feedback/stylesheets/feedback.less b/plugins/Feedback/stylesheets/feedback.less
index 258f078ca1f6347cd5e4dd3d92a3d756bb78c93e..6ecdf3d151866477ae72a4a0ad31622ffe028e30 100644
--- a/plugins/Feedback/stylesheets/feedback.less
+++ b/plugins/Feedback/stylesheets/feedback.less
@@ -53,7 +53,7 @@
position: relative;
}
-#feedback-form label i {
+#feedback-form label em {
font-style: normal;
color: #cbcbcb;
}
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index 9ad96bea94ad61bf097642a382293be1f5cde20a..6a1f5094adca9407dfc2166695bf0bd62f8c5f56 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -61,7 +61,7 @@
<label>{{ 'Feedback_MyEmailAddress'|translate }}</label>
<input type="text" name="email" size="59"/>
<input type="hidden" name="nonce" value="{{ nonce }}"/><br/>
- <label>{{ 'Feedback_MyMessage'|translate }}<br/><i>{{ 'Feedback_DetailsPlease'|translate }}</i></label>
+ <label>{{ 'Feedback_MyMessage'|translate }}<br/><em>{{ 'Feedback_DetailsPlease'|translate }}</em></label>
<textarea name="body" cols="57" rows="10">Please write your message in English</textarea><br/>
<label><a href="#" id="feedback-home"><img src="plugins/Feedback/images/go-previous.png" border="0" title="{{ 'General_Previous'|translate }}"
alt="[{{ 'General_Previous'|translate }}]"/></a></label>
diff --git a/plugins/Goals/templates/_titleAndEvolutionGraph.twig b/plugins/Goals/templates/_titleAndEvolutionGraph.twig
index 83335f0f7b2de742ecab171c9358651731d5bb9c..7f7b0ea455cb34805b3ba98343eed1447df6678a 100644
--- a/plugins/Goals/templates/_titleAndEvolutionGraph.twig
+++ b/plugins/Goals/templates/_titleAndEvolutionGraph.twig
@@ -54,7 +54,7 @@
{% if ecommerce is defined %}
<div id='rightcolumn' {% if not isWidget %}style='width:30%;'{% endif %}>
<div>
- <img src='plugins/Zeitgeist/images/ecommerceAbandonedCart.gif'> <i>{{ 'General_AbandonedCarts'|translate }}</i>
+ <img src='plugins/Zeitgeist/images/ecommerceAbandonedCart.gif'> <em>{{ 'General_AbandonedCarts'|translate }}</em>
</div>
<div class="sparkline">
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index ef2e60453d889ae39eac1492d3aa9b196bdafff7..a3585ba92894b4cd17e6b34bf6e8ff6ada58c24d 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 fdd8f7475afdc541a379582d21495964b9e84d2d..0b3267ba71155516788ab0e572bf5314a59693b5 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 2675e2467b074b0bf6d4dd8002865e7e7d5bb3e0..4ed944eee19eadb64785c7c1d1d07766629471cb 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 e5c8e8bea8c0838b54adae0ffffa62e66218a49c..36ce2614e23270d22d9d96bc125a1892018868f5 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 feffadd1d2c22f8bde1c1786c5d20494d2f33d34..d9852e0c1992cfd9cbcc844f72b5420efa419183 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 e6ad3e174ba13f64499555adc8a4fdd051f88086..cf2d2f348f7a2f0850c81187a7f12a68cbe2a5a4 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>
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index 1681bcbfd862faf0f96b0481c18956a50a4693b2..87b9dd1c3946ac00b36ee0b02dbd9b09056def09 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -7,7 +7,7 @@
<div style="display:none;" class="idvisit">{{ visitor.idVisit }}</div>
<div title="{{ visitor.actionDetails|length }} {{ 'Live_Actions'|translate }}" class="datetime">
<span style="display:none;" class="serverTimestamp">{{ visitor.serverTimestamp|raw }}</span>
- {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<i>({{ visitor.visitDurationPretty|raw }})</i>{% endif %}
+ {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<em>({{ visitor.visitDurationPretty|raw }})</em>{% endif %}
<img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {{ visitor.providerName }}"/>
<img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'UserSettings_Plugins'|translate }}: {{ visitor.plugins }}"/>
<img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}, {{ visitor.resolution }}"/>
@@ -125,7 +125,7 @@
{% endif %}
{% endfor %}
{% if visitor.actionDetails|length > maxPagesDisplayedByVisitor %}
- <i>({{ 'Live_MorePagesNotDisplayed'|translate }})</i>
+ <em>({{ 'Live_MorePagesNotDisplayed'|translate }})</em>
{% endif %}
</div>
</li>
diff --git a/plugins/Live/templates/getVisitorLog.twig b/plugins/Live/templates/getVisitorLog.twig
index 29023245df4df1b2331c116e5c35cd8f5bc3bc77..c97897d050389283c008eddac096d79b67b2d63c 100644
--- a/plugins/Live/templates/getVisitorLog.twig
+++ b/plugins/Live/templates/getVisitorLog.twig
@@ -231,7 +231,7 @@
if (repeat.length) {
repeat.html((parseInt(repeat.html()) + 1) + "x");
} else {
- prevelement.append($("<em title='{{ 'Live_PageRefreshed'|translate|e('js') }}' class='repeat'>2x</em>"));
+ prevelement.append($("<em>2x</em>").attr({'class': 'repeat', 'title': '{{ 'Live_PageRefreshed'|translate|e('js') }}'}));
}
$(this).hide();
} else {
diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php
index 7a9c36bb771ea6c2a6c8cb92fbcc178cfe130045..0d3ea6e9b0058ca7d3d711f01dbc3e7bf5a8675b 100644
--- a/plugins/MobileMessaging/SMSProvider.php
+++ b/plugins/MobileMessaging/SMSProvider.php
@@ -33,7 +33,7 @@ abstract class SMSProvider
<li> First, <a target="_blank" href="?module=Proxy&action=redirect&url=http://www.clockworksms.com/platforms/piwik/">get an API Key from Clockwork</a> (Signup is free!)
</li><li> Enter your Clockwork API Key on this page. </li>
</ul>
- <br/><i>About Clockwork: </i><ul>
+ <br/><em>About Clockwork: </em><ul>
<li>Clockwork gives you fast, reliable high quality worldwide SMS delivery, over 450 networks in every corner of the globe.
</li><li>Cost per SMS message is around ~0.08USD (0.06EUR).
</li><li>Most countries and networks are supported but we suggest you check the latest position on their coverage map <a target="_blank" href="?module=Proxy&action=redirect&url=http://www.clockworksms.com/sms-coverage/">here</a>.
diff --git a/plugins/MultiSites/javascripts/multiSites.js b/plugins/MultiSites/javascripts/multiSites.js
index 0f12b334e5c733a45ddb2fdaaaebf369ad7898ba..c79e6ee77687759967e8157e7280dcfafabd033e 100644
--- a/plugins/MultiSites/javascripts/multiSites.js
+++ b/plugins/MultiSites/javascripts/multiSites.js
@@ -208,13 +208,13 @@ function changePage(allSites, params, kind) {
function getImageForSummary(value) {
if (value > 0) {
- return '<img src="plugins/MultiSites/images/arrow_up.png" alt="" /> <b style="color: green;">' + value + ' %</b>';
+ return '<img src="plugins/MultiSites/images/arrow_up.png" alt="" /> <strong style="color: green;">' + value + ' %</strong>';
}
else if (value == 0) {
- return '<img src="plugins/MultiSites/images/stop.png" alt="" /> <b>' + value + '%</b>';
+ return '<img src="plugins/MultiSites/images/stop.png" alt="" /> <strong>' + value + '%</strong>';
}
else {
- return '<img src="plugins/MultiSites/images/arrow_down.png" alt="" /> <b style="color: red;">' + value + ' %</b>';
+ return '<img src="plugins/MultiSites/images/arrow_down.png" alt="" /> <strong style="color: red;">' + value + ' %</strong>';
}
}
diff --git a/plugins/Overlay/javascripts/Piwik_Overlay.js b/plugins/Overlay/javascripts/Piwik_Overlay.js
index e778b9dd8c0cf1bf3d4885ebb762cd4584c3cbf7..fcb2d8ddee810ba643577edbcba0ed85867678bf 100644
--- a/plugins/Overlay/javascripts/Piwik_Overlay.js
+++ b/plugins/Overlay/javascripts/Piwik_Overlay.js
@@ -60,7 +60,7 @@ var Piwik_Overlay = (function () {
track: true,
items: '*',
tooltipClass: 'Overlay_Tooltip',
- content: '<b>' + Piwik_Overlay_Translations.domain + ':</b> ' +
+ content: '<strong>' + Piwik_Overlay_Translations.domain + ':</strong> ' +
piwikHelper.addBreakpointsToUrl(iframeDomain),
show: false,
hide: false
diff --git a/plugins/Overlay/templates/renderSidebar.twig b/plugins/Overlay/templates/renderSidebar.twig
index 03c5caf01cb6da38b6df560f0689903b6a36b9c9..ba6506381f0c7428f218506cfced4497c3d77a19 100644
--- a/plugins/Overlay/templates/renderSidebar.twig
+++ b/plugins/Overlay/templates/renderSidebar.twig
@@ -2,7 +2,7 @@
<!-- This div is removed by JS and the content is put in the location div -->
<div class="Overlay_Location">
- <b>{{ 'Overlay_Location'|translate }}:</b>
+ <strong>{{ 'Overlay_Location'|translate }}:</strong>
<span data-normalized-url="{{ normalizedUrl }}" data-label="{{ label }}">
{{ location }}
</span>
diff --git a/plugins/PDFReports/templates/reportParametersPDFReports.twig b/plugins/PDFReports/templates/reportParametersPDFReports.twig
index 3f22570bf7257c6bbea8bdebda03cd88c53499c6..96a470dfd8636aba4fb95ce356ac67562dc3ac2c 100644
--- a/plugins/PDFReports/templates/reportParametersPDFReports.twig
+++ b/plugins/PDFReports/templates/reportParametersPDFReports.twig
@@ -69,7 +69,7 @@
</td>
<td>
<input type="checkbox" id="report_email_me"/>
- <label for="report_email_me">{{ 'PDFReports_SentToMe'|translate }} (<i>{{ currentUserEmail }}</i>) </label>
+ <label for="report_email_me">{{ 'PDFReports_SentToMe'|translate }} (<em>{{ currentUserEmail }}</em>) </label>
<br/><br/>
{{ 'PDFReports_AlsoSendReportToTheseEmails'|translate }}<br/>
<textarea cols="30" rows="3" id="report_additional_emails" class="inp"></textarea>
@@ -90,7 +90,7 @@
<div class='report_evolution_graph'>
<br/>
<input type="checkbox" id="report_evolution_graph"/>
- <label for="report_evolution_graph"><i>{{ 'PDFReports_EvolutionGraph'|translate(5) }}</i></label>
+ <label for="report_evolution_graph"><em>{{ 'PDFReports_EvolutionGraph'|translate(5) }}</em></label>
</div>
</td>
</tr>
diff --git a/plugins/PleineLune/stylesheets/_layout.less b/plugins/PleineLune/stylesheets/_layout.less
index 637fd307f6f138a44621c4cbb9b3f72cd4dc431a..600eec1022d8dcb4814d81ffed10dc2b0f171c86 100644
--- a/plugins/PleineLune/stylesheets/_layout.less
+++ b/plugins/PleineLune/stylesheets/_layout.less
@@ -32,7 +32,7 @@
color: @theme-color-text-active;
}
-.topBarElemActive > b {
+.topBarElemActive > strong {
font-weight: normal;
}
diff --git a/plugins/PleineLune/stylesheets/controls/_periodSelect.less b/plugins/PleineLune/stylesheets/controls/_periodSelect.less
index c2dd7bdc766c7208dd27958f18af05a9fccc3369..50e8840a2735478c7369a59213f9e3f0f9b5a2f5 100644
--- a/plugins/PleineLune/stylesheets/controls/_periodSelect.less
+++ b/plugins/PleineLune/stylesheets/controls/_periodSelect.less
@@ -17,7 +17,7 @@
color: @theme-color-text-focus;
}
-#periodString b {
+#periodString strong {
color: inherit;
}
diff --git a/plugins/PleineLune/stylesheets/controls/_segmentSelect.less b/plugins/PleineLune/stylesheets/controls/_segmentSelect.less
index ec4c196271eed3d92e9e9ce8576bcaf469867ed0..8cd504ea59e283c769ce4aaf894c3e746d85b9f0 100644
--- a/plugins/PleineLune/stylesheets/controls/_segmentSelect.less
+++ b/plugins/PleineLune/stylesheets/controls/_segmentSelect.less
@@ -11,7 +11,7 @@
}
#segmentEditorPanel .segmentationTitle,
-.segmentationContainer > span > b,
+.segmentationContainer > span > strong,
#available_segments a.dropdown {
color: @theme-color-text-active;
}
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index b3d8fe706bab13360e6bdb88dca6859da6bd6459..60ea7e9c6f1c56c38097df9497a41d4a2c1541c2 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -5,7 +5,7 @@
{% if isSuperUser %}
<h2>{{ 'PrivacyManager_TeaserHeadline'|translate }}</h2>
<p>{{ 'PrivacyManager_Teaser'|translate('<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#optOutAnchor">',"</a>")|raw }}
- See also our official guide <b><a href='http://piwik.org/privacy/' target='_blank'>Web Analytics Privacy</a></b></p>
+ See also our official guide <strong><a href='http://piwik.org/privacy/' target='_blank'>Web Analytics Privacy</a></strong></p>
<h2 id="anonymizeIPAnchor">{{ 'PrivacyManager_UseAnonymizeIp'|translate }}</h2>
<form method="post" action="{{ {'action':'saveSettings', 'form':'formMaskLength', 'token_auth':token_auth} | urlRewriteWithParameters }}" id="formMaskLength" name="formMaskLength">
<div id='anonymizeIpSettings'>
@@ -235,7 +235,7 @@
<p>
{% if dntSupport %}
{% set action='deactivate' %}
- <b>{{ 'PrivacyManager_DoNotTrack_Enabled'|translate }}</b>
+ <strong>{{ 'PrivacyManager_DoNotTrack_Enabled'|translate }}</strong>
<br/>
{{ 'PrivacyManager_DoNotTrack_EnabledMoreInfo'|translate }}
{% else %}
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 17da96fe9090d903e2b6267737dcbdb91e245e16..7aea4328044c3532971f3dfa101481b715333f23 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -455,7 +455,7 @@ function DisplayTopKeywords($url = "")
";
echo "
- <p><b>Notes</b>: You can for example edit the code to to make the Top search keywords link to your Website search result pages.
+ <p><strong>Notes</strong>: You can for example edit the code to to make the Top search keywords link to your Website search result pages.
<br/>On medium to large traffic websites, we recommend to cache this data, as to minimize the performance impact of calling the Piwik API on each page view.
</p>
";
diff --git a/plugins/SecurityInfo/PhpSecInfo/Test/Core/magic_quotes_gpc.php b/plugins/SecurityInfo/PhpSecInfo/Test/Core/magic_quotes_gpc.php
index 2a69954f0e20886ad96fe3a5b6bb01ff0f673bf0..b847b0262eab073b0c47ca41a7293b73ab0aec84 100644
--- a/plugins/SecurityInfo/PhpSecInfo/Test/Core/magic_quotes_gpc.php
+++ b/plugins/SecurityInfo/PhpSecInfo/Test/Core/magic_quotes_gpc.php
@@ -74,7 +74,7 @@ class PhpSecInfo_Test_Core_Magic_Quotes_GPC extends PhpSecInfo_Test_Core
$this->setMessageForResult(PHPSECINFO_TEST_RESULT_OK, 'en', 'magic_quotes_gpc is disabled, which is the recommended setting');
$this->setMessageForResult(PHPSECINFO_TEST_RESULT_NOTICE, 'en', 'magic_quotes_gpc is enabled. This
feature is inconsistent in blocking attacks, and can in some cases cause data loss with
- uploaded files. You should <i>not</i> rely on magic_quotes_gpc to block attacks. It is
+ uploaded files. You should <em>not</em> rely on magic_quotes_gpc to block attacks. It is
recommended that magic_quotes_gpc be disabled, and input filtering be handled by your PHP
scripts');
}
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index d15d082d74dab2044e1eec8c02750bc3d6a77622..a5f6e9b9434bf0291603255ef7a57bea9829d1be 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -84,7 +84,7 @@ Segmentation = (function($) {
{
var selector = 'div.segmentList ul li[data-definition="'+current+'"]';
var foundItems = $(selector);
- var title = $('<b></b>');
+ var title = $('<strong></strong>');
if( foundItems.length > 0) {
var name = $(foundItems).first().find("span.segname").text();
title.text(name);
diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less
index 6a650d31274c4fd2b35dcd6fa7fdb1045e3748f2..28f68fccda8fc05fddd1566e8f5eacd91668000b 100644
--- a/plugins/SegmentEditor/stylesheets/segmentation.less
+++ b/plugins/SegmentEditor/stylesheets/segmentation.less
@@ -455,7 +455,7 @@ div.scrollable {
border-color: #a9a399;
}
-.segmentationContainer > span > b {
+.segmentationContainer > span > strong {
color: #255792;
}
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 5ca338282696cc42977ae07bbbf78827afb8f873..db68b112ccb2f1bd51c09bdbfc626eff34a78681 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -21,7 +21,6 @@ use Piwik\Tracker\Cache;
use Piwik\Url;
use Piwik\TaskScheduler;
use Piwik\Site;
-use false;
/**
* The SitesManager API gives you full control on Websites in Piwik (create, update and delete), and many methods to retrieve websites based on various attributes.
diff --git a/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig b/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig
index a4d6b1cd972a7e8367e2004d59963f4fc85d87fd..845849cfa04fb068ad11df2866e2e85bac1a3664 100644
--- a/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig
+++ b/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig
@@ -10,7 +10,7 @@ The Image Tracker code can be used when Javascript is not allowed.
<p>Some websites like MySpace or eBay will not allow users to add Javascript to their profile but accept HTML. In this case, you can still track visits with
Piwik using the Image Tracker.
<br/>
- <b>Note</b>: the code doesn't use Javascript so <b>Piwik will not be able to track some user information</b>
+ <strong>Note</strong>: the code doesn't use Javascript so <strong>Piwik will not be able to track some user information</strong>
such as search keywords, referrers, screen resolutions, browser plugins and page titles.
</p>
<code>
@@ -21,16 +21,16 @@ The Image Tracker code can be used when Javascript is not allowed.
<br/>
The following parameters can also be passed to the image URL:
<ul>
- <li><i>rec</i> - (required) The parameter &rec=1 is required to force the request to be recorded</li>
- <li><i>idsite</i> - (required) Defines the Website ID being tracked</li>
- <li><i>action_name</i> - Defines the custom Page Title for this page view</li>
- <li><i>urlref</i> - The Referrer URL: must be set to the referrer URL used before landing on the page containing the Image tracker. For example, in PHP
+ <li><em>rec</em> - (required) The parameter &rec=1 is required to force the request to be recorded</li>
+ <li><em>idsite</em> - (required) Defines the Website ID being tracked</li>
+ <li><em>action_name</em> - Defines the custom Page Title for this page view</li>
+ <li><em>urlref</em> - The Referrer URL: must be set to the referrer URL used before landing on the page containing the Image tracker. For example, in PHP
this value is accessible via
<pre>$_SERVER['HTTP_REFERER']</pre>
</li>
- <li><i>idgoal</i> - The request will trigger the given Goal</li>
- <li><i>revenue</i> - Used with idgoal, defines the custom revenue for this conversion</li>
- <li><i>and more!</i> - There are many more parameters you can set beyond the main ones above. See the <a
+ <li><em>idgoal</em> - The request will trigger the given Goal</li>
+ <li><em>revenue</em> - Used with idgoal, defines the custom revenue for this conversion</li>
+ <li><em>and more!</em> - There are many more parameters you can set beyond the main ones above. See the <a
href='http://piwik.org/docs/tracking-api/reference/'>Tracking API documentation page</a>.
</li>
</ul>
@@ -46,7 +46,7 @@ It is also possible to call the Piwik Tracking API using your favorite programmi
website, etc.).
</p>
- <p>We currently provide a <b>PHP client</b> to call the API from your PHP projects.
+ <p>We currently provide a <strong>PHP client</strong> to call the API from your PHP projects.
If you would like to contribute a version of the client in another programming language (Python, Java, Ruby, Perl, etc.) please <a target='_blank'
href='http://dev.piwik.org/'>create
a ticket</a> in our developer area (please attach the client code to the ticket).
@@ -73,7 +73,7 @@ It is also possible to call the Piwik Tracking API using your favorite programmi
<li>Choose a Tracking method, then paste the code onto every page you want to track.
<ul>
- <li><b>Method 1: Advanced Image Tracker</b>
+ <li><strong>Method 1: Advanced Image Tracker</strong>
<br/>
<p>The client is used to generate the tracking URL that is wrapped inside a HTML <img src=''> code.
@@ -95,7 +95,7 @@ It is also possible to call the Piwik Tracking API using your favorite programmi
</p>
</li>
- <li><b>Method 2: HTTP Request</b>
+ <li><strong>Method 2: HTTP Request</strong>
<br/>
<p>You can also query the Piwik Tracker API remotely via HTTP.
diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig
index 6dd623d7c32bf21fc64adcb8326554c9e1a680ad..902dc03e25c8ebb02ecf0be5b51c87aa9993f60d 100644
--- a/plugins/SitesManager/templates/index.twig
+++ b/plugins/SitesManager/templates/index.twig
@@ -265,7 +265,7 @@
<tr>
<td colspan="2">
- <b>{{ 'SitesManager_GlobalListExcludedQueryParameters'|translate }}</b>
+ <strong>{{ 'SitesManager_GlobalListExcludedQueryParameters'|translate }}</strong>
<p>{{ 'SitesManager_ListOfQueryParametersToBeExcludedOnAllWebsites'|translate }} </p>
</td>
@@ -335,7 +335,7 @@
{# global site search #}
<tr>
<td colspan="2">
- <b id="globalSiteSearch">{{ 'SitesManager_TrackingSiteSearch'|translate }}</b>
+ <strong id="globalSiteSearch">{{ 'SitesManager_TrackingSiteSearch'|translate }}</strong>
<p>{{ sitesearchIntro }}</p>
<span class="form-description" style="font-size:8pt;">
diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js
index d442a0cf4cb67f8f891536db879919fab6e47e67..f19c84d8c9ee0a3ea9e9be0ac34873c1faae6262 100644
--- a/plugins/Transitions/javascripts/transitions.js
+++ b/plugins/Transitions/javascripts/transitions.js
@@ -236,7 +236,7 @@ Piwik_Transitions.prototype.preparePopover = function () {
var text = Piwik_Transitions_Translations.ShareOfAllPageviews;
text = text.replace(/%s/, self.model.pageviews).replace(/%s/, share + '%');
- text += '<br /><i>' + Piwik_Transitions_Translations.DateRange + ' ' + self.model.date + '</i>';
+ text += '<br /><em>' + Piwik_Transitions_Translations.DateRange + ' ' + self.model.date + '</em>';
var title = '<h3>' + piwikHelper.addBreakpointsToUrl(self.actionName) + '</h3>';
@@ -386,7 +386,7 @@ Piwik_Transitions.prototype.renderCenterBox = function () {
Piwik_Transitions.prototype.addTooltipShowingPercentageOfAllPageviews = function(element, metric) {
var tip = Piwik_Transitions_Translations.XOfAllPageviews;
var percentage = this.model.getPercentage(metric, true);
- tip = tip.replace(/%s/, '<b>' + percentage + '</b>');
+ tip = tip.replace(/%s/, '<strong>' + percentage + '</strong>');
element.tooltip({
track: true,
@@ -539,7 +539,7 @@ Piwik_Transitions.prototype.renderOpenGroup = function (groupName, side, onlyBg)
}
var tooltip = Piwik_Transitions_Translations.XOfY;
- tooltip = '<b>' + tooltip.replace(/%s/, data.referrals + '</b>').replace(/%s/, nbTransitions);
+ tooltip = '<strong>' + tooltip.replace(/%s/, data.referrals + '</strong>').replace(/%s/, nbTransitions);
tooltip = this.model.getShareInGroupTooltip(tooltip, groupName);
var fullLabel = label;
diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js
index ed06e8a9a1d27147beb1622de7032c676781be5e..a4182ae2a101d06ce138556fc9226ff92f1ed334 100644
--- a/plugins/UserCountryMap/javascripts/realtime-map.js
+++ b/plugins/UserCountryMap/javascripts/realtime-map.js
@@ -130,7 +130,7 @@
}
function relativeTime(ds) {
- var val = function (val) { return '<b>' + Math.round(val) + '</b>'; };
+ var val = function (val) { return '<strong>' + Math.round(val) + '</strong>'; };
return (ds < 90 ? _.seconds_ago.replace('%s', val(ds))
: ds < 5400 ? _.minutes_ago.replace('%s', val(ds / 60))
: ds < 129600 ? _.hours_ago.replace('%s', val(ds / 3600))
@@ -158,11 +158,11 @@
// local time
'<small>' + _.local_time + ': ' + r.visitLocalTime + '</small><br />' +
// goals, if available
- (self.config.siteHasGoals && r.goalConversions ? '<small>' + _.goal_conversions.replace('%s', '<b>' + r.goalConversions + '</b>') +
+ (self.config.siteHasGoals && r.goalConversions ? '<small>' + _.goal_conversions.replace('%s', '<strong>' + r.goalConversions + '</strong>') +
(r.searches > 0 ? ', ' + _.searches.replace('%s', r.searches) : '') + '</small><br />' : '') +
// actions and searches
- '<small>' + _.actions.replace('%s', '<b>' + r.actions + '</b>') +
- (r.searches > 0 ? ', ' + _.searches.replace('%s', '<b>' + r.searches + '</b>') : '') + '</small>';
+ '<small>' + _.actions.replace('%s', '<strong>' + r.actions + '</strong>') +
+ (r.searches > 0 ? ', ' + _.searches.replace('%s', '<strong>' + r.searches + '</strong>') : '') + '</small>';
}
/*
diff --git a/plugins/UserCountryMap/javascripts/visitor-map.js b/plugins/UserCountryMap/javascripts/visitor-map.js
index 52318655839c5a195dcb08886b595a5b9d08444a..963a0f3ebce2841804d590fd4b6c283c4df9ee3f 100644
--- a/plugins/UserCountryMap/javascripts/visitor-map.js
+++ b/plugins/UserCountryMap/javascripts/visitor-map.js
@@ -114,7 +114,7 @@
function formatValueForTooltips(data, metric, id) {
var val = data[metric] % 1 === 0 || Number(data[metric]) != data[metric] ? data[metric] : data[metric].toFixed(1),
- v = _[metric].replace('%s', '<b>' + val + '</b>');
+ v = _[metric].replace('%s', '<strong>' + val + '</strong>');
if (val == 1 && metric == 'nb_visits') v = _.one_visit;
@@ -404,7 +404,7 @@
$('.map-stats').html(formatValueForTooltips(UserCountryMap.countriesByIso[id], metric, 'world'));
} else {
$('.map-stats').html(
- _.nb_visits.replace('%s', '<b>' + formatNumber(totalVisits) + '</b>') + (id != 'world' ? ' (' +
+ _.nb_visits.replace('%s', '<strong>' + formatNumber(totalVisits) + '</strong>') + (id != 'world' ? ' (' +
formatPercentage(totalVisits / worldTotalVisits) + ')' : '')
);
}
@@ -709,7 +709,7 @@
var metric = $$('.userCountryMapSelectMetrics').val(),
region = regionDict[regionCode(data)];
if (region === undefined) {
- return '<h3>' + data.name + '</h3><p>' + _.nb_visits.replace('%s', '<b>0</b>') + '</p>';
+ return '<h3>' + data.name + '</h3><p>' + _.nb_visits.replace('%s', '<strong>0</strong>') + '</p>';
}
return '<h3>' + data.name + '</h3>' +
formatValueForTooltips(region, metric, iso);
diff --git a/plugins/UserCountryMap/templates/visitorMap.twig b/plugins/UserCountryMap/templates/visitorMap.twig
index 53a7974211d5bbb95064155b7da424220c09c0f2..8e3308b29741291f7db7873746a98693d5902bd5 100644
--- a/plugins/UserCountryMap/templates/visitorMap.twig
+++ b/plugins/UserCountryMap/templates/visitorMap.twig
@@ -4,7 +4,7 @@
<div class="UserCountryMap-overlay UserCountryMap-title">
<div class="content">
<!--<div class="map-title" style="font-weight:bold; color:#9A9386;"></div>-->
- <div class="map-stats" style="color:#565656;"><b></b></div>
+ <div class="map-stats" style="color:#565656;"></div>
</div>
</div>
<div class="UserCountryMap-overlay UserCountryMap-legend">
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 7b1a211ff6a7bc4be0d01be60ddd442dd7b859d3..54d6f520207231c93cfe14f01db8a8a500f46e26 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -116,7 +116,7 @@
{% if isSuperUser %}
<h2>{{ 'UsersManager_MenuAnonymousUserSettings'|translate }}</h2>
{% if anonymousSites|length == 0 %}
- <h3 class='form-description'><b>{{ 'UsersManager_NoteNoAnonymousUserAccessSettingsWontBeUsed2'|translate }}</b></h3>
+ <h3 class='form-description'><strong>{{ 'UsersManager_NoteNoAnonymousUserAccessSettingsWontBeUsed2'|translate }}</strong></h3>
<br/>
{% else %}
<br/>
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index b626e6cddfd6dcdbb6f5e725a62cb3e5e0e440a4..ba35e5a247af19b8c8992206a12b7f94c2778343 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -50,7 +50,7 @@ class VisitTime extends \Piwik\Plugin
'module' => 'VisitTime',
'action' => 'getVisitInformationPerLocalTime',
'dimension' => Piwik_Translate('VisitTime_ColumnLocalTime'),
- 'documentation' => Piwik_Translate('VisitTime_WidgetLocalTimeDocumentation', array('<b>', '</b>')),
+ 'documentation' => Piwik_Translate('VisitTime_WidgetLocalTimeDocumentation', array('<strong>', '</strong>')),
'constantRowsCount' => true,
'order' => 20
);
@@ -61,7 +61,7 @@ class VisitTime extends \Piwik\Plugin
'module' => 'VisitTime',
'action' => 'getVisitInformationPerServerTime',
'dimension' => Piwik_Translate('VisitTime_ColumnServerTime'),
- 'documentation' => Piwik_Translate('VisitTime_WidgetServerTimeDocumentation', array('<b>', '</b>')),
+ 'documentation' => Piwik_Translate('VisitTime_WidgetServerTimeDocumentation', array('<strong>', '</strong>')),
'constantRowsCount' => true,
'order' => 15,
);
diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig
index 2d01bf8e4013b142b7d499f4b393e8a3e21d6e08..03f548ccc61727ca7b324de7cabdb3ec13bb1984 100644
--- a/plugins/Widgetize/templates/index.twig
+++ b/plugins/Widgetize/templates/index.twig
@@ -56,7 +56,7 @@
<span id='exportAllWebsitesDashboard'></span>
</p>
- <p><b>› Select a report, and copy paste in your page the embed code below the widget:</b>
+ <p><strong>› Select a report, and copy paste in your page the embed code below the widget:</strong>
<div id="widgetPreview"></div>
diff --git a/plugins/Zeitgeist/stylesheets/base.css b/plugins/Zeitgeist/stylesheets/base.css
index 5232df72749c0c1ee355e274cf1cbe82eb746d2f..ffd6c57213b0bcd1c557996f6381de981a616715 100644
--- a/plugins/Zeitgeist/stylesheets/base.css
+++ b/plugins/Zeitgeist/stylesheets/base.css
@@ -742,7 +742,7 @@ body .ui-tooltip.small {
vertical-align: middle;
margin: 0 0 0 6px;
}
-#periodString b {
+#periodString strong {
color: #255792;
}
#periodString h6 {
diff --git a/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less b/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less
index 3a87f4eb6030ad9ab66eb04bbf214261469f20db..07af8c3acb066d4d40e123addadb46bdd768bcd8 100644
--- a/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less
+++ b/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less
@@ -39,7 +39,7 @@
margin: 0 0 0 6px;
}
-#periodString b {
+#periodString strong {
color: #255792;
}