nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-24 16:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3109 from Rosiak/fix-state-dev-overview-bug

Browse Source 
Fix Device Overview Display
This commit is contained in:
Daniel Preussker
2016-02-28 19:11:41 +00:00
parent 2bf9fa1409 eff7e18d4e
commit 5e9bbea801
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/device/overview/generic/sensor.inc.php
+7 -7
View File
@@ -62,7 +62,7 @@ if (count($sensors)) {
$sensor['sensor_descr'] = truncate($sensor['sensor_descr'], 48, '');
if (!empty($state_translation['0']['state_descr'])) {
$state_style="";
switch ($state_translation['state_generic_value']) {
switch ($state_translation['0']['state_generic_value']) {
case 0: // OK
$state_style="class='label label-success'";
break;
@@ -78,16 +78,16 @@ if (count($sensors)) {
break;
}
echo '<tr>
<td>'.overlib_link($link, shorten_interface_type($sensor['sensor_descr']), $overlib_content, $sensor_class).'</td>
<td>'.overlib_link($link, $sensor_minigraph, $overlib_content, $sensor_class).'</td>
<td>'.overlib_link($link, '<span '.$state_style.'>'.$state_translation['0']['state_descr'].'</span>', $overlib_content, $sensor_class).'</td>
<td class="col-md-4">'.overlib_link($link, shorten_interface_type($sensor['sensor_descr']), $overlib_content, $sensor_class).'</td>
<td class="col-md-4">'.overlib_link($link, $sensor_minigraph, $overlib_content, $sensor_class).'</td>
<td class="col-md-4">'.overlib_link($link, '<span '.$state_style.'>'.$state_translation['0']['state_descr'].'</span>', $overlib_content, $sensor_class).'</td>
</tr>';
}
else {
echo '<tr>
<td>'.overlib_link($link, shorten_interface_type($sensor['sensor_descr']), $overlib_content, $sensor_class).'</td>
<td>'.overlib_link($link, $sensor_minigraph, $overlib_content, $sensor_class).'</td>
<td>'.overlib_link($link, '<span '.($sensor['sensor_current'] < $sensor['sensor_limit_low'] || $sensor['sensor_current'] > $sensor['sensor_limit'] ? "style='color: red'" : '').'>'.$sensor['sensor_current'].$sensor_unit.'</span>', $overlib_content, $sensor_class).'</td>
<td class="col-md-4">'.overlib_link($link, shorten_interface_type($sensor['sensor_descr']), $overlib_content, $sensor_class).'</td>
<td class="col-md-4">'.overlib_link($link, $sensor_minigraph, $overlib_content, $sensor_class).'</td>
<td class="col-md-4">'.overlib_link($link, '<span '.($sensor['sensor_current'] < $sensor['sensor_limit_low'] || $sensor['sensor_current'] > $sensor['sensor_limit'] ? "style='color: red'" : '').'>'.$sensor['sensor_current'].$sensor_unit.'</span>', $overlib_content, $sensor_class).'</td>
</tr>';
}
}//end foreach
html/pages/device/overview/mempools.inc.php
+3 -3
View File
@@ -49,9 +49,9 @@ if (count($mempools)) {
$minigraph = generate_lazy_graph_tag($graph_array);
echo '<tr>
<td>'.overlib_link($link, $text_descr, $overlib_content).'</td>
<td>'.overlib_link($link, $minigraph, $overlib_content).'</td>
<td>'.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
<td class="col-md-4">'.overlib_link($link, $text_descr, $overlib_content).'</td>
<td class="col-md-4">'.overlib_link($link, $minigraph, $overlib_content).'</td>
<td class="col-md-4">'.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
</a></td>
</tr>';
}//end foreach
html/pages/device/overview/processors.inc.php
+6 -6
View File
@@ -49,9 +49,9 @@ if (count($processors)) {
$minigraph = generate_lazy_graph_tag($graph_array);
echo '<tr>
<td>'.overlib_link($link, $text_descr, $overlib_content).'</td>
<td>'.overlib_link($link, $minigraph, $overlib_content).'</td>
<td>'.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
<td class="col-md-4">'.overlib_link($link, $text_descr, $overlib_content).'</td>
<td class="col-md-4">'.overlib_link($link, $minigraph, $overlib_content).'</td>
<td class="col-md-4">'.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
</a></td>
</tr>';
}
@@ -104,9 +104,9 @@ if (count($processors)) {
$background = get_percentage_colours($totalPercent);
echo '<tr>
<td>'.overlib_link($link, $text_descr, $overlib_content).'</td>
<td>'.overlib_link($link,'x'.count($processors),$overlib_content).'</td>
<td>'.overlib_link($link, print_percentage_bar(200, 20, $totalPercent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'</td>
<td class="col-md-4">'.overlib_link($link, $text_descr, $overlib_content).'</td>
<td class="col-md-4">'.overlib_link($link,'x'.count($processors),$overlib_content).'</td>
<td class="col-md-4">'.overlib_link($link, print_percentage_bar(200, 20, $totalPercent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'</td>
</tr>';
}
html/pages/device/overview/storage.inc.php
+3 -3
View File
@@ -69,9 +69,9 @@ if (count($drives)) {
$minigraph = generate_lazy_graph_tag($graph_array);
echo '<tr>
<td>'.overlib_link($link, $drive['storage_descr'], $overlib_content).'</td>
<td>'.overlib_link($link, $minigraph, $overlib_content).'</td>
<td>'.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
<td class="col-md-4">'.overlib_link($link, $drive['storage_descr'], $overlib_content).'</td>
<td class="col-md-4">'.overlib_link($link, $minigraph, $overlib_content).'</td>
<td class="col-md-4">'.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
</a></td>
</tr>';
}//end foreach