diff --git a/share/config.yml b/share/config.yml index 24c2a543..2977ffd5 100644 --- a/share/config.yml +++ b/share/config.yml @@ -133,8 +133,8 @@ sidebar_defaults: c_stp: { label: 'Spanning Tree', default: null, idx: 19 } c_up: { label: 'Status', default: null, idx: 20 } mac_format: { default: IEEE } - n_inventory: { label: 'Inventory Data', default: checked, idx: 0 } - n_detailed_inventory: { label: 'Detailed Inventory', default: null, idx: 1 } + n_inventory: { label: 'Remote Inventory', default: checked, idx: 0 } + n_detailed_inventory: { label: 'Remote Advertisement', default: null, idx: 1 } n_age: { label: 'Age Stamp', default: null, idx: 2 } n_ip4: { label: 'IPv4 Addresses', default: checked, idx: 3 } n_ip6: { label: 'IPv6 Addresses', default: checked, idx: 4 } diff --git a/share/views/ajax/device/ports.tt b/share/views/ajax/device/ports.tt index e1eb75d2..0bb10b1f 100644 --- a/share/views/ajax/device/ports.tt +++ b/share/views/ajax/device/ports.tt @@ -303,8 +303,9 @@ [% IF params.n_inventory and row.remote_inventory %] [% row.remote_inventory | html_entity %]
[% END %] - [% IF params.n_detailed_inventory and (row.remote_id or row.remote_type) %] - ([% 'id: '_ row.remote_id IF row.remote_id %] + [% IF params.n_detailed_inventory %] + ([% 'IP: '_ row.remote_ip IF row.remote_ip %] + [% ' id: '_ row.remote_id IF row.remote_id %] [% ' type: '_ row.remote_type IF row.remote_type %])
[% END %] [% ELSIF row.remote_ip %]