github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Bringing back the warning state. 

Fixes #790.
pull/805/head
TimZ99 2019-10-09 20:39:15 +02:00
parent 43c60867b3
commit 25e8cece3c
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/psm/Module/Server/Controller/StatusController.php
View File

@ -73,6 +73,7 @@ class StatusController extends AbstractServerController {
$servers = $this->getServers(); $servers = $this->getServers();
$layout_data['servers_offline'] = array(); $layout_data['servers_offline'] = array();
$layout_data['servers_warning'] = array();
$layout_data['servers_online'] = array(); $layout_data['servers_online'] = array();
foreach ($servers as $server) { foreach ($servers as $server) {
@ -91,8 +92,7 @@ class StatusController extends AbstractServerController {
if ($server['status'] == "off") { if ($server['status'] == "off") {
$layout_data['servers_offline'][] = $server; $layout_data['servers_offline'][] = $server;
} elseif ($server['warning_threshold_counter'] > 0) { } elseif ($server['warning_threshold_counter'] > 0) {
$server['class_warning'] = 'warning'; $layout_data['servers_warning'][] = $server;
$layout_data['servers_offline'][] = $server;
} else { } else {
$layout_data['servers_online'][] = $server; $layout_data['servers_online'][] = $server;
} }

29
src/templates/default/module/server/status/index.tpl.html
View File

@ -18,6 +18,21 @@
<noscript></a></noscript> <noscript></a></noscript>
</div> </div>
{% endfor %} {% endfor %}
{% for server in servers_warning %}
<div class="col-sm-4 col-md-3">
<noscript><a href="{{ server.url_view|raw }}"></noscript>
<div class="card text-white bg-warning mb-3" onclick="window.location.href='{{ server.url_view|raw }}'">
<div class="card-header">{{ server.label }}<span class="sr-only"> ({{ label_warning }})</span></div>
<div class="card-body">
<p class="card-text">
{{ label_last_online }}: {{ server.last_online_nice }}<br>
{{ label_last_check }}: {{ server.last_checked_nice }}
</p>
</div>
</div>
<noscript></a></noscript>
</div>
{% endfor %}
{% for server in servers_online %} {% for server in servers_online %}
<div class="col-sm-4 col-md-3"> <div class="col-sm-4 col-md-3">
<noscript><a href="{{ server.url_view|raw }}"></noscript> <noscript><a href="{{ server.url_view|raw }}"></noscript>
@ -34,7 +49,7 @@
<noscript></a></noscript> <noscript></a></noscript>
</div> </div>
{% endfor %} {% endfor %}
{% if not servers_offline and not servers_online %} {% if not servers_offline and not servers_warning and not servers_online %}
{{ label_none }} {{ label_none }}
<div class="w-100"></div> <div class="w-100"></div>
<button class="btn btn-primary" onclick="window.location.href='{{ url_save|raw }}'">{{ label_add_server }}</button> <button class="btn btn-primary" onclick="window.location.href='{{ url_save|raw }}'">{{ label_add_server }}</button>
@ -43,9 +58,9 @@
</div> </div>
<div id="list-layout" class="{{ list_layout_active }}" aria-labelledby="block-layout" style="display:none;"> <div id="list-layout" class="{{ list_layout_active }}" aria-labelledby="block-layout" style="display:none;">
<div class="row table-responsive"> <div class="row table-responsive">
{% if servers_offline or servers_online %} {% if servers_offline or servers_warning or servers_online %}
<table class="table table-bordered table-hover"> <table class="table table-bordered table-hover">
{% if servers_offline %} {% if servers_offline or servers_warning %}
<thead> <thead>
<tr> <tr>
<th scope="col">#</th> <th scope="col">#</th>
@ -63,6 +78,14 @@
<td></td> <td></td>
</tr> </tr>
{% endfor %} {% endfor %}
{% for server in servers_warning %}
<tr class="bg-warning text-white" onclick="window.location.href='{{ server.url_view|raw }}'">
<th class="full">{{ server.label }}<span class="sr-only"> ({{ label_warning }})</span></th>
<td>{{ server.last_online_nice }}</td>
<td>{{ server.last_checked_nice }}</td>
<td></td>
</tr>
{% endfor %}
</tbody> </tbody>
{% endif %} {% endif %}
{% if servers_online %} {% if servers_online %}