Skip to content

Commit 942a607

Browse files
author
Till Brehm
committed
Fixeed UI issues in Monitor module.
1 parent 7e0103f commit 942a607

File tree

4 files changed

+55
-14
lines changed

4 files changed

+55
-14
lines changed

‎interface/web/monitor/show_data.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
$time = $app->tools_monitor->getDataTime('server_load');
5454
$title = $app->lng("Server Load").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
5555
$description = '';
56+
$add_padding = true;
5657
break;
5758
case 'disk_usage':
5859
$template = 'templates/show_data.htm';
@@ -95,41 +96,47 @@
9596
$time = $app->tools_monitor->getDataTime('openvz_beancounter');
9697
$title = $app->lng("monitor_title_beancounter_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
9798
$description = '';
99+
$add_padding = true;
98100
break;
99101
case 'system_update':
100102
$template = 'templates/show_data.htm';
101103
$output .= $app->tools_monitor->showSystemUpdate();
102104
$time = $app->tools_monitor->getDataTime('system_update');
103105
$title = $app->lng("monitor_title_updatestate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
104106
$description = '';
107+
$add_padding = true;
105108
break;
106109
case 'mailq':
107110
$template = 'templates/show_data.htm';
108111
$output .= $app->tools_monitor->showMailq();
109112
$time = $app->tools_monitor->getDataTime('mailq');
110113
$title = $app->lng("monitor_title_mailq_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
111114
$description = '';
115+
$add_padding = true;
112116
break;
113117
case 'raid_state':
114118
$template = 'templates/show_data.htm';
115119
$output .= $app->tools_monitor->showRaidState();
116120
$time = $app->tools_monitor->getDataTime('raid_state');
117121
$title = $app->lng("monitor_title_raidstate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
118122
$description = '';
123+
$add_padding = true;
119124
break;
120125
case 'rkhunter':
121126
$template = 'templates/show_data.htm';
122127
$output .= $app->tools_monitor->showRKHunter();
123128
$time = $app->tools_monitor->getDataTime('rkhunter');
124129
$title = $app->lng("monitor_title_rkhunterlog_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
125130
$description = '';
131+
$add_padding = true;
126132
break;
127133
case 'fail2ban':
128134
$template = 'templates/show_data.htm';
129135
$output .= $app->tools_monitor->showFail2ban();
130136
$time = $app->tools_monitor->getDataTime('log_fail2ban');
131137
$title = $app->lng("monitor_title_fail2ban_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
132138
$description = '';
139+
$add_padding = true;
133140
break;
134141
case 'mongodb':
135142
$template = 'templates/show_data.htm';
@@ -144,12 +151,17 @@
144151
$time = $app->tools_monitor->getDataTime('iptables_rules');
145152
$title = $app->lng("monitor_title_iptables_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
146153
$description = '';
154+
$add_padding = true;
147155
break;
148156
default:
149157
$template = '';
150158
break;
151159
}
152160

161+
if($add_padding == true) {
162+
$output = '<div style="padding:20px;">'.$output.'</div>';
163+
}
164+
153165

154166
// Loading the template
155167
$app->uses('tpl');

‎interface/web/monitor/show_sys_state.php‎

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -223,45 +223,76 @@ function _getServerState($serverId, $serverName) {
223223
/*
224224
* Info of a VE inside a OpenVz-Host
225225
*/
226+
227+
$alert_class = 'alert-info';
228+
if($serverState == 'ok') $alert_class = 'alert-success';
229+
if($serverState == 'warning') $alert_class = 'alert-warning';
230+
if($serverState == 'critical' || $serverState == 'error') $alert_class = 'alert-danger';
231+
226232
//$html_ve = '<div class="systemmonitor-ve state-' . $serverState . '-ve os-' . $osData['name'] . '">';
227-
$html_ve = '<div class="systemmonitor state-' . $serverState . ' os-' . $osData['name'] . '">';
233+
//$html_ve = '<div class="systemmonitor state-' . $serverState . ' os-' . $osData['name'] . '">';
234+
$html_server = '<div class="alert '.$alert_class.'" role="alert">';
228235
if ($osData != null) {
229236
$html_ve .= '<div class="icoDevice"><p class="status"></p></div>';
230237
}
231238
else {
232239
$html_ve .= '<div class="icoDevice"><p class="status"></p></div>';
233240
}
234-
$html_ve .= '<div class="statusDevice"><p>' . $serverName;
241+
$html_ve .= '<div class="statusDevice"><h3>' . $serverName;
235242
if ($osData != null) {
236243
$html_ve .= ' (' . $osData['name'] . ' ' . $osData['version'] . ') ';
237244
}
238245
if ($ispcData != null) {
239-
$html_ve .= $ispcData['name'] . ' ' . $ispcData['version'] . '</p>';
246+
$html_ve .= $ispcData['name'] . ' ' . $ispcData['version'] . '</h3>';
240247
}
241248
else {
242-
$html_ve .= '</p>';
249+
$html_ve .= '</h3>';
243250
}
244251
$html_ve .= '<p>' . $app->lng("monitor_serverstate_state_txt") . ': ' . $serverState . '</p>';
245252

246253
/*
247254
* Info of a "normal" Server or a OpenVz-Host
248255
*/
249-
$html_server = '<div class="systemmonitor-server state-' . $serverState . ' os-' . $osData['name'] . '">';
256+
//$html_server = '<div class="systemmonitor-server state-' . $serverState . ' os-' . $osData['name'] . '">';
257+
258+
/*
259+
switch ($oldState) {
260+
case 'no_state': $oldInt = 0;
261+
break;
262+
case 'ok': $oldInt = 1;
263+
break;
264+
case 'unknown': $oldInt = 2;
265+
break;
266+
case 'info': $oldInt = 3;
267+
break;
268+
case 'warning': $oldInt = 4;
269+
break;
270+
case 'critical': $oldInt = 5;
271+
break;
272+
case 'error': $oldInt = 6;
273+
break;
274+
*/
275+
$alert_class = 'alert-info';
276+
if($serverState == 'ok') $alert_class = 'alert-success';
277+
if($serverState == 'warning') $alert_class = 'alert-warning';
278+
if($serverState == 'critical' || $serverState == 'error') $alert_class = 'alert-danger';
279+
280+
$html_server = '<div class="alert '.$alert_class.'" role="alert">';
250281
if ($osData != null) {
251-
$html_server .= '<div class="icoDevice"><p class="status"></p></div>';
282+
//$html_server .= '<div class="icoDevice"><p class="status"></p></div>';
252283
}
253284
else {
254285
$html_server .= '<div class="icoDevice"><p class="status"></p></div>';
255286
}
256-
$html_server .= '<div class="statusDevice"><p>' . $app->lng("monitor_serverstate_server_txt") . ': ' . $serverName;
287+
$html_server .= '<div class="statusDevice"><h3>' . $app->lng("monitor_serverstate_server_txt") . ': ' . $serverName;
257288
if ($osData != null) {
258289
$html_server .= ' (' . $osData['name'] . ' ' . $osData['version'] . ') ';
259290
}
260291
if ($ispcData != null) {
261-
$html_server .= $ispcData['name'] . ' ' . $ispcData['version'] . '</p>';
292+
$html_server .= $ispcData['name'] . ' ' . $ispcData['version'] . '</h3>';
262293
}
263294
else {
264-
$html_server .= '</p>';
295+
$html_server .= '</h3>';
265296
}
266297

267298
$html_server .= '<p>' . $app->lng("monitor_serverstate_state_txt") . ': ' . $serverState . ' (';
@@ -277,7 +308,7 @@ function _getServerState($serverId, $serverName) {
277308
*/
278309
$html_verbose = $html_server;
279310
foreach($messages as $key => $state) {
280-
$html_verbose .= $key . ':<br />';
311+
$html_verbose .= '<strong>'.ucfirst($key) . '</strong><br />';
281312
foreach ($state as $msg) {
282313
$html_verbose .= $msg . '<br />';
283314
}

‎interface/web/monitor/templates/show_log.htm‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
77
<legend><tmpl_var name="monTransRefreshsq"></legend>
88

99
<div class="form-group">
10-
<label for="refreshinterval" class="col-sm-3 control-label">{tmpl_var name='refreshinterval_txt'}</label>
11-
<div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
10+
<div class="col-sm-12"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
1211
{tmpl_var name='refresh'}
1312
</select></div>
1413

‎interface/web/monitor/templates/show_sys_state.htm‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
77
<legend><tmpl_var name="monTransRefreshsq"></legend>
88

99
<div class="form-group">
10-
<label for="refreshinterval" class="col-sm-3 control-label">&nbsp;</label>
11-
<div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
10+
<div class="col-sm-12"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
1211
{tmpl_var name='refresh'}
1312
</select></div>
1413

0 commit comments

Comments
 (0)