Also, archive disappeared nodes from device after macsuck. Squashed commit of the following: commit6d16cddaabMerge:37d9bda3fdf780Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 19 15:48:41 2014 +0000 Merge branch 'master' of ssh://git.code.sf.net/p/netdisco/netdisco-ng into og-agg commit37d9bda2bbAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 18:50:22 2014 +0000 release 2.021000_004 commit3939a2a51cMerge:cf23636571d57dAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 18:45:14 2014 +0000 Merge branch 'og-agg' of ssh://olly_g@git.code.sf.net/p/netdisco/netdisco-ng into og-agg commitcf23636ddfAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 18:43:59 2014 +0000 archive disappeared nodes from device - really important! commit571d57dcc7Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 18:20:51 2014 +0000 release 2.021000_003 commit444bc1e81dAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 17:51:54 2014 +0000 protect sprintf from undefined remote_type commit5b875c4641Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 17:49:40 2014 +0000 tidy connected device+node layout commitc09dddb7d1Merge:4f5501c95fc6b1Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 17:46:39 2014 +0000 Merge branch 'og-agg' of ssh://olly_g@git.code.sf.net/p/netdisco/netdisco-ng into og-agg commit4f5501c613Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 17:46:23 2014 +0000 allow sanity checks on lag member before moving node commit95fc6b18dcAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 14:02:19 2014 +0000 release 2.021000_002 commit8b809c445fMerge:04d486efe3e8e3Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 13:58:31 2014 +0000 Merge branch 'og-agg' of ssh://git.code.sf.net/p/netdisco/netdisco-ng into og-agg commitfe3e8e3ef2Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 13:57:31 2014 +0000 do not set master neigh if master is a slave commit04d486e433Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 13:38:45 2014 +0000 display remote ip if only remote ip commit14f9eb01adAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 13:35:54 2014 +0000 show all members of lag when searching for lag master commit5b2a0a0a4bAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 13:35:16 2014 +0000 fix copy of remote master to local master remote_port commit86a9854f39Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 10:00:13 2014 +0000 show both link and device type icons commit88510552e5Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 09:57:29 2014 +0000 hide neighbor device ID and add sidebar option to show commit29da3097cbMerge:8bca30d9fe92fbAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 09:04:15 2014 +0000 Merge branch 'og-agg' of ssh://git.code.sf.net/p/netdisco/netdisco-ng into og-agg commit9fe92fb5e8Merge:6620a035557811Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 09:03:02 2014 +0000 Merge branch 'og-agg' of ssh://olly_g@git.code.sf.net/p/netdisco/netdisco-ng into og-agg commit6620a03686Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 08:56:13 2014 +0000 also store master neighbor port commit8bca30d085Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 00:41:46 2014 +0000 release 2.021000_001 commit5557811aebAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Jan 13 00:38:18 2014 +0000 fix icon placement in editable device port cells commit25292e1ce8Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 22:20:08 2014 +0000 fix name of class commit99ce56d794Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 22:13:53 2014 +0000 remove brackets from lag name commit27aa80ed93Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 22:12:06 2014 +0000 rename link agg legend commit84ed4c5008Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 22:11:15 2014 +0000 move lag member icon into port icon column commit67c9c783ecAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 21:58:11 2014 +0000 fix Cisco stack port ignore commit4531c61246Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 21:51:41 2014 +0000 move nodes to lag master port commitffc6b9c315Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 20:45:58 2014 +0000 use group icon for slave and master commit68fd345e37Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 20:34:01 2014 +0000 indicate aggregate master commit79c69f5a0fAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 19:14:48 2014 +0000 show aggreate parent in device ports commit3a4beed2f1Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 18:46:25 2014 +0000 store aggregate port into db commitfd7bb0cd62Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Jan 12 17:49:39 2014 +0000 add device_port cols for aggregate links data
		
			
				
	
	
		
			159 lines
		
	
	
		
			8.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			159 lines
		
	
	
		
			8.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| 
 | |
|             <input name="q" value="[% params.q | html_entity %]" type="hidden"/>
 | |
|             <input id="nd_ports-form-prefer-field" name="prefer" value="[% params.prefer | html_entity %]" type="hidden"/>
 | |
|             <div class="clearfix">
 | |
