135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more work on netmap sidebar

Browse Source
This commit is contained in:
Oliver Gorwits
2018-03-10 19:30:24 +00:00
parent 2770cda090
commit 74e6b2f685
3 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/config.yml
View File

@@ -139,6 +139,7 @@ sidebar_defaults:
showips: { default: null } showips: { default: null }
showspeed: { default: null } showspeed: { default: null }
mapshow: { default: neighbors } mapshow: { default: neighbors }
colorby: { default: location }
colorgroups: { default: checked } colorgroups: { default: checked }
dynamicsize: { default: checked } dynamicsize: { default: checked }
report_moduleinventory: report_moduleinventory:

7
share/public/css/netdisco.css
View File

@@ -462,8 +462,11 @@ td > form.nd_inline-form {
#nd_vlan-label-text { #nd_vlan-label-text {
vertical-align: text-bottom; vertical-align: text-bottom;
} }
#nd_colorby-label-text {
vertical-align: text-bottom;
}
#nd_vlan-entry { #nd_vlan-entry {
width: 56px; width: 53px;
} }
/* netmap maximise icon */ /* netmap maximise icon */
@@ -600,7 +603,7 @@ div.toggle.btn-small {
/* sidebar submit button width and spacing */ /* sidebar submit button width and spacing */
/* when the sidebar submit button DOES NOT HAVE a dropdown */ /* 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-top: 9px;
margin-left: -3px; margin-left: -3px;
width: 165px; width: 165px;

137
share/views/sidebar/device/netmap.tt
View File

@@ -30,23 +30,23 @@
</div> </div>
</div> </div>
<button id="nd_netmap-releaseall" class="btn btn-info"> <button id="nd_netmap-releaseall" class="nd_sidebar-btn-netmap btn btn-small btn-info">
<i class="icon-unlock icon-large pull-left nd_navbar-icon"></i> <i class="icon-unlock icon-large pull-left nd_navbar-icon"></i>
Release All</button> All</button>
<button id="nd_netmap-releaseonly" class="btn btn-info"> <button id="nd_netmap-releaseonly" class="nd_sidebar-btn-netmap btn btn-small btn-info">
<i class="icon-unlock icon-large pull-left nd_navbar-icon"></i> <i class="icon-unlock icon-large pull-left nd_navbar-icon"></i>
Release Selected</button> Selected</button>
<button id="nd_netmap-pinonly" class="btn btn-info"> <button id="nd_netmap-pinonly" class="btn btn-small btn-info">
<i class="icon-lock icon-large pull-left nd_navbar-icon"></i> <i class="icon-lock icon-large pull-left nd_navbar-icon"></i>
Pin Selected</button> Pin Selected</button>
<button id="nd_netmap-save" class="btn" disabled> <button id="nd_netmap-save" class="btn btn-small" disabled>
<i class="icon-save icon-large pull-left nd_navbar-icon"></i> <i class="icon-save icon-large pull-left nd_navbar-icon"></i>
Save Positions</button> Save Positions</button>
<button id="nd_netmap-zoomtodevice" class="btn btn-info"> <button id="nd_netmap-zoomtodevice" class="btn btn-small btn-info">
<i class="icon-search icon-large pull-left nd_navbar-icon"></i> <i class="icon-search icon-large pull-left nd_navbar-icon"></i>
Zoom to this Device</button> Zoom to this Device</button>
@@ -63,77 +63,74 @@
<label for="nd_mapshow-neighbors">Only Neighbors</label> <label for="nd_mapshow-neighbors">Only Neighbors</label>
</div> </div>
[% IF hgroup_list.size %] <label><span id="nd_vlan-label-text">Carrying VLAN: </span>
<div class="radio radio-success"> <input name="vlan" id="nd_vlan-entry" class="input-mini" type="number" placeholder="ID"
[% ELSE %] value="[% params.vlan | html_entity %]" type="text"/>
<div class="radio radio-success tooltip-wrapper" </label>
rel="tooltip" data-placement="left" data-offset="5" data-title="No Named Groups Defined">
[% END %]
<input type="radio" name="mapshow" id="nd_mapshow-hgroup"
[% 'checked' IF vars.sidebar_defaults.device_netmap.mapshow == 'hgroup' %]
[% 'disabled' IF NOT hgroup_list.size %] value="hgroup">
<label for="nd_mapshow-hgroup">Only Host Groups</label>
</div>
[% IF hgroup_list.size %] [% IF hgroup_list.size %]
<div class="clearfix"> <select class="nd_side-select" size="[% hgroup_list.size > 5 ? 5 : hgroup_list.size %]"
<select class="nd_side-select" size="[% hgroup_list.size > 5 ? 5 : hgroup_list.size %]" multiple="on" name="hgroup" id="nd_hgroup-select"
multiple="on" name="hgroup" id="nd_hgroup-select" rel="tooltip" data-placement="left" data-offset="5" data-title="Host Groups"/>
rel="tooltip" data-placement="left" data-offset="5" data-title="Host Groups"/> [% FOREACH opt IN hgroup_list.pairs %]
[% FOREACH opt IN hgroup_list.pairs %] <option[% ' selected="selected"' IF hgroup_lkp.exists(opt.key) %]
<option[% ' selected="selected"' IF hgroup_lkp.exists(opt.key) %] value="[% opt.key %]">[% opt.value | html_entity %]</option>
value="[% opt.key %]">[% opt.value | html_entity %]</option> [% END %]
[% END %] </select>
</select>
</div>
[% END %] [% END %]
[% IF location_list.size %] [% IF location_list.size %]
<div class="radio radio-success"> <select class="nd_side-select" size="[% location_list.size > 5 ? 5 : location_list.size %]"
[% ELSE %] multiple="on" name="lgroup" id="nd_lgroup-select"
<div class="radio radio-success tooltip-wrapper" rel="tooltip" data-placement="left" data-offset="5" data-title="Device Locations"/>
rel="tooltip" data-placement="left" data-offset="5" data-title="No Locations Found"> [% FOREACH loc IN location_list %]
[% END %] <option[% ' selected="selected"' IF location_lkp.exists(loc) %]
<input type="radio" name="mapshow" id="nd_mapshow-lgroup" value="[% loc %]">[% loc | html_entity %]</option>
[% 'checked' IF vars.sidebar_defaults.device_netmap.mapshow == 'location' %] [% END %]
[% 'disabled' IF NOT location_list.size %] value="location"> </select>
<label for="nd_mapshow-lgroup">Only Locations</label>
</div>
[% IF location_list.size %]
<div class="clearfix">
<select class="nd_side-select" size="[% location_list.size > 5 ? 5 : location_list.size %]"
multiple="on" name="lgroup" id="nd_lgroup-select"
rel="tooltip" data-placement="left" data-offset="5" data-title="Device Locations"/>
[% FOREACH loc IN location_list %]
<option[% ' selected="selected"' IF location_lkp.exists(loc) %]
value="[% loc %]">[% loc | html_entity %]</option>
[% END %]
</select>
</div>
[% END %] [% END %]
<div class="clearfix nd_netmap-sidebar"> <div class="clearfix nd_netmap-sidebar">
<div id="nd_vlan-label" class="control-group"> [% IF hgroup_list.size OR location_list.size %]
<div class="controls"> <table margin="0" border="0" class="nd_sidebar-label control-group">
<label><span id="nd_vlan-label-text">Carrying VLAN: </span> <tr>
<input name="vlan" id="nd_vlan-entry" class="input-mini" type="number" placeholder="ID" <td id="nd_colorby-label-text">Color by:</td>
value="[% params.vlan | html_entity %]" type="text"/> <td>
</label> <div class="radio radio-success">
</div> <input type="radio" name="colorby" id="nd_colorby-off"
</div> [% 'checked' IF vars.sidebar_defaults.device_netmap.colorby == 'off' %]
value="off">
[% IF hgroup_list.size %] <label for="nd_colorby-off">Off</label>
<div class="clearfix input-prepend"> </div>
<label class="add-on"> </td>
<input type="checkbox" id="colorgroups" name="colorgroups" </tr>
[% 'checked="checked"' IF vars.sidebar_defaults.device_netmap.colorgroups %]/> <tr>
</label> [% IF NOT (hgroup_list.size AND location_list.size) %]
<label class="nd_checkboxlabel" for="colorgroups"> <td>
<span class="nd_searchcheckbox uneditable-input">Color Groups</span> </td>
</label> [% END %]
</div> [% 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 %] [% END %]
<div class="clearfix input-prepend"> <div class="clearfix input-prepend">