Merge pull request #4 from dustindauncey/master

Improved unity in labels and made more general for users
This commit is contained in:
shevabam 2014-09-08 10:21:29 +02:00
commit d329cc43a9
2 changed files with 31 additions and 21 deletions

View File

@ -8,9 +8,9 @@
}, },
"ping": { "ping": {
"hosts": [ "hosts": [
"free.fr", "facebook.com",
"orange.fr", "google.com",
"google.com" "yahoo.com"
] ]
}, },
"last_login": { "last_login": {
@ -18,22 +18,32 @@
}, },
"services": [ "services": [
{ {
"name": "Web Server (Apache)", "name": "Web Server",
"host": "localhost", "host": "localhost",
"port": 80 "port": 80
}, },
{ {
"name": "FTP Server (ProFTPd)", "name": "Email Server (incoming)",
"host": "localhost",
"port": 993
},
{
"name": "Email Server (outgoing)",
"host": "localhost",
"port": 587
},
{
"name": "FTP Server",
"host": "localhost", "host": "localhost",
"port": 21 "port": 21
}, },
{ {
"name": "Databases (MySQL)", "name": "Database Server",
"host": "localhost", "host": "localhost",
"port": 3306 "port": 3306
}, },
{ {
"name": "SSH", "name": "SSH Service",
"host": "localhost", "host": "localhost",
"port": 22 "port": 22
} }

View File

@ -97,7 +97,7 @@ $update = $Config->checkUpdate();
<td id="system-current_users"></td> <td id="system-current_users"></td>
</tr> </tr>
<tr> <tr>
<td>Server datetime</td> <td>Server date & time</td>
<td id="system-server_date"></td> <td id="system-server_date"></td>
</tr> </tr>
</tbody> </tbody>
@ -149,15 +149,15 @@ $update = $Config->checkUpdate();
<td id="cpu-model"></td> <td id="cpu-model"></td>
</tr> </tr>
<tr> <tr>
<td>Cores #</td> <td>Cores</td>
<td id="cpu-num_cores"></td> <td id="cpu-num_cores"></td>
</tr> </tr>
<tr> <tr>
<td>CPU Speed</td> <td>Speed</td>
<td id="cpu-frequency"></td> <td id="cpu-frequency"></td>
</tr> </tr>
<tr> <tr>
<td>Cache L2</td> <td>Cache</td>
<td id="cpu-cache"></td> <td id="cpu-cache"></td>
</tr> </tr>
<tr> <tr>
@ -240,19 +240,19 @@ $update = $Config->checkUpdate();
<table class="firstBold"> <table class="firstBold">
<tbody> <tbody>
<tr> <tr>
<td class="w20p">Used RAM</td> <td class="w20p">Used</td>
<td><div class="progressbar-wrap"><div class="progressbar" style="width: 0%;">0%</div></div></td> <td><div class="progressbar-wrap"><div class="progressbar" style="width: 0%;">0%</div></div></td>
</tr> </tr>
<tr> <tr>
<td class="w20p">Used RAM</td> <td class="w20p">Used</td>
<td id="memory-used"></td> <td id="memory-used"></td>
</tr> </tr>
<tr> <tr>
<td class="w20p">Free RAM</td> <td class="w20p">Free</td>
<td id="memory-free"></td> <td id="memory-free"></td>
</tr> </tr>
<tr> <tr>
<td class="w20p">Total RAM</td> <td class="w20p">Total</td>
<td id="memory-total"></td> <td id="memory-total"></td>
</tr> </tr>
</tbody> </tbody>
@ -272,19 +272,19 @@ $update = $Config->checkUpdate();
<table class="firstBold"> <table class="firstBold">
<tbody> <tbody>
<tr> <tr>
<td class="w20p">Used Swap</td> <td class="w20p">Used</td>
<td><div class="progressbar-wrap"><div class="progressbar" style="width: 0%;">0%</div></div></td> <td><div class="progressbar-wrap"><div class="progressbar" style="width: 0%;">0%</div></div></td>
</tr> </tr>
<tr> <tr>
<td class="w20p">Used Swap</td> <td class="w20p">Used</td>
<td id="swap-used"></td> <td id="swap-used"></td>
</tr> </tr>
<tr> <tr>
<td class="w20p">Free Swap</td> <td class="w20p">Free</td>
<td id="swap-free"></td> <td id="swap-free"></td>
</tr> </tr>
<tr> <tr>
<td class="w20p">Total Swap</td> <td class="w20p">Total</td>
<td id="swap-total"></td> <td id="swap-total"></td>
</tr> </tr>
</tbody> </tbody>