From 78672ecf4cf0478b9295649bc83de2a84929455c Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sun, 7 Feb 2010 14:17:02 +0000 Subject: [PATCH] fixing lits of bits of html removing borders, adding submit class to buttons git-svn-id: http://www.observium.org/svn/observer/trunk@778 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/css/styles.css | 3 ++- html/pages/addhost.php | 2 +- html/pages/bills.php | 2 +- html/pages/delhost.php | 2 +- html/pages/device/ciscosensors.inc.php | 25 ++++-------------------- html/pages/device/health.inc.php | 15 +------------- html/pages/device/syslog.inc.php | 2 +- html/pages/device/vlans.inc.php | 27 ++++++-------------------- html/pages/devices.php | 2 +- html/pages/interfaces.php | 2 +- html/pages/inventory.php | 2 +- html/pages/ipv4.php | 25 ++++-------------------- html/pages/ipv6.php | 23 ++++------------------ html/pages/logon.inc | 4 ++-- html/pages/preferences.php | 2 +- html/pages/syslog.php | 2 +- includes/discovery/temperatures.php | 1 + process-syslog.php | 5 ----- 18 files changed, 33 insertions(+), 113 deletions(-) diff --git a/html/css/styles.css b/html/css/styles.css index 8ad53f0cf..4b7e3e252 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -1,6 +1,7 @@ .submit { background-image:url('/images/submitbg.png'); background-position:0 100%; + border-color:#B2B2B2 #525252 #525252 #B2B2B2; } input,select { padding:2px 5px; @@ -10,7 +11,7 @@ input,select { border:1px solid #B2B2B2 bbackground-color:cornsilk; border:1px solid #B2B2B2; - bborder-color:#B2B2B2 #000000 #000000 #B2B2B2; + border-color:#B2B2B2 #d2d2d2 #d2d2d2 #B2B2B2; border-style:solid; border-width:1px; font-family:'Trebuchet MS','Lucida Grande',Verdana,Arial,sans-serif; diff --git a/html/pages/addhost.php b/html/pages/addhost.php index 37b6c7ac2..f08eb5a29 100644 --- a/html/pages/addhost.php +++ b/html/pages/addhost.php @@ -52,7 +52,7 @@ echo("

Error: A hostname is required.

"); - + diff --git a/html/pages/bills.php b/html/pages/bills.php index 71af8f83b..6bf30a8ed 100644 --- a/html/pages/bills.php +++ b/html/pages/bills.php @@ -46,7 +46,7 @@ print_optionbar_start('40'); - + Add Add Bill diff --git a/html/pages/delhost.php b/html/pages/delhost.php index fd4c64d0f..e2927c881 100644 --- a/html/pages/delhost.php +++ b/html/pages/delhost.php @@ -30,7 +30,7 @@ while($data = mysql_fetch_array($query)) { ?> - +

