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

new bs2 label naming

Browse Source
This commit is contained in:
Oliver Gorwits
2012-03-03 20:46:52 +00:00
parent 484b851449
commit 6efdfc8300
8 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Netdisco/views/ajax/device/ports.tt
View File

@@ -13,13 +13,13 @@
<tr>
<td>
[% IF row.up_admin == 'down' %]
<span class="label">s</span>
<span class="label">S</span>
[% ELSIF row.stp == 'blocking' %]
<span class="label notice">b</span>
<span class="label label-info">B</span>
[% ELSIF params.free OR row.is_free %]
<span class="label success">f</span>
<span class="label label-success">F</span>
[% ELSIF row.up_admin == 'up' AND row.up == 'down' %]
<span class="label warning">d</span>
<span class="label label-warning">D</span>
[% END %]
</td>
[% IF params.c_port %]
@@ -86,7 +86,7 @@
[% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip %]
([% row.remote_port | html_entity %])</a>
[% ELSE %]
<span class="label important">n</span>
<span class="label label-important">N</span>
<a href="[% uri_for('/search') %]?tab=node&q=[% row.remote_ip | uri %]">
[% row.remote_ip %] (port: [% row.remote_port %]
id: [% (row.remote_type _ ' / ') IF row.remote_type %][% row.remote_id %])</a>
@@ -94,12 +94,12 @@
[% END %]
[% FOREACH node IN row.$nodes %]
[% '<br/>' IF row.remote_ip OR NOT loop.first %]
[% '<span class="label warning">a</span> &nbsp;' IF NOT node.active %]
[% '<span class="label label-warning">A</span> &nbsp;' IF NOT node.active %]
<a href="[% uri_for('/search') %]?tab=node&q=[% node.mac | uri %]">[% node.mac %]</a>
[% ' (' _ node.time_last_age _ ')' IF params.n_age %]
[% IF params.n_ip %]
[% FOREACH ip IN node.ips %]
<br/>&nbsp; [% '<span class="label warning">a</span> &nbsp;' IF NOT ip.active %]
<br/>&nbsp; [% '<span class="label label-warning">A</span> &nbsp;' IF NOT ip.active %]
[% SET dns = ip.dns %]
[% IF dns %]
<a href="[% uri_for('/search') %]?tab=node&q=[% ip.ip | uri %]">[% dns %] ([% ip.ip %])</a>

6
Netdisco/views/ajax/search/node_by_ip.tt
View File

@@ -24,7 +24,7 @@
<td>IP &rarr; MAC</td>
<td><a href="[% uri_for('/search') %]?[% vars.query_defaults.node %]&q=[% row.ip | uri %]">[% row.ip %]</a>
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
[% ' <span class="label warning">a</span>' IF NOT row.active %]
[% ' <span class="label label-warning">A</span>' IF NOT row.active %]
</td>
[% IF params.stamps %]
<td>[% row.time_first_stamp %]</td>
@@ -40,7 +40,7 @@
<td>Switch Port</td>
<td><a href="[% uri_for('/device') %]?tab=ports&q=[% node.switch | url %]&f=[% node.port | url %]">[% node.switch %] [ [% node.port %] ]</a>
[% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %]
[% ' <span class="label warning">a</span>' IF NOT node.active %]
[% ' <span class="label label-warning">A</span>' IF NOT node.active %]
</td>
[% IF params.stamps %]
<td>[% node.time_first_stamp %]</td>
@@ -57,7 +57,7 @@
<td>MAC &rarr; IP</td>
<td><a href="[% uri_for('/search') %]?[% vars.query_defaults.node %]&q=[% nodeip.ip | uri %]">[% nodeip.ip %]</a>
[% ' (' _ nodeip.dns.remove(settings.domain_suffix) _ ')' IF nodeip.dns %]
[% ' <span class="label warning">a</span>' IF NOT nodeip.active %]
[% ' <span class="label label-warning">A</span>' IF NOT nodeip.active %]
</td>
[% IF params.stamps %]
<td>[% nodeip.time_first_stamp %]</td>

4
Netdisco/views/ajax/search/node_by_mac.tt
View File

@@ -37,7 +37,7 @@
<td>MAC &rarr; IP</td>
<td><a href="[% uri_for('/search') %]?[% vars.query_defaults.node %]&q=[% row.ip | uri %]">[% row.ip %]</a>
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
[% ' <span class="label warning">a</span>' IF NOT row.active %]
[% ' <span class="label label-warning">A</span>' IF NOT row.active %]
</td>
[% IF params.stamps %]
<td>[% row.time_first_stamp %]</td>
@@ -68,7 +68,7 @@
<td>Switch Port</td>
<td><a href="[% uri_for('/device') %]?tab=ports&q=[% node.switch | url %]&f=[% node.port | url %]">[% node.switch %] [ [% node.port %] ]</a>
[% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %]
[% ' <span class="label warning">a</span>' IF NOT node.active %]
[% ' <span class="label label-warning">A</span>' IF NOT node.active %]
</td>
[% IF params.stamps %]
<td>[% node.time_first_stamp %]</td>