remove collision in "vendor" param name

This commit is contained in:
Oliver Gorwits
2013-09-22 18:20:31 +01:00
parent a09d494858
commit 8b22bf6c0d
3 changed files with 11 additions and 11 deletions

View File

@@ -2,7 +2,7 @@
<thead> <thead>
<tr> <tr>
<th>MAC</th> <th>MAC</th>
[% IF params.vendor %] [% IF params.show_vendor %]
<th>Vendor</th> <th>Vendor</th>
[% END %] [% END %]
<th>Match</th> <th>Match</th>
@@ -19,7 +19,7 @@
<td><a class="nd_linkcell" <td><a class="nd_linkcell"
href="[% search_node %]&q=[% row.net_mac.$mac_format_call | uri %]"> href="[% search_node %]&q=[% row.net_mac.$mac_format_call | uri %]">
[% row.net_mac.$mac_format_call | html_entity %]</a></td> [% row.net_mac.$mac_format_call | html_entity %]</a></td>
[% IF params.vendor %] [% IF params.show_vendor %]
<td>[% row.oui.company | html_entity %]</td> <td>[% row.oui.company | html_entity %]</td>
[% END %] [% END %]
<td>IP &rarr; MAC</td> <td>IP &rarr; MAC</td>
@@ -35,7 +35,7 @@
[% FOREACH node IN row.node_sightings(archive_filter) %] [% FOREACH node IN row.node_sightings(archive_filter) %]
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
[% IF params.vendor %] [% IF params.show_vendor %]
<td>&nbsp;</td> <td>&nbsp;</td>
[% END %] [% END %]
<td>Switch Port</td> <td>Switch Port</td>
@@ -56,7 +56,7 @@
[% FOREACH nodeip IN row.ip_aliases(archive_filter) %] [% FOREACH nodeip IN row.ip_aliases(archive_filter) %]
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
[% IF params.vendor %] [% IF params.show_vendor %]
<td>&nbsp;</td> <td>&nbsp;</td>
[% END %] [% END %]
<td>MAC &rarr; IP</td> <td>MAC &rarr; IP</td>

View File

@@ -2,7 +2,7 @@
<thead> <thead>
<tr> <tr>
<th>MAC</th> <th>MAC</th>
[% IF params.vendor %] [% IF params.show_vendor %]
<th>Vendor</th> <th>Vendor</th>
[% END %] [% END %]
<th>Match</th> <th>Match</th>
@@ -26,7 +26,7 @@
&nbsp; &nbsp;
[% END %] [% END %]
</a> </a>
[% IF params.vendor %] [% IF params.show_vendor %]
<td> <td>
[% IF first_row %] [% IF first_row %]
[% row.oui.company | html_entity %] [% row.oui.company | html_entity %]
@@ -58,7 +58,7 @@
&nbsp; &nbsp;
[% END %] [% END %]
</td> </td>
[% IF params.vendor %] [% IF params.show_vendor %]
<td> <td>
[% IF first_row %] [% IF first_row %]
[% node.oui.company | html_entity %] [% node.oui.company | html_entity %]
@@ -93,7 +93,7 @@
&nbsp; &nbsp;
[% END %] [% END %]
</td> </td>
[% IF params.vendor %] [% IF params.show_vendor %]
<td> <td>
[% IF first_row %] [% IF first_row %]
[% port.oui.company | html_entity %] [% port.oui.company | html_entity %]

View File

@@ -12,10 +12,10 @@
</div> </div>
<div class="clearfix input-prepend"> <div class="clearfix input-prepend">
<label class="add-on"> <label class="add-on">
<input type="checkbox" id="vendor" <input type="checkbox" id="show_vendor"
name="vendor"[% ' checked="checked"' IF params.vendor %]/> name="show_vendor"[% ' checked="checked"' IF params.show_vendor %]/>
</label> </label>
<label class="nd_checkboxlabel" for="vendor"> <label class="nd_checkboxlabel" for="show_vendor">
<span class="nd_searchcheckbox uneditable-input">Vendor</span> <span class="nd_searchcheckbox uneditable-input">Vendor</span>
</label> </label>
</div> </div>