nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-04 08:02:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

bring device overview info table layout in line with all other information panels

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3081 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-04-22 17:13:27 +00:00
parent 9a727c9ffd
commit 46b7c74e51
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/dev-overview-data.inc.php
+9 -4
View File
@@ -1,8 +1,12 @@
<?php <?php
echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
if ($config['overview_show_sysDescr']) if ($config['overview_show_sysDescr'])
{ {
echo('<div style="font-family: courier, serif; margin: 10px"><strong>' . $device['sysDescr'] . "</strong></div>"); echo("<p style='padding: 0px;' class=sectionhead>");
echo('<div style="font-family: courier, serif; margin: 3px"><strong>' . $device['sysDescr'] . "</strong></div>");
echo("</p>");
} }
$uptime = $device['uptime']; $uptime = $device['uptime'];
@@ -11,7 +15,8 @@ if ($device['os'] == "ios") { formatCiscoHardware($device); }
if ($device['features']) { $device['features'] = "(".$device['features'].")"; } if ($device['features']) { $device['features'] = "(".$device['features'].")"; }
$device['os_text'] = $config['os'][$device['os']]['text']; $device['os_text'] = $config['os'][$device['os']]['text'];
echo('<table width="100%">'); echo("<table width=100% cellspacing=0 cellpadding=5>");
echo('<tr class="device-overview"><td width="100%"><table width="100%">');
if ($device['hardware']) if ($device['hardware'])
{ {
@@ -74,7 +79,7 @@ if ($uptime)
</tr>'); </tr>');
} }
echo(' echo("</table></tr></td></table>");
</table>'); echo("</div>");
?> ?>
html/pages/device/overview.inc.php
+1 -6
View File
@@ -17,14 +17,9 @@ if ($ports['down']) { $ports_colour = $warn_colour_a; } else { $ports_colour = $
echo("<table width=100% cellspacing=0 cellpadding=0><tr><td style='width: 50%; vertical-align: top;>"); echo("<table width=100% cellspacing=0 cellpadding=0><tr><td style='width: 50%; vertical-align: top;>");
#if (file_exists("includes/dev-data-" . strtolower($device[os]) . ".inc.php")) {
echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>"); echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
# echo("<p class=sectionhead>Device Data</p><div style='height: 5px;'></div>");
# include("includes/dev-data-" . strtolower($device[os]) . ".inc.php");
include("includes/dev-overview-data.inc.php"); include("includes/dev-overview-data.inc.php");
echo("</div>"); echo("</div>");
#}
include("overview/ports.inc.php"); include("overview/ports.inc.php");
@@ -52,7 +47,7 @@ if ($services['total'])
if ($data['service_status'] == "1" && $data['service_ignore'] == "1") { $status = "green"; } if ($data['service_status'] == "1" && $data['service_ignore'] == "1") { $status = "green"; }
if ($data['service_status'] == "0" && $data['service_ignore'] == "0") { $status = "red"; } if ($data['service_status'] == "0" && $data['service_ignore'] == "0") { $status = "red"; }
if ($data['service_status'] == "1" && $data['service_ignore'] == "0") { $status = "blue"; } if ($data['service_status'] == "1" && $data['service_ignore'] == "0") { $status = "blue"; }
echo("$break<a class=$status>" . strtolower($data[service_type]) . "</a>"); echo("$break<a class=$status>" . strtolower($data['service_type']) . "</a>");
$break = ", "; $break = ", ";
} }