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

hide neighbor device ID and add sidebar option to show

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-13 09:57:29 +00:00
parent 29da3097cb
commit 88510552e5
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Netdisco/share/views/ajax/device/ports.tt
View File

@@ -233,13 +233,15 @@
<td> <td>
[% IF params.c_neighbors AND (row.remote_ip OR row.is_uplink) %] [% IF params.c_neighbors AND (row.remote_ip OR row.is_uplink) %]
[% IF row.neighbor %] [% IF row.neighbor %]
<i class="icon-link[% ' text-warning' IF row.manual_topo %]"></i> <i class="icon-link[% ' text-warning' IF row.manual_topo %]"></i>
<a href="[% uri_for('/device', <a href="[% uri_for('/device',
self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]"> self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]">
[% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %] [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %]
([% row.remote_port | html_entity %] - [% row.remote_port | html_entity %]</a><br/>
[% ' id: '_ row.remote_id IF row.remote_id %] [% IF params.neigh_id %]
[% ' type: '_ row.remote_type IF row.remote_type %])</a> ([% 'id: '_ row.remote_id IF row.remote_id %]
[% ' type: '_ row.remote_type IF row.remote_type %])
[% END %]
[% ELSIF row.remote_ip AND row.remote_port %] [% ELSIF row.remote_ip AND row.remote_port %]
[% IF row.remote_type AND row.remote_type.match('(?i)ip.phone') %] [% IF row.remote_type AND row.remote_type.match('(?i)ip.phone') %]
<i class="icon-phone"></i>&nbsp; <i class="icon-phone"></i>&nbsp;
@@ -248,12 +250,14 @@
[% ELSE %] [% ELSE %]
<i class="icon-unlink text-error"></i>&nbsp; <i class="icon-unlink text-error"></i>&nbsp;
[% END %] [% END %]
<a href="[% search_node %]&q=[% row.remote_ip | uri %]"> <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
[% row.remote_ip | html_entity %] (port: [% row.remote_port | html_entity %] [% row.remote_ip | html_entity %] - [% row.remote_port | html_entity %]</a><br/>
[% ' id: '_ row.remote_id IF row.remote_id %] [% IF params.neigh_id %]
[% ' type: '_ row.remote_type IF row.remote_type %])</a> ([% 'id: '_ row.remote_id IF row.remote_id %]
[% ' type: '_ row.remote_type IF row.remote_type %])
[% END %]
[% ELSE %] [% ELSE %]
<i class="icon-unlink text-error"></i>&nbsp; (possible uplink) <i class="icon-unlink text-error"></i>&nbsp; (possible uplink)
[% END %] [% END %]
[% END %] [% END %]
[% IF params.c_nodes %] [% IF params.c_nodes %]

7
Netdisco/share/views/sidebar/device/ports.tt
View File

@@ -105,6 +105,13 @@
</select> </select>
</div> </div>
</li> </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> </ul>
</div> </div>
</div> </div>