summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--esm.config.json2
-rw-r--r--favicon.icobin0 -> 15086 bytes
-rw-r--r--index.php8
-rw-r--r--libs/Utils/Misc.class.php2
-rw-r--r--libs/ping.php5
5 files changed, 12 insertions, 5 deletions
diff --git a/esm.config.json b/esm.config.json
index 2e8c11f..b65412c 100644
--- a/esm.config.json
+++ b/esm.config.json
@@ -1,6 +1,6 @@
{
"esm": {
- "version": "2.2",
+ "version": "2.3",
"website": "http://www.ezservermonitor.com",
"check_updates": true,
"auto_refresh": 0
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..50fd957
--- /dev/null
+++ b/favicon.ico
Binary files differ
diff --git a/index.php b/index.php
index 8af45f3..4918e7b 100644
--- a/index.php
+++ b/index.php
@@ -11,9 +11,11 @@ $update = $Config->checkUpdate();
<?php if ($Config->get('esm:auto_refresh') > 0): ?>
<meta http-equiv="refresh" content="<?php echo $Config->get('esm:auto_refresh'); ?>">
<?php endif; ?>
+ <meta name="viewport" content="width=device-width,initial-scale=1" />
<title>eZ Server Monitor - <?php echo Misc::getHostname(); ?></title>
<link rel="stylesheet" href="web/css/utilities.css" type="text/css">
<link rel="stylesheet" href="web/css/frontend.css" type="text/css">
+ <link rel="icon" type="image/x-icon" href="favicon.ico">
<!--[if IE]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@@ -117,17 +119,17 @@ $update = $Config->checkUpdate();
</div>
<div class="box-content t-center">
- <div class="f-left w180">
+ <div class="f-left" style="width: 33%;">
<h3>1 min</h3>
<input type="text" class="gauge" id="load-average_1" value="0" data-height="100" data-width="150" data-min="0" data-max="100" data-readOnly="true" data-fgColor="#BED7EB" data-angleOffset="-90" data-angleArc="180">
</div>
- <div class="f-right w180">
+ <div class="f-right" style="width: 33%;">
<h3>15 min</h3>
<input type="text" class="gauge" id="load-average_15" value="0" data-height="100" data-width="150" data-min="0" data-max="100" data-readOnly="true" data-fgColor="#BED7EB" data-angleOffset="-90" data-angleArc="180">
</div>
- <div class="t-center" style="margin: 0 180px;">
+ <div class="t-center" style="/*margin: 0 180px;*/">
<h3>5 min</h3>
<input type="text" class="gauge" id="load-average_5" value="0" data-height="100" data-width="150" data-min="0" data-max="100" data-readOnly="true" data-fgColor="#BED7EB" data-angleOffset="-90" data-angleArc="180">
</div>
diff --git a/libs/Utils/Misc.class.php b/libs/Utils/Misc.class.php
index 3fcfedb..d77bbf5 100644
--- a/libs/Utils/Misc.class.php
+++ b/libs/Utils/Misc.class.php
@@ -17,7 +17,7 @@ class Misc
break;
}
- return round($filesize, $precision).' '.$units[$idUnit].'o';
+ return round($filesize, $precision).' '.$units[$idUnit].'B';
}
diff --git a/libs/ping.php b/libs/ping.php
index 1cadb70..9ea0ec8 100644
--- a/libs/ping.php
+++ b/libs/ping.php
@@ -14,6 +14,11 @@ foreach ($hosts as $host)
{
exec('/bin/ping -qc 1 '.$host.' | awk -F/ \'/^rtt/ { print $5 }\'', $result);
+ if (!isset($result[0]))
+ {
+ $result[0] = 0;
+ }
+
$datas[] = array(
'host' => $host,
'ping' => $result[0],