diff --git a/share/config.yml b/share/config.yml index dfcbc773..a72dd129 100644 --- a/share/config.yml +++ b/share/config.yml @@ -139,6 +139,7 @@ sidebar_defaults: showips: { default: null } showspeed: { default: null } mapshow: { default: neighbors } + colorby: { default: location } colorgroups: { default: checked } dynamicsize: { default: checked } report_moduleinventory: diff --git a/share/public/css/netdisco.css b/share/public/css/netdisco.css index d61b22d5..c19bf0f7 100644 --- a/share/public/css/netdisco.css +++ b/share/public/css/netdisco.css @@ -462,8 +462,11 @@ 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: 56px; + width: 53px; } /* netmap maximise icon */ @@ -600,7 +603,7 @@ div.toggle.btn-small { /* sidebar submit button width and spacing */ /* when the sidebar submit button DOES NOT HAVE a dropdown */ -.nd_sidebar button:not(.nd_sidebar-btn-drop):not(.nd_sidebar-btn-drop-drop) { +.nd_sidebar button:not(.nd_sidebar-btn-drop):not(.nd_sidebar-btn-drop-drop):not(.nd_sidebar-btn-netmap) { margin-top: 9px; margin-left: -3px; width: 165px; diff --git a/share/views/sidebar/device/netmap.tt b/share/views/sidebar/device/netmap.tt index c1767dc7..c3e6839c 100644 --- a/share/views/sidebar/device/netmap.tt +++ b/share/views/sidebar/device/netmap.tt @@ -30,23 +30,23 @@ - + All - + Selected - - - @@ -63,77 +63,74 @@ - [% IF hgroup_list.size %] -
- [% ELSE %] -
- [% END %] - - -
+ [% IF hgroup_list.size %] -
- -
+ [% END %] - [% IF location_list.size %] -
- [% ELSE %] -
- [% END %] - - -
- - [% IF location_list.size %] -
- -
+ [% END %]
-
-
- -
-
- - [% IF hgroup_list.size %] -
- - -
+ [% IF hgroup_list.size OR location_list.size %] + + + + + + + [% IF NOT (hgroup_list.size AND location_list.size) %] + + [% END %] + [% IF hgroup_list.size %] + + [% END %] + [% IF location_list.size %] + + [% END %] + +
Color by: +
+ + +
+
+ +
+ + +
+
+
+ + +
+
[% END %]