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

Merge branch 'master' into og-newnetmap

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-12 23:38:00 +00:00
parent 77ca8f96e1 000cbaa195
commit 1c627eaf3c
11 changed files with 109 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/views/ajax/device/ports.tt
View File

@@ -3,7 +3,7 @@
<thead>
<tr>
<th></th>
[% FOREACH item IN vars.port_columns %]
[% FOREACH item IN settings.port_columns %]
[% NEXT IF item.name == 'c_admin' %]
[% NEXT IF item.name == 'c_nodes' AND params.c_nodes AND params.c_neighbors %]
[% NEXT UNLESS params.${item.name} %]

2
share/views/ajax/device/ports_csv.tt
View File

@@ -2,7 +2,7 @@
[% SET headers = [] %]
[% SET c_nodes_pos = -1 %]
[% FOREACH item IN vars.port_columns %]
[% FOREACH item IN settings.port_columns %]
[% NEXT IF item.name == 'c_admin' %]
[% NEXT UNLESS params.${item.name} %]

14
share/views/sidebar/device/ports.tt
View File

@@ -57,12 +57,12 @@
</label></span>
<div id="nd_columns" class="collapse in">
<ul class="nd_inputs-list unstyled">
[% FOREACH item IN vars.port_columns %]
[% FOREACH item IN settings.port_columns %]
[% NEXT IF item.name == 'c_admin' AND NOT user_has_role('port_control') %]
<li>
<label class="checkbox">
<input type="checkbox" id="[% item.name | html_entity %]"
name="[% item.name | html_entity %]"[% ' checked="checked"' IF item.default %] />
name="[% item.name | html_entity %]"[% ' checked="checked"' IF vars.sidebar_defaults.device_ports.${item.name} %] />
[% IF item.name == 'c_admin' %]
<span class="label label-info">[% item.label | html_entity %]</span>
[% ELSE %]
@@ -85,12 +85,12 @@
<em class="muted">Mark as Free if Down for:</em><br/>
<select id="nd_days-select" name="age_num">
[% FOREACH count IN [1..32] %]
<option[% ' selected="selected"' IF device_ports_defaults.age_num == count %]>[% count %]</option>
<option[% ' selected="selected"' IF vars.sidebar_defaults.device_ports.age_num == count %]>[% count %]</option>
[% END %]
</select>
<select id="nd_age-select" name="age_unit">
[% FOREACH unit IN [ 'days', 'weeks', 'months', 'years' ] %]
<option[% ' selected="selected"' IF device_ports_defaults.age_unit == unit %]>[% unit %]</option>
<option[% ' selected="selected"' IF vars.sidebar_defaults.device_ports.age_unit == unit %]>[% unit %]</option>
[% END %]
</select>
</li>
@@ -126,15 +126,15 @@
<em class="muted">MAC address format:</em><br/>
<select id="nd_mac-format" name="mac_format">
[% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
<option[% ' selected="selected"' IF device_ports_defaults.mac_format == format %]>[% format %]</option>
<option[% ' selected="selected"' IF vars.sidebar_defaults.device_ports.mac_format == format %]>[% format %]</option>
[% END %]
</select>
</li>
[% FOREACH item IN vars.connected_properties %]
[% FOREACH item IN settings.connected_properties %]
<li>
<label class="checkbox">
<input type="checkbox" id="[% item.name | html_entity %]"
name="[% item.name | html_entity %]"[% ' checked="checked"' IF item.default %] />
name="[% item.name | html_entity %]"[% ' checked="checked"' IF vars.sidebar_defaults.device_ports.${item.name} %] />
[% item.label | html_entity %]
</label>
</li>

4
share/views/sidebar/report/moduleinventory.tt
View File

@@ -58,7 +58,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="fruonly"
name="fruonly"[% ' checked="checked"' IF report_moduleinventory_defaults.fruonly %]/>
name="fruonly"[% ' checked="checked"' IF vars.sidebar_defaults.report_moduleinventory.fruonly %]/>
</label>
<label class="nd_checkboxlabel" for="fruonly">
<span class="nd_searchcheckbox uneditable-input">FRU Only</span>
@@ -67,7 +67,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="matchall"
name="matchall"[% ' checked="checked"' IF report_moduleinventory_defaults.matchall %]/>
name="matchall"[% ' checked="checked"' IF vars.sidebar_defaults.report_moduleinventory.matchall %]/>
</label>
<label class="nd_checkboxlabel" for="matchall">
<span class="nd_searchcheckbox uneditable-input">Match All Options</span>

2
share/views/sidebar/search/device.tt
View File

@@ -89,7 +89,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="matchall"
name="matchall"[% ' checked="checked"' IF search_device_defaults.matchall %]/>
name="matchall"[% ' checked="checked"' IF vars.sidebar_defaults.search_device.matchall %]/>
</label>
<label class="nd_checkboxlabel" for="matchall">
<span class="nd_searchcheckbox uneditable-input">Match All Options</span>

16
share/views/sidebar/search/node.tt
View File

@@ -4,7 +4,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="stamps"
name="stamps"[% ' checked="checked"' IF search_node_defaults.stamps %]/>
name="stamps"[% ' checked="checked"' IF vars.sidebar_defaults.search_node.stamps %]/>
</label>
<label class="nd_checkboxlabel" for="stamps">
<span class="nd_searchcheckbox uneditable-input">Time Stamps</span>
@@ -13,7 +13,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="deviceports"
name="deviceports"[% ' checked="checked"' IF search_node_defaults.deviceports %]/>
name="deviceports"[% ' checked="checked"' IF vars.sidebar_defaults.search_node.deviceports %]/>
</label>
<label class="nd_checkboxlabel" for="deviceports">
<span class="nd_searchcheckbox uneditable-input">Device Ports</span>
@@ -22,7 +22,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="show_vendor"
name="show_vendor"[% ' checked="checked"' IF search_node_defaults.show_vendor %]/>
name="show_vendor"[% ' checked="checked"' IF vars.sidebar_defaults.search_node.show_vendor %]/>
</label>
<label class="nd_checkboxlabel" for="show_vendor">
<span class="nd_searchcheckbox uneditable-input">Vendor</span>
@@ -31,7 +31,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="archived"
name="archived"[% ' checked="checked"' IF search_node_defaults.archived %]/>
name="archived"[% ' checked="checked"' IF vars.sidebar_defaults.search_node.archived %]/>
</label>
<label class="nd_checkboxlabel" for="archived">
<span class="nd_searchcheckbox uneditable-input">
@@ -41,7 +41,7 @@
<div class="clearfix input-prepend">
<label class="add-on nd_sidebar-legend">
<input type="checkbox" id="node_partial"
name="partial"[% ' checked="checked"' IF search_node_defaults.partial %]/>
name="partial"[% ' checked="checked"' IF vars.sidebar_defaults.search_node.partial %]/>
</label>
<label class="nd_checkboxlabel" for="node_partial">
<span class="nd_searchcheckbox uneditable-input">Partial Match</span>
@@ -52,20 +52,20 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="age_invert"
name="age_invert"[% ' checked="checked"' IF search_node_defaults.age_invert %]/>
name="age_invert"[% ' checked="checked"' IF vars.sidebar_defaults.search_node.age_invert %]/>
</label>
<label class="nd_checkboxlabel" for="age_invert">
<span class="nd_searchcheckbox uneditable-input">Not within...</span>
</label>
</div>
<input class="nd_side-input" id="daterange"
type="text" name="daterange" value="[% search_node_defaults.daterange | html_entity %]"/>
type="text" name="daterange" value="[% vars.sidebar_defaults.search_node.daterange | html_entity %]"/>
</div>
<div class="clearfix">
<em class="muted">MAC address format:</em><br/>
<select id="nd_node-mac-format" name="mac_format">
[% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
<option[% ' selected="selected"' IF search_node_defaults.mac_format == format %]>[% format %]</option>
<option[% ' selected="selected"' IF vars.sidebar_defaults.search_node.mac_format == format %]>[% format %]</option>
[% END %]
</select>
</div>

6
share/views/sidebar/search/port.tt
View File

@@ -4,7 +4,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="port_partial"
name="partial"[% ' checked="checked"' IF search_port_defaults.partial %]/>
name="partial"[% ' checked="checked"' IF vars.sidebar_defaults.search_port.partial %]/>
</label>
<label class="nd_checkboxlabel" for="port_partial">
<span class="nd_searchcheckbox uneditable-input">Partial Match</span>
@@ -13,7 +13,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="port_uplink"
name="uplink"[% ' checked="checked"' IF search_port_defaults.uplink %]/>
name="uplink"[% ' checked="checked"' IF vars.sidebar_defaults.search_port.uplink %]/>
</label>
<label class="nd_checkboxlabel" for="port_uplink">
<span class="nd_searchcheckbox uneditable-input">Uplinks</span>
@@ -22,7 +22,7 @@
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="port_ethernet"
name="ethernet"[% ' checked="checked"' IF search_port_defaults.ethernet %]/>
name="ethernet"[% ' checked="checked"' IF vars.sidebar_defaults.search_port.ethernet %]/>
</label>
<label class="nd_checkboxlabel" for="port_ethernet">
<span class="nd_searchcheckbox uneditable-input">Ethernet Only</span>