diff --git a/html/pages/device/ciscosensors.inc.php b/html/pages/device/ciscosensors.inc.php index 0d3854791..d193b081e 100644 --- a/html/pages/device/ciscosensors.inc.php +++ b/html/pages/device/ciscosensors.inc.php @@ -1,15 +1,6 @@ - - - - - - - -
-
-"); +print_optionbar_start(); unset ($sep); $query = mysql_query("SELECT `entSensorType` FROM `entPhysical` WHERE device_id = '".$device['device_id']."' AND entSensorType != '' AND entSensorType NOT LIKE 'No%' GROUP BY `entSensorType` ORDER BY `entSensorType`"); @@ -23,16 +14,8 @@ echo("
-
- - - - - - -
-"); + +print_optionbar_end(); $query = mysql_query("SELECT * FROM `entPhysical` WHERE device_id = '".$device['device_id']."' and entSensorType = '".$_GET['opta']."' ORDER BY `entPhysicalName`"); while($data = mysql_fetch_array($query)) { diff --git a/html/pages/device/health.inc.php b/html/pages/device/health.inc.php index bcfb9d99d..41ebf8745 100644 --- a/html/pages/device/health.inc.php +++ b/html/pages/device/health.inc.php @@ -1,4 +1,4 @@ - - - - - - - -
-
-"); -*/ - print_optionbar_start(); unset ($sep); diff --git a/html/pages/device/syslog.inc.php b/html/pages/device/syslog.inc.php index 8f59e721f..8716a0ce2 100644 --- a/html/pages/device/syslog.inc.php +++ b/html/pages/device/syslog.inc.php @@ -22,7 +22,7 @@ print_optionbar_start('25'); ?> - + - - - - - - -
-
+print_optionbar_start(); + +echo("
Basic | Graphs : Bits | Packets | NU Packets | - Errors -
-
- - - - - - -
+ Errors "); + +print_optionbar_end(); -"); echo(""); $i = "1"; diff --git a/html/pages/devices.php b/html/pages/devices.php index 18e0e165f..9114acb1b 100644 --- a/html/pages/devices.php +++ b/html/pages/devices.php @@ -88,7 +88,7 @@ } ?> - + diff --git a/html/pages/interfaces.php b/html/pages/interfaces.php index 36bb3f210..3afda3284 100644 --- a/html/pages/interfaces.php +++ b/html/pages/interfaces.php @@ -67,7 +67,7 @@ Deleted > diff --git a/html/pages/inventory.php b/html/pages/inventory.php index 959900175..694ad63b8 100644 --- a/html/pages/inventory.php +++ b/html/pages/inventory.php @@ -39,7 +39,7 @@ - + - - - - - - -
-
+
- +
@@ -35,25 +27,16 @@
- +
-
-
- - - - - - -
- - "); if($_POST['device_id']) { $where .= " AND I.device_id = '".$_POST['device_id']."'"; } diff --git a/html/pages/ipv6.php b/html/pages/ipv6.php index cea9f8891..4e04d01f8 100644 --- a/html/pages/ipv6.php +++ b/html/pages/ipv6.php @@ -1,12 +1,5 @@ -
- - - - - - -
-
+ + @@ -34,22 +27,14 @@
- +
-
-
- - - - - - -
+ Remember Me - + - \ No newline at end of file + diff --git a/html/pages/preferences.php b/html/pages/preferences.php index 0bd88a940..d7c4e87eb 100644 --- a/html/pages/preferences.php +++ b/html/pages/preferences.php @@ -19,7 +19,7 @@ echo("
Old Password New Password New Password -
"); + "); echo(""); diff --git a/html/pages/syslog.php b/html/pages/syslog.php index 1b61aced9..a4f648dbe 100644 --- a/html/pages/syslog.php +++ b/html/pages/syslog.php @@ -37,7 +37,7 @@ - + diff --git a/includes/discovery/temperatures.php b/includes/discovery/temperatures.php index 425a30423..bca0b6bab 100755 --- a/includes/discovery/temperatures.php +++ b/includes/discovery/temperatures.php @@ -116,6 +116,7 @@ ## LMSensors Temperatures if($device['os'] == "linux") { $oids = shell_exec($config['snmpwalk'] . " -m LM-SENSORS-MIB -$snmpver -CI -Osqn -c $community $hostname:$port lmTempSensorsDevice"); + if($debug) { echo($oids."\n"); } $oids = trim($oids); if ($oids) echo("LM-SENSORS "); foreach(explode("\n", $oids) as $data) { diff --git a/process-syslog.php b/process-syslog.php index 30f138432..632984499 100755 --- a/process-syslog.php +++ b/process-syslog.php @@ -22,13 +22,10 @@ include("includes/syslog.php"); #mysql_query("DELETE FROM `syslog` WHERE `processed` = '0' AND `msg` LIKE '%PM-3-INVALID_BRIDGE_PORT%'"); #mysql_query("DELETE FROM `syslog` WHERE `processed` = '0' AND `msg` LIKE '%RHWatchdog%'"); #mysql_query("DELETE FROM `syslog` WHERE `processed` = '0' AND `msg` LIKE '%Hardware Monitoring%'"); - #mysql_query("DELETE FROM `syslog` WHERE `program` LIKE 'SNMP-3-AUTHFAIL'"); #mysql_query("DELETE FROM `syslog` WHERE `program` LIKE 'SW_MATM-4-MACFLAP_NOTIF'"); - #mysql_query("DELETE FROM `syslog` WHERE `priority` = 'debug'"); - ## Delete all the old old old syslogs (as per config.php variable) mysql_query("DELETE FROM `syslog` WHERE `datetime` < DATE_SUB(NOW(), INTERVAL ".$config['syslog_age'].")"); @@ -36,8 +33,6 @@ mysql_query("DELETE FROM `syslog` WHERE `datetime` < DATE_SUB(NOW(), INTERVAL ". $q = mysql_query("SELECT * FROM `syslog` where `processed` = '0'"); while($entry = mysql_fetch_array($q)){ - print_r($entry); - process_syslog($entry, 1);