diff --git a/html/css/styles.css b/html/css/styles.css index 975a6509ce..74a2165610 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -18,9 +18,14 @@ body { .pagemenu-selected { font-weight: bold; background-color: #cecece; - -moz-border-radius: 15px; - border-radius: 15px; - padding: 2px 8px 3px 8px; + + padding:3px 8px 4px 8px; + + /* Rounded Corners */ + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + } .submit { @@ -746,8 +751,8 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover { /* Gradient background */ background:#F4F4F4; - background: -moz-linear-gradient(top, #FFF, #CCC); - background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#FFF), to(#CCC)); + background: -moz-linear-gradient(top, #FBFBFB, #DDD); + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#FBFBFB), to(#DDD)); /* Rounded Corners */ -moz-border-radius: 0px 3px 3px 3px; diff --git a/html/pages/device/apps.inc.php b/html/pages/device/apps.inc.php index c65369f5c2..4876532e4d 100644 --- a/html/pages/device/apps.inc.php +++ b/html/pages/device/apps.inc.php @@ -2,6 +2,8 @@ print_optionbar_start(); +echo("Apps » "); + unset($sep); foreach (dbFetchRows("SELECT * FROM `applications` WHERE `device_id` = ?", array($device['device_id'])) as $app) diff --git a/html/pages/device/services.inc.php b/html/pages/device/services.inc.php index 54ba556c1b..7e307808d1 100644 --- a/html/pages/device/services.inc.php +++ b/html/pages/device/services.inc.php @@ -1,5 +1,7 @@ Services » "); + $menu_options = array('basic' => 'Basic', 'details' => 'Details'); diff --git a/html/pages/ports/default.inc.php b/html/pages/ports/default.inc.php index 562e44ac3f..88b407fc62 100644 --- a/html/pages/ports/default.inc.php +++ b/html/pages/ports/default.inc.php @@ -139,7 +139,7 @@ if ($_POST['deleted'] || $_GET['type'] == "deleted") { $where .= " AND I.deleted $query = "SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id ".$where." ORDER BY D.hostname, I.ifIndex"; -echo("DeviceInterfaceSpeedMediaDescription"); +echo("DeviceInterfaceSpeedDownUpMediaDescription"); $row = 1; @@ -150,6 +150,10 @@ foreach (dbFetchRows($query, $param) as $interface) $speed = humanspeed($interface['ifSpeed']); $type = humanmedia($interface['ifType']); + $interface['in_rate'] = formatRates($interface['ifInOctets_rate'] * 8); + $interface['out_rate'] = formatRates($interface['ifOutOctets_rate'] * 8); + + if ($interface['in_errors'] > 0 || $interface['out_errors'] > 0) { $error_img = generate_port_link($interface,"Interface Errors",errors); @@ -163,6 +167,8 @@ foreach (dbFetchRows($query, $param) as $interface) " . generate_device_link($interface) . " " . generate_port_link($interface) . " $error_img $speed + ".$interface['in_rate']." + ".$interface['out_rate']." $type " . $interface['ifAlias'] . " \n"); diff --git a/includes/polling/netstats-icmp.inc.php b/includes/polling/netstats-icmp.inc.php index e57efe0236..6b896c0db3 100755 --- a/includes/polling/netstats-icmp.inc.php +++ b/includes/polling/netstats-icmp.inc.php @@ -25,7 +25,7 @@ if ($device['os'] != "Snom") $snmpstring .= " $oid.0"; } - $data_array = snmpwalk_cache_oid($device, "icmp", array()); + $data_array = snmpwalk_cache_oid($device, "IP-MIB::icmp", array()); $rrdupdate = "N"; @@ -53,4 +53,4 @@ if ($device['os'] != "Snom") unset($oids, $data, $data_array, $oid, $protos); } -?> \ No newline at end of file +?> diff --git a/includes/polling/netstats-snmp.inc.php b/includes/polling/netstats-snmp.inc.php index c41f2387ed..4bc48ed9e0 100755 --- a/includes/polling/netstats-snmp.inc.php +++ b/includes/polling/netstats-snmp.inc.php @@ -23,7 +23,7 @@ if ($device['os'] != "Snom") $rrd_create .= " DS:$oid_ds:COUNTER:600:U:100000000000"; } - $data_array = snmpwalk_cache_oid($device, "snmp", array()); + $data_array = snmpwalk_cache_oid($device, "SNMPv2-MIB::snmp", array()); $rrdupdate = "N"; @@ -49,4 +49,4 @@ if ($device['os'] != "Snom") unset($oids, $data, $data_array, $oid, $protos); } -?> \ No newline at end of file +?>