From 98630a84c47b8772b616fc337d55ba96d9170dba Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 24 Nov 2011 15:45:49 +0000
Subject: [PATCH] overview improvements and smoe other fixes

git-svn-id: http://www.observium.org/svn/observer/trunk@2736 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/css/styles.css                           |  2 ++
 html/includes/print-interface.inc.php         |  2 +-
 html/pages/device/overview/c6kxbar.inc.php    | 24 +++++++++++++++++--
 .../device/overview/generic/sensor.inc.php    |  2 +-
 html/pages/ports/list.inc.php                 |  6 ++---
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/html/css/styles.css b/html/css/styles.css
index 6bd008478..4de7e3ce0 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -323,6 +323,8 @@ A.black:visited, A.black, .black    { color: #000000; }
 A.green:visited, A.green, .green    { color: #008C00; }
 A.blue:visited, A.blue, .blue       { color: #0000ff; }
 A.orange:visited, a.orange, .orange { color: #FF7400; }
+A.purple:visited, a.purple, .purple { color: #740074; }
+
 
 .pinkbg  { background-color: #ffbbbb; }
 .redbg   { background-color: #ff8585; }
diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index 503277f4e..b98800722 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -89,7 +89,7 @@ if ($port[ifDuplex] != "unknown") { echo("<span class=box-desc>" . $port['ifDupl
 if ($device['os'] == "ios" || $device['os'] == "iosxe")
 {
   if ($port['ifTrunk']) {
-    echo("<p class=box-desc><span class=red>" . $port['ifTrunk'] . "</span></p>");
+    echo("<p class=box-desc><span class=purple>" . $port['ifTrunk'] . "</span></p>");
   } elseif ($port['ifVlan']) {
     echo("<p class=box-desc><span class=blue>VLAN " . $port['ifVlan'] . "</span></p>");
   } elseif ($port['ifVrf']) {
diff --git a/html/pages/device/overview/c6kxbar.inc.php b/html/pages/device/overview/c6kxbar.inc.php
index c95bd6233..99e41007e 100644
--- a/html/pages/device/overview/c6kxbar.inc.php
+++ b/html/pages/device/overview/c6kxbar.inc.php
@@ -16,7 +16,25 @@ foreach($entity_state['group']['c6kxbar'] as $index => $entry)
 
   echo("<tr bgcolor=$row_colour>
         <td colspan=5 width=200><strong>".$entity['entPhysicalName']."</strong></td>
-        <td colspan=2>".$entry['']['cc6kxbarModuleModeSwitchingMode']."</td>
+        <td colspan=2>");
+
+    switch ($entry['']['cc6kxbarModuleModeSwitchingMode'])
+    {
+      case "busmode":
+       # echo '<a title="Modules in this mode don't use fabric. Backplane is used for both lookup and data forwarding.">Bus</a>';
+        break;
+      case "crossbarmode":
+        echo '<a title="Modules in this mode use backplane for forwarding decision and fabric for data forwarding.">Crossbar</a>';
+        break;
+      case "dcefmode":
+        echo '<a title="Modules in this mode use fabric for data forwarding and local forwarding is enabled.">DCEF</a>';
+        break;
+      default:
+        echo $entry['']['cc6kxbarModuleModeSwitchingMode'];
+    }
+
+
+    echo("</td>
         </tr>");
 
   foreach($entity_state['group']['c6kxbar'][$index] as $subindex => $fabric)
@@ -63,7 +81,9 @@ foreach($entity_state['group']['c6kxbar'] as $index => $entry)
     echo("<tr bgcolor=$row_colour>
           <td width=10></td>
           <td width=200><strong>Fabric ".$subindex."</strong></td>
-          <td><span style='font-weight: bold;' class=".$fabric['mode_class'].">".$fabric['cc6kxbarModuleChannelFabStatus']."</span></td>
+          <td><span style='font-weight: bold;' class=".$fabric['mode_class'].">".
+
+    $fabric['cc6kxbarModuleChannelFabStatus']."</span></td>
           <td>".formatRates($fabric['cc6kxbarModuleChannelSpeed']*1000000)."</td>
           <td>".overlib_link($link, $minigraph, $overlib_content)."</td>
           <td>".print_percentage_bar (125, 20, $percent_in, "Ingress", "ffffff", $background['left'], $percent_in . "%", "ffffff", $background['right'])."</td>
diff --git a/html/pages/device/overview/generic/sensor.inc.php b/html/pages/device/overview/generic/sensor.inc.php
index 96365f00c..167bcc720 100644
--- a/html/pages/device/overview/generic/sensor.inc.php
+++ b/html/pages/device/overview/generic/sensor.inc.php
@@ -44,7 +44,7 @@ if (count($sensors))
     $graph_array['from'] = $config['time']['day'];
     $sensor_minigraph =  generate_graph_tag($graph_array);
 
-    $sensor['sensor_descr'] = truncate($sensor['sensor_descr'], 25, '');
+    $sensor['sensor_descr'] = truncate($sensor['sensor_descr'], 48, '');
     echo("<tr bgcolor='$row_colour'>
            <td class=tablehead style='padding-left:5px;'><strong>".overlib_link($link, $sensor['sensor_descr'], $overlib_content)."</strong></td>
            <td width=80 align=right class=tablehead>".overlib_link($link, $sensor_minigraph, $overlib_content)."</td>
diff --git a/html/pages/ports/list.inc.php b/html/pages/ports/list.inc.php
index bc8368e08..2e02f26ea 100644
--- a/html/pages/ports/list.inc.php
+++ b/html/pages/ports/list.inc.php
@@ -60,9 +60,9 @@ foreach ($ports as $port)
           <td width=200 class=list-bold><a href='" . generate_device_url($port) . "'>".$port['hostname']."</a></td>
           <td width=150 class=list-bold><a class='".$ifclass."'href='" . generate_port_url($port) . "'>".fixIfName($port['label'])." $error_img</td>
           <td width=110 >$speed</td>
-          <td width=110 class=green>".$port['in_rate']."</td>
-          <td width=110 class=blue>".$port['out_rate']."</td>
-          <td width=200>$type</td>
+          <td width=100 class=green>".$port['in_rate']."</td>
+          <td width=100 class=blue>".$port['out_rate']."</td>
+          <td width=150>$type</td>
           <td>" . $port['ifAlias'] . "</td>
         </tr>\n");