|               <i class="nd_field-clear-icon icon-trash icon-large"
 | |
|                  rel="tooltip" data-placement="bottom" data-offset="3" data-title="Show all Ports"
 | |
|                  id="f_clear_btn" data-btn-for="port"></i>
 | |
|               <input id="nd_port-query" placeholder="Port, Name or VLAN"
 | |
|                 name="f" value="[% params.f | html_entity %]" type="text"
 | |
|                 rel="tooltip" data-placement="left" data-offset="5" data-title="Filter by Port, Name or VLAN"/>
 | |
|               <div class="clearfix input-prepend nd_port-partial">
 | |
|                 <label class="add-on nd_port-partial-label">
 | |
|                   <input type="checkbox" id="partial"
 | |
|                     name="partial"[% ' checked="checked"' IF params.partial %]/>
 | |
|                 </label>
 | |
|                 <label class="nd_checkboxlabel" for="partial">
 | |
|                   <span class="nd_port-partial-checkbox uneditable-input">Partial Match</span>
 | |
|                 </label>
 | |
|                 <label class="add-on nd_port-invert-label">
 | |
|                   <input type="checkbox" id="invert"
 | |
|                     name="invert"[% ' checked="checked"' IF params.invert %]/>
 | |
|                 </label>
 | |
|                 <label class="nd_checkboxlabel" for="invert">
 | |
|                   <span class="nd_port-invert-checkbox uneditable-input">Not</span>
 | |
|                 </label>
 | |
|               </div>
 | |
|             </div>
 | |
|             <div class="clearfix">
 | |
|               <span data-toggle="collapse" data-target="#nd_legend">
 | |
|                 <label class="nd_collapser">Legend
 | |
|                 <i class="nd_arrow-up-down-right icon-chevron-up icon-large"></i>
 | |
|                 </label></span>
 | |
|               <div id="nd_legend" class="collapse">
 | |
|                 <ul class="icons-ul"><!-- nd_inputs-list unstyled"> -->
 | |
|                   <li><i class="icon-li icon-angle-up text-success"></i>  Link Up</li>
 | |
|                   <li><i class="icon-li icon-arrow-down text-error"></i>  Link Down</li>
 | |
|                   <li><i class="icon-li icon-arrow-down text-success"></i>  Port Free</li>
 | |
|                   <li><i class="icon-li icon-remove"></i>  Admin Disabled</li>
 | |
|                   <li><i class="icon-li icon-fullscreen text-info"></i>  Blocking</li>
 | |
|                   <li><i class="icon-li icon-link text-warning"></i>  Manual Topology</li>
 | |
|                   <li><i class="icon-li icon-link"></i>  Neighbor Device</li>
 | |
|                   <li><i class="icon-li icon-unlink text-error"></i>  Neighbor Inacessible</li>
 | |
|                   <li><i class="icon-li icon-phone"></i>  IP Phone</li>
 | |
|                   <li><i class="icon-li icon-signal"></i>  Wireless Client</li>
 | |
|                   <li><i class="icon-li icon-book"></i>  Archived Data</li>
 | |
|                   <li><i class="icon-li icon-group"></i>  Link Aggregate</li>
 | |
|                   [% IF user_has_role('port_control') %]
 | |
|                   <li><i class="icon-li icon-refresh icon-spin"></i>  Click "Update View"</li>
 | |
|                   [% END %]
 | |
|                 </ul>
 | |
|               </div>
 | |
|             </div>
 | |
|             <div class="clearfix">
 | |
|               <span data-toggle="collapse" data-target="#nd_columns">
 | |
|                 <label class="nd_collapser">Display Columns
 | |
|                 <i class="nd_arrow-up-down-right icon-chevron-down icon-large"></i>
 | |
|                 </label></span>
 | |
|               <div id="nd_columns" class="collapse in">
 | |
|                 <ul class="nd_inputs-list unstyled">
 | |
|                   [% FOREACH item IN vars.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 params.${item.name} %] />
 | |
|                       [% IF item.name == 'c_admin' %]
 | |
|                         <span class="label label-info">[% item.label | html_entity %]</span>
 | |
|                       [% ELSE %]
 | |
|                         [% item.label | html_entity %]
 | |
