This commit is contained in:
Alexander M. Turek
2003-06-02 08:49:35 +00:00
parent 06b99dff39
commit 9f98bcdfd0
2 changed files with 24 additions and 22 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$Source$
2003-06-02 Alexander M. Turek <rabus@users.sourceforge.net>
* server_status.php3: RFE #723325 (Move total query statistics).
2003-06-02 Michal Cihar <nijel@users.sourceforge.net>
* libraries/display_tbl.lib.php3, lang/*: Better text on button for
executing bookmark (bug #745993).

View File

@@ -146,8 +146,27 @@ unset($tmp_array);
<br />
<li>
<!-- Queries -->
<?php echo sprintf($strQueryStatistics, number_format($serverStatus['Questions'], 0, $number_decimal_separator, $number_thousands_separator)); ?><br />
<?php echo sprintf($strQueryStatistics, number_format($serverStatus['Questions'], 0, $number_decimal_separator, $number_thousands_separator)) . "\n"; ?>
<table border="0">
<tr>
<td colspan="2">
<br />
<table border="0" align="right">
<tr>
<th>&nbsp;<?php echo $strTotalUC; ?>&nbsp;</th>
<th>&nbsp;&oslash;&nbsp;<?php echo $strPerHour; ?>&nbsp;</th>
<th>&nbsp;&oslash;&nbsp;<?php echo $strPerMinute; ?>&nbsp;</th>
<th>&nbsp;&oslash;&nbsp;<?php echo $strPerSecond; ?>&nbsp;</th>
</tr>
<tr>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format($serverStatus['Questions'], 0, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] * 3600 / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] * 60 / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr>
<td valign="top">
<table border="0">
@@ -191,26 +210,6 @@ unset($useBgcolorOne);
</table>
</td>
</tr>
<tr>
<td colspan="2">
<br />
<table border="0" align="right">
<tr>
<th>&nbsp;<?php echo $strTotalUC; ?>&nbsp;</th>
<th>&nbsp;&oslash;&nbsp;<?php echo $strPerHour; ?>&nbsp;</th>
<th>&nbsp;&oslash;&nbsp;<?php echo $strPerMinute; ?>&nbsp;</th>
<th>&nbsp;&oslash;&nbsp;<?php echo $strPerSecond; ?>&nbsp;</th>
</tr>
<tr>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format($serverStatus['Questions'], 0, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] * 3600 / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] * 60 / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
</tr>
</table>
</td>
</table>
</li>
<?php