Merge branch 'master' of ssh://git.code.sf.net/p/netdisco/netdisco-ng into em-datatables-v1_10_0
This commit is contained in:
		| @@ -125,9 +125,8 @@ | ||||
|                   <li> | ||||
|                     <em class="muted">MAC address format:</em><br/> | ||||
|                     <select id="nd_mac-format" name="mac_format"> | ||||
|                       [% FOREACH format IN mac_formats.keys.sort %] | ||||
|                       <option[% ' selected="selected"' IF params.mac_format == format %] | ||||
|                         value="[% format %]">[% mac_formats.$format %]</option> | ||||
|                       [% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %] | ||||
|                       <option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option> | ||||
|                       [% END %] | ||||
|                     </select> | ||||
|                   </li> | ||||
|   | ||||
| @@ -55,9 +55,8 @@ | ||||
|             <div class="clearfix"> | ||||
|               <em class="muted">MAC address format:</em><br/> | ||||
|               <select id="nd_node-mac-format" name="mac_format"> | ||||
|                 [% FOREACH format IN mac_formats.keys.sort %] | ||||
|                 <option[% ' selected="selected"' IF params.mac_format == format %] | ||||
|                   value="[% format %]">[% mac_formats.$format %]</option> | ||||
|                 [% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %] | ||||
|                 <option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option> | ||||
|                 [% END %] | ||||
|               </select> | ||||
|             </div> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user