From 04b4140b10c0ea8b36c6ba96ea21c6d68c7cc431 Mon Sep 17 00:00:00 2001
From: Bri Prebilic Cole <bri@onlab.us>
Date: Wed, 18 Mar 2015 17:25:34 -0700
Subject: [PATCH] GUI -- Cleaned up topoToolbar.

Change-Id: I07bb0248de27567101055977396b6aae072c979b
---
 .../main/webapp/app/view/topo/topoToolbar.js  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/web/gui/src/main/webapp/app/view/topo/topoToolbar.js b/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
index 80351a399c..dc9c6db83a 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
@@ -26,8 +26,7 @@
 
     var api, toolbar;
 
-    // buttons (named for keystroke)
-    var O, I, D, H, M, P, B;
+    // buttons
     var togSummary, togInstances, togDetails,
         togHosts, togOffline, togPorts, togBackground;
 
@@ -35,6 +34,10 @@
         api = _api_;
     }
 
+    // TODO: fix toggle and radio sets to be selected based on the current state
+    // current bug: first toggle button, then toggle with key, toggle button doesn't update appearance
+
+
     function getActions() {
         togSummary = api.getActionEntry('O');
         togInstances = api.getActionEntry('I');
@@ -54,13 +57,10 @@
         return entry[1];
     }
 
-    function createToolbar() {
-        getActions();
-        // in actions, function reference is entry[0], tooltip is entry[1]
-        toolbar = tbs.createToolbar('topo-tbar');
+    function addFirstRow() {
         toolbar.addToggle('summary-tog', 'unknown', true,
             entryCallback(togSummary), entryToolTip(togSummary));
-        toolbar.addToggle('instance-tog', 'unknown', true,
+        toolbar.addToggle('instance-tog', 'uiAttached', true,
             entryCallback(togInstances), entryToolTip(togInstances));
         toolbar.addToggle('details-tog', 'unknown', true,
             entryCallback(togDetails), entryToolTip(togDetails));
@@ -68,14 +68,19 @@
 
         toolbar.addToggle('hosts-tog', 'endstation', false,
             entryCallback(togHosts), entryToolTip(togHosts));
-        toolbar.addToggle('offline-tog', 'unknown', true,
+        toolbar.addToggle('offline-tog', 'switch', true,
             entryCallback(togOffline), entryToolTip(togOffline));
         toolbar.addToggle('ports-tog', 'unknown', true,
             entryCallback(togPorts), entryToolTip(togPorts));
         toolbar.addToggle('bkgrnd-tog', 'unknown', true,
             entryCallback(togBackground), entryToolTip(togBackground));
+    }
 
-        toolbar.hide();
+    function createToolbar() {
+        getActions();
+        toolbar = tbs.createToolbar('topo-tbar');
+        addFirstRow();
+        toolbar.show();
     }
 
     angular.module('ovTopo')