From 680998a82cc4d0045e96b1f592770373ebbcd786 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 10 Mar 2018 21:53:48 +0000
Subject: [PATCH] better color by setting as dropdown

---
 share/public/css/netdisco.css        | 11 ++++--
 share/views/sidebar/device/netmap.tt | 56 +++++++---------------------
 2 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/share/public/css/netdisco.css b/share/public/css/netdisco.css
index 7695cf88..6a39b47a 100644
--- a/share/public/css/netdisco.css
+++ b/share/public/css/netdisco.css
@@ -463,9 +463,6 @@ td > form.nd_inline-form {
 #nd_vlan-label-text {
   vertical-align: text-bottom;
 }
-#nd_colorby-label-text {
-  vertical-align: text-bottom;
-}
 #nd_vlan-entry {
   width: 53px;
 }
@@ -615,6 +612,14 @@ div.toggle.btn-small {
   padding-bottom: 5px;
 }
 
+#nd_colorby {
+  width: 107px;
+}
+#nd_colorby-label-text {
+  vertical-align: bottom;
+  line-height: 2;
+}
+
 /* when the sidebar submit button DOES NOT HAVE a dropdown */
 .nd_sidebar button:not(.nd_sidebar-btn-drop):not(.nd_sidebar-btn-drop-drop):not(.nd_sidebar-btn-netmap) {
   margin-top: 9px;
diff --git a/share/views/sidebar/device/netmap.tt b/share/views/sidebar/device/netmap.tt
index 593090d9..eaece811 100644
--- a/share/views/sidebar/device/netmap.tt
+++ b/share/views/sidebar/device/netmap.tt
@@ -99,49 +99,21 @@
 
             <div class="clearfix nd_netmap-sidebar">
 
-              [% IF hgroup_list.size OR location_list.size %]
-              <table margin="0" border="0" class="nd_sidebar-label control-group">
-              <tr>
-                <td id="nd_colorby-label-text">Color by:</td>
-                <td>
-                  <div class="radio radio-success">
-                      <input type="radio" name="colorby" id="nd_colorby-off"
-                      [% 'checked' IF vars.sidebar_defaults.device_netmap.colorby == 'off' %]
-                      value="off">
-                      <label for="nd_colorby-off">Off</label>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                [% IF NOT (hgroup_list.size AND location_list.size) %]
-                <td>
-                </td>
-                [% END %]
-                [% IF hgroup_list.size %]
-                <td>
-                  <div class="radio radio-success">
-                      <input type="radio" name="colorby" id="nd_colorby-hgroup"
-                      [% 'checked' IF vars.sidebar_defaults.device_netmap.colorby == 'hgroup' %]
-                      value="hgroup">
-                      <label for="nd_colorby-hgroup">Group</label>
-                  </div>
-                </td>
-                [% END %]
-                [% IF location_list.size %]
-                <td>
-                  <div class="radio radio-success">
-                      <input type="radio" name="colorby" id="nd_colorby-lgroup"
-                      [% 'checked' IF vars.sidebar_defaults.device_netmap.colorby == 'location' %]
-                      value="location">
-                      <label for="nd_colorby-lgroup">Location</label>
-                  </div>
-                </td>
-                [% END %]
-              </tr>
-              </table>
-              [% END %]
-
               <div class="clearfix input-prepend">
+                [% IF hgroup_list.size OR location_list.size %]
+                <label><span id="nd_colorby-label-text">Color by: </span>
+                  <select id="nd_colorby" name="colorby">
+                    <option[% ' selected="selected"' IF vars.sidebar_defaults.device_netmap.colorby == 'off' %]>Off</option>
+                    [% IF hgroup_list.size %]
+                    <option[% ' selected="selected"' IF vars.sidebar_defaults.device_netmap.colorby == 'hgroup' %]>Group</option>
+                    [% END %]
+                    [% IF location_list.size %]
+                    <option[% ' selected="selected"' IF vars.sidebar_defaults.device_netmap.colorby == 'location' %]>Location</option>
+                    [% END %]
+                  </select>
+                </label>
+                [% END %]
+
                 <label class="add-on">
                   <input type="checkbox" id="dynamicsize" name="dynamicsize"
                     [% 'checked="checked"' IF vars.sidebar_defaults.device_netmap.dynamicsize %]/>