From 74faf8932cb9728b2b8ae0d420f240338264f16d Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Sat, 9 Jan 2010 00:17:02 +0000 Subject: [PATCH] html cleanups git-svn-id: http://www.observium.org/svn/observer/trunk@626 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/error-no-perm.inc.php | 8 ++-- html/includes/topnav.inc | 55 ++++++++++++-------------- html/index.php | 6 +-- html/pages/bills.php | 8 ++-- html/pages/default-jt.php | 16 ++++---- html/pages/device/bgp.inc.php | 8 ++-- html/pages/device/ciscosensors.inc.php | 8 ++-- html/pages/device/collectd.inc.php | 8 ++-- html/pages/device/health.inc.php | 8 ++-- html/pages/device/interface.inc.php | 8 ++-- html/pages/device/syslog.inc.php | 8 ++-- html/pages/device/vlans.inc.php | 8 ++-- html/pages/device/vrfs.inc.php | 8 ++-- html/pages/devices.php | 8 ++-- html/pages/front/default.php | 8 ++-- html/pages/interfaces.php | 8 ++-- html/pages/inventory.php | 8 ++-- html/pages/ipv6.php | 8 ++-- html/pages/logon.inc | 8 ++-- html/pages/syslog.php | 8 ++-- html/pages/vrfs.php | 8 ++-- 21 files changed, 108 insertions(+), 113 deletions(-) diff --git a/html/includes/error-no-perm.inc.php b/html/includes/error-no-perm.inc.php index 482d998906..8b4a37520e 100644 --- a/html/includes/error-no-perm.inc.php +++ b/html/includes/error-no-perm.inc.php @@ -2,8 +2,8 @@ echo("
- - + + @@ -25,8 +25,8 @@ echo("
- - + +
"); ?> diff --git a/html/includes/topnav.inc b/html/includes/topnav.inc index f7f65e7f79..8a3b0f55ee 100644 --- a/html/includes/topnav.inc +++ b/html/includes/topnav.inc @@ -49,39 +49,34 @@ if($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['b ?> - - +
+"); - echo(""); - echo(""); - echo(""); - echo(""); - echo(""); - ?> + + + + + + - -
Devices : - $devices[count] - ( $devices[up] up - $devices[down] down - $devices[ignored] ignored - $devices[disabled] disabled ) + + ( up + down + ignored + disabled ) -
Interfaces : - $interfaces[count] - ( $interfaces[up] up - $interfaces[down] down - $interfaces[ignored] ignored - $interfaces[shutdown] shutdown ) -
Services : - $services[count] - ( $services[up] up - $services[down] down - $services[ignored] ignored - $services[disabled] disabled ) -
Interfaces : + + ( up + down + ignored + shutdown ) +
Services : + + ( up + down + ignored + disabled ) +
-
diff --git a/html/index.php b/html/index.php index 5928a91396..8479496f27 100755 --- a/html/index.php +++ b/html/index.php @@ -36,10 +36,11 @@ if($debug) { "); } ?> - + - + + -
diff --git a/html/pages/bills.php b/html/pages/bills.php index c6f656f131..5a488943da 100644 --- a/html/pages/bills.php +++ b/html/pages/bills.php @@ -21,8 +21,8 @@ if($_GET['opta'] == "add") {
- - + + @@ -74,8 +74,8 @@ if($_GET['opta'] == "add") { - - + +
diff --git a/html/pages/default-jt.php b/html/pages/default-jt.php index b37bc86360..3aed39019c 100644 --- a/html/pages/default-jt.php +++ b/html/pages/default-jt.php @@ -8,8 +8,8 @@ echo("
# -# -# +# +# # # # @@ -20,8 +20,8 @@ echo("
# # -# -# +# +# #
"); } @@ -133,8 +133,8 @@ echo("
"); echo("
- - + + @@ -197,8 +197,8 @@ echo("
- - + + "); diff --git a/html/pages/device/bgp.inc.php b/html/pages/device/bgp.inc.php index eb791befef..87539e3575 100644 --- a/html/pages/device/bgp.inc.php +++ b/html/pages/device/bgp.inc.php @@ -8,8 +8,8 @@ echo(" echo("
- - + + @@ -28,8 +28,8 @@ echo(" - - + +
"); diff --git a/html/pages/device/ciscosensors.inc.php b/html/pages/device/ciscosensors.inc.php index b72a77d1d3..0d38547913 100644 --- a/html/pages/device/ciscosensors.inc.php +++ b/html/pages/device/ciscosensors.inc.php @@ -2,8 +2,8 @@ echo("
- - + + @@ -29,8 +29,8 @@ echo("
- - + +
"); diff --git a/html/pages/device/collectd.inc.php b/html/pages/device/collectd.inc.php index 60d3bc0cd8..84e61c8ff3 100644 --- a/html/pages/device/collectd.inc.php +++ b/html/pages/device/collectd.inc.php @@ -45,8 +45,8 @@ function dhtml_response_list(&$items, $method) { echo("
- - + + @@ -70,8 +70,8 @@ echo("
- - + +
"); diff --git a/html/pages/device/health.inc.php b/html/pages/device/health.inc.php index c6e08065e8..fb599dd526 100644 --- a/html/pages/device/health.inc.php +++ b/html/pages/device/health.inc.php @@ -25,8 +25,8 @@ $type_text['hrprocessors'] = "Processor Usage"; echo("
- - + + @@ -50,8 +50,8 @@ $type_text['hrprocessors'] = "Processor Usage"; - - + +
"); diff --git a/html/pages/device/interface.inc.php b/html/pages/device/interface.inc.php index d333b08903..7b5d2540e4 100644 --- a/html/pages/device/interface.inc.php +++ b/html/pages/device/interface.inc.php @@ -51,8 +51,8 @@ echo("
"); echo("
- - + + @@ -79,8 +79,8 @@ echo("
- - + +
"); diff --git a/html/pages/device/syslog.inc.php b/html/pages/device/syslog.inc.php index 942757f348..7e55be60a9 100644 --- a/html/pages/device/syslog.inc.php +++ b/html/pages/device/syslog.inc.php @@ -1,7 +1,7 @@
- - + + @@ -35,8 +35,8 @@ - - + +
diff --git a/html/pages/device/vlans.inc.php b/html/pages/device/vlans.inc.php index 5560a8326f..6c835b8ff6 100644 --- a/html/pages/device/vlans.inc.php +++ b/html/pages/device/vlans.inc.php @@ -3,8 +3,8 @@ echo("
- - + + @@ -21,8 +21,8 @@ echo(" - - + +
"); diff --git a/html/pages/device/vrfs.inc.php b/html/pages/device/vrfs.inc.php index 1cf2cde52c..497b3ecc5f 100644 --- a/html/pages/device/vrfs.inc.php +++ b/html/pages/device/vrfs.inc.php @@ -3,8 +3,8 @@ echo("
- - + + @@ -21,8 +21,8 @@ echo(" - - + +
"); diff --git a/html/pages/devices.php b/html/pages/devices.php index 2ac73ec94d..a500117c83 100644 --- a/html/pages/devices.php +++ b/html/pages/devices.php @@ -1,7 +1,7 @@
- - + + @@ -90,8 +90,8 @@ - - + +
diff --git a/html/pages/front/default.php b/html/pages/front/default.php index f700063161..eb64957291 100644 --- a/html/pages/front/default.php +++ b/html/pages/front/default.php @@ -3,8 +3,8 @@ function generate_front_box ($type, $content) { echo("
- - + + @@ -15,8 +15,8 @@ function generate_front_box ($type, $content) { - - + +
"); } diff --git a/html/pages/interfaces.php b/html/pages/interfaces.php index f24ffe992b..281f1740e0 100644 --- a/html/pages/interfaces.php +++ b/html/pages/interfaces.php @@ -1,7 +1,7 @@
- - + + @@ -81,8 +81,8 @@ - - + +
diff --git a/html/pages/inventory.php b/html/pages/inventory.php index 61819864d6..0f88e06a43 100644 --- a/html/pages/inventory.php +++ b/html/pages/inventory.php @@ -1,7 +1,7 @@
- - + + @@ -55,8 +55,8 @@ - - + +
diff --git a/html/pages/ipv6.php b/html/pages/ipv6.php index f58ae1bd1d..cea9f88916 100644 --- a/html/pages/ipv6.php +++ b/html/pages/ipv6.php @@ -1,7 +1,7 @@
- - + + @@ -47,8 +47,8 @@ - - + +
diff --git a/html/pages/logon.inc b/html/pages/logon.inc index 18ad238917..59e7a95dc7 100644 --- a/html/pages/logon.inc +++ b/html/pages/logon.inc @@ -1,7 +1,7 @@
- - + + @@ -44,8 +44,8 @@ if($auth_message) { - - + +
- - + + @@ -52,8 +52,8 @@ - - + +
= '5') { echo("
- - + + @@ -23,8 +23,8 @@ echo(" - - + +
");