diff --git a/server_status.php b/server_status.php
index d2d57555f0..62234fbe7b 100644
--- a/server_status.php
+++ b/server_status.php
@@ -825,9 +825,9 @@ PMA_addJSVar(
*/
require 'libraries/server_common.inc.php';
-?>
-
-
';
+echo '';
+
/**
* Displays the sub-page heading
*/
@@ -1001,32 +1001,29 @@ function printQueryStatistics()
$total_queries = array_sum($used_queries);
- ?>
-
-
-
-
- ';
+ echo '';
+ /* l10n: Questions is the name of a MySQL Status variable */
+ echo sprintf(__('Questions since startup: %s'), PMA_Util::formatNumber($total_queries, 0)) . ' ';
+ echo PMA_Util::showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions');
- echo 'ø ' . __('per minute') . ': ';
- echo PMA_Util::formatNumber($total_queries * 60 / $server_status['Uptime'], 0);
- echo '
';
+ echo '
';
+ echo '';
- if ($total_queries / $server_status['Uptime'] >= 1) {
- echo 'ø ' . __('per second') . ': ';
- echo PMA_Util::formatNumber($total_queries / $server_status['Uptime'], 0);
- }
- ?>
-
-
- ';
+
+ echo 'ø ' . __('per minute') . ': ';
+ echo PMA_Util::formatNumber($total_queries * 60 / $server_status['Uptime'], 0);
+ echo '
';
+
+ if ($total_queries / $server_status['Uptime'] >= 1) {
+ echo 'ø ' . __('per second') . ': ';
+ echo PMA_Util::formatNumber($total_queries / $server_status['Uptime'], 0);
+ }
+
+ echo '';
+ echo '
';
// reverse sort by value to show most used statements first
arsort($used_queries);
@@ -1082,22 +1079,19 @@ function printQueryStatistics()
-
-
+ echo '';
+ echo '';
-
-
- 0) {
- $chart_json[__('Other')] = $other_sum;
- }
+ echo '';
+ echo '';
- echo json_encode($chart_json);
- ?>
-
-
- 0) {
+ $chart_json[__('Other')] = $other_sum;
+ }
+
+ echo json_encode($chart_json);
+ echo '';
+ echo '
';
}
/**
@@ -1119,8 +1113,8 @@ function printServerTraffic()
'SELECT UNIX_TIMESTAMP() - ' . $server_status['Uptime']
);
- ?>
- ';
+
echo sprintf(
__('Network traffic since startup: %s'),
implode(
@@ -1132,20 +1126,18 @@ function printServerTraffic()
)
)
);
- ?>
-
+ echo '';
-
- ';
+
+ printf(
__('This MySQL server has been running for %1$s. It started up on %2$s.'),
PMA_Util::timespanFormat($server_status['Uptime']),
PMA_Util::localisedDate($start_time)
) . "\n";
- ?>
-
- ';
+
if ($server_master_status || $server_slave_status) {
echo '
';
if ($server_master_status && $server_slave_status) {
@@ -1162,11 +1154,9 @@ function printServerTraffic()
/* if the server works as master or slave in replication process, display useful information */
if ($server_master_status || $server_slave_status) {
- ?>
-
+ echo '
';
-
-
' . __('Replication status') . '';
foreach ($replication_types as $type) {
if (${"server_{$type}_status"}) {