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

clarify Device or Node data in Node Search

Browse Source
This commit is contained in:
Oliver Gorwits
2013-03-02 16:04:22 +00:00
parent 5d33591903
commit 043eef9d4d
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Netdisco/share/views/ajax/search/node_by_ip.tt
View File

@@ -23,8 +23,8 @@
[% END %]
<td>IP &rarr; MAC</td>
<td><a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip %]</a>
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
[% ' <span class="label label-warning">A</span>' IF NOT row.active %]
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
</td>
[% IF params.stamps %]
<td>[% row.time_first_stamp %]</td>
@@ -38,9 +38,13 @@
<td>&nbsp;</td>
[% END %]
<td>Switch Port</td>
<td><a href="[% device_ports %]&q=[% node.device.dns || node.switch %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">[% node.switch %] [ [% node.port %] ]</a>
[% ' (' _ node.device.dns _ ')' IF node.device.dns %]
<td><a class="nd_linkcell"
href="[% device_ports %]&q=[% node.device.dns || node.switch %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">
[% node.switch %] - [% node.port %]</a>
[% ' <span class="label label-warning">A</span>' IF NOT node.active %]
[% IF node.device.dns AND node.device_port AND node.device_port.name %]
([% node.device.dns %] - [% node.device_port.name %])
[% END %]
</td>
[% IF params.stamps %]
<td>[% node.time_first_stamp %]</td>
@@ -56,8 +60,8 @@
[% END %]
<td>MAC &rarr; IP</td>
<td><a href="[% search_node %]&q=[% nodeip.ip | uri %]">[% nodeip.ip %]</a>
[% ' (' _ nodeip.dns.remove(settings.domain_suffix) _ ')' IF nodeip.dns %]
[% ' <span class="label label-warning">A</span>' IF NOT nodeip.active %]
[% ' (' _ nodeip.dns.remove(settings.domain_suffix) _ ')' IF nodeip.dns %]
</td>
[% IF params.stamps %]
<td>[% nodeip.time_first_stamp %]</td>

18
Netdisco/share/views/ajax/search/node_by_mac.tt
View File

@@ -36,8 +36,8 @@
[% END %]
<td>MAC &rarr; IP</td>
<td><a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip %]</a>
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
[% ' <span class="label label-warning">A</span>' IF NOT row.active %]
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
</td>
[% IF params.stamps %]
<td>[% row.time_first_stamp %]</td>
@@ -66,9 +66,13 @@
</td>
[% END %]
<td>Switch Port</td>
<td><a href="[% device_ports %]&q=[% node.device.dns || node.switch %]&f=[% node.port %]&c_nodes=on&c_neighbors=on">[% node.switch %] [ [% node.port %] ]</a>
[% ' (' _ node.device.dns _ ')' IF node.device.dns %]
<td><a class="nd_linkcell"
href="[% device_ports %]&q=[% node.device.dns || node.switch %]&f=[% node.port %]&c_nodes=on&c_neighbors=on">
[% node.switch %] - [% node.port %]</a>
[% ' <span class="label label-warning">A</span>' IF NOT node.active %]
[% IF node.device.dns AND node.device_port AND node.device_port.name %]
([% node.device.dns %] - [% node.device_port.name %])
[% END %]
</td>
[% IF params.stamps %]
<td>[% node.time_first_stamp %]</td>
@@ -97,8 +101,12 @@
</td>
[% END %]
<td>Switch Port</td>
<td><a href="[% device_ports %]&q=[% port.device.dns || port.ip %]&f=[% port.port %]&c_mac=on&c_nodes=on&c_neighbors=on">[% port.ip %] [ [% port.port %] ]</a>
[% ' (' _ port.device.dns _ ')' IF port.device.dns %]
<td><a class="nd_linkcell"
href="[% device_ports %]&q=[% port.device.dns || port.ip %]&f=[% port.port %]&c_mac=on&c_nodes=on&c_neighbors=on">
[% port.ip %] - [% port.descr %]</a>
[% IF port.device.dns AND port.name %]
([% port.device.dns %] - [% port.name %])
[% END %]
</td>
[% IF params.stamps %]
<td>[% port.creation %]</td>