|                       [% END %]
 | |
|                     </label>
 | |
|                   </li>
 | |
|                   [% END %]
 | |
|                 </ul>
 | |
|               </div>
 | |
|             </div>
 | |
|             <div class="clearfix">
 | |
|               <span data-toggle="collapse" data-target="#nd_portprops">
 | |
|                 <label class="nd_collapser">Port Properties
 | |
|                 <i class="nd_arrow-up-down-right icon-chevron-up icon-large"></i>
 | |
|                 </label></span>
 | |
|               <div id="nd_portprops" class="collapse">
 | |
|                 <ul class="nd_inputs-list unstyled">
 | |
|                   <li>
 | |
|                     <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 params.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 params.age_unit == unit %]>[% unit %]</option>
 | |
|                       [% END %]
 | |
|                     </select>
 | |
|                   </li>
 | |
|                   <li>
 | |
|                     <em class="muted">Show Ports with Status:</em><br/>
 | |
|                     <div class="clearfix">
 | |
|                       <select class="nd_side-select" size="4" multiple="on" name="port_state"/>
 | |
|                         <option selected="selected" value="up">Link Up</option>
 | |
|                         <option selected="selected" value="free">Port Free</option>
 | |
|                         <option selected="selected" value="down">Link Down</option>
 | |
|                         <option selected="selected" value="shut">Admin Disabled</option>
 | |
|                       </select>
 | |
|                     </div>
 | |
|                   </li>
 | |
|                   <li>
 | |
|                     <label class="checkbox">
 | |
|                       <input type="checkbox" id="neigh_id"
 | |
|                         name="neigh_id"[% ' checked="checked"' IF params.neigh_id %] />
 | |
|                       Connected Device ID
 | |
|                     </label>
 | |
|                   </li>
 | |
|                 </ul>
 | |
|               </div>
 | |
|             </div>
 | |
|             <div class="clearfix">
 | |
|               <span data-toggle="collapse" data-target="#nd_nodeprops">
 | |
|                 <label class="nd_collapser">Node Properties
 | |
|                 <i class="nd_arrow-up-down-right icon-chevron-up icon-large"></i>
 | |
|                 </label></span>
 | |
|               <div id="nd_nodeprops" class="collapse">
 | |
|                 <ul class="nd_inputs-list unstyled">
 | |
|                   <li>
 | |
|                     <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 params.mac_format == format %]>[% format %]</option>
 | |
|                       [% END %]
 | |
|                     </select>
 | |
|                   </li>
 | |
|                   [% FOREACH item IN vars.connected_properties %]
 | |
|                   <li>
 | |
|                     <label class="checkbox">
 | |
|                       <input type="checkbox" id="[% item.name | html_entity %]"
 | |
|                         name="[% item.name | html_entity %]"[% ' checked="checked"' IF params.${item.name} %] />
 | |
|                       [% item.label | html_entity %]
 | |
|                     </label>
 | |
|                   </li>
 | |
|                   [% END %]
 | |
|                 </ul>
 | |
|               </div>
 | |
|             </div>
 | |
|             <div class="btn-group">
 | |
|               <button id="[% tab.tag %]_submit" type="submit" class="btn btn-info nd_sidebar-btn-drop">
 | |
|                 <i class="icon-search icon-large pull-left nd_navbar-icon"></i> Update View</button>
 | |
|               <button class="btn btn-info dropdown-toggle nd_sidebar-btn-drop-drop" data-toggle="dropdown">
 | |
|                 <span class="caret"></span>
 | |
|               </button>
 | |
|               <ul class="dropdown-menu">
 | |
|                 <li><a class="nd_device-port-submit-prefer" href="" data-prefer="">Default Search</a></li>
 | |
|                 <li><a class="nd_device-port-submit-prefer" href="" data-prefer="port">Filter by Port</a></li>
 | |
|                 <li><a class="nd_device-port-submit-prefer" href="" data-prefer="name">Filter by Name</a></li>
 | |
|                 <li><a class="nd_device-port-submit-prefer" href="" data-prefer="vlan">Filter by VLAN</a></li>
 | |
|               </ul>
 | |
|             </div>
 | |
| 
 |