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

DataTables for node search results tab

Browse Source
This commit is contained in:
Eric A. Miller
2014-06-03 20:16:22 -04:00
parent b5a7836f79
commit 3ce40b1191
3 changed files with 159 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm
View File

@@ -90,9 +90,11 @@ ajax '/ajax/content/search/node' => require_login sub {
{ -and => [@where_mac] }, { -and => [@where_mac] },
{ order_by => { '-desc' => 'time_last' }, { order_by => { '-desc' => 'time_last' },
'+columns' => [ '+columns' => [
'oui.company',
{ {
time_last_stamp => \"to_char(time_last, 'YYYY-MM-DD HH24:MI')" time_last_stamp => \"to_char(time_last, 'YYYY-MM-DD HH24:MI')"
}] }],
join => 'oui'
} }
); );

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

@@ -1,6 +1,6 @@
[% USE date(format = '%Y-%m-%d %H:%M') %] [% USE date(format = '%Y-%m-%d %H:%M') %]
[% USE Number.Format %] [% USE Number.Format %]
<table class="table table-bordered table-hover nd_floatinghead"> <table id="nsbi-data-table" class="table table-bordered table-hover" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th>MAC</th> <th>MAC</th>
@@ -19,14 +19,13 @@
[% WHILE (row = macs.next) %] [% WHILE (row = macs.next) %]
[% IF row.nbname %] [% IF row.nbname %]
<tr> <tr>
<td><a class="nd_linkcell" <td><a 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.show_vendor %] [% IF params.show_vendor %]
<td>[% row.oui.company | html_entity %]</td> <td>[% row.oui.company | html_entity %]</td>
[% END %] [% END %]
<td>NetBIOS</td> <td>NetBIOS</td>
<td class="nd_linkcell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% row.domain | uri %]" title="Devices in this Domain">[% row.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% row.nbname | uri %]">[% row.nbname | html_entity %]</a> <td class="nd_linkcell nd_center-cell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% row.domain | uri %]" title="Devices in this Domain">[% row.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% row.nbname | uri %]">[% row.nbname | html_entity %]</a>
<br>[% row.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a> <br>[% row.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a>
</td> </td>
[% IF params.stamps %] [% IF params.stamps %]
@@ -36,14 +35,14 @@
</tr> </tr>
[% ELSE %] [% ELSE %]
<tr> <tr>
<td><a class="nd_linkcell" <td><a 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.show_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>
<td><a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a> <td class="nd_center-cell">
<a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a>
[% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT row.active %] [% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT row.active %]
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %] [% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
</td> </td>
@@ -55,12 +54,15 @@
[% END %] [% END %]
[% FOREACH nbt IN row.netbios %] [% FOREACH nbt IN row.netbios %]
<tr> <tr>
<td>&nbsp;</td> <td><a href="[% search_node %]&q=[% nbt.net_mac.$mac_format_call | uri %]">
[% nbt.net_mac.$mac_format_call | html_entity %]</a></td>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td>&nbsp;</td> <td>
[% nbt.oui.company | html_entity %]
</td>
[% END %] [% END %]
<td>NetBIOS</td> <td>NetBIOS</td>
<td class="nd_linkcell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a> <td class="nd_linkcell nd_center-cell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
<br>[% nbt.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a> <br>[% nbt.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
</td> </td>
[% IF params.stamps %] [% IF params.stamps %]
@@ -71,12 +73,16 @@
[% END %] [% END %]
[% FOREACH ni IN row.nodeips %] [% FOREACH ni IN row.nodeips %]
<tr> <tr>
<td>&nbsp;</td> <td><a href="[% search_node %]&q=[% ni.net_mac.$mac_format_call | uri %]">
[% ni.net_mac.$mac_format_call | html_entity %]</a></td>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td>&nbsp;</td> <td>
[% ni.oui.company | html_entity %]
</td>
[% END %] [% END %]
<td>IP &rarr; MAC</td> <td>IP &rarr; MAC</td>
<td><a href="[% search_node %]&q=[% ni.ip | uri %]">[% ni.ip | html_entity %]</a> <td class="nd_center-cell">
<a href="[% search_node %]&q=[% ni.ip | uri %]">[% ni.ip | html_entity %]</a>
[% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT ni.active %] [% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT ni.active %]
[% ' (' _ ni.dns.remove(settings.domain_suffix) _ ')' IF ni.dns %] [% ' (' _ ni.dns.remove(settings.domain_suffix) _ ')' IF ni.dns %]
</td> </td>
@@ -88,12 +94,15 @@
[% END %] [% END %]
[% FOREACH node IN row.node_sightings(archive_filter) %] [% FOREACH node IN row.node_sightings(archive_filter) %]
<tr> <tr>
<td>&nbsp;</td> <td><a href="[% search_node %]&q=[% node.net_mac.$mac_format_call | uri %]">
[% node.net_mac.$mac_format_call | html_entity %]</a></td>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td>&nbsp;</td> <td>
[% node.oui.company | html_entity %]
</td>
[% END %] [% END %]
<td>Switch Port</td> <td>Switch Port</td>
<td><a class="nd_linkcell" <td><a class="nd_linkcell nd_center-cell"
href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on"> href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">
[% node.switch | html_entity %] - [% node.port | html_entity %] [% node.switch | html_entity %] - [% node.port | html_entity %]
[% '&nbsp;<i class="icon-book text-warning"></i>' IF NOT node.active %]</a> [% '&nbsp;<i class="icon-book text-warning"></i>' IF NOT node.active %]</a>
@@ -108,9 +117,12 @@
</tr> </tr>
[% FOREACH wlan IN node.wireless %] [% FOREACH wlan IN node.wireless %]
<tr> <tr>
<td>&nbsp;</td> <td><a href="[% search_node %]&q=[% wlan.net_mac.$mac_format_call | uri %]">
[% wlan.net_mac.$mac_format_call | html_entity %]</a></td>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td>&nbsp;</td> <td>
[% wlan.oui.company | html_entity %]
</td>
[% END %] [% END %]
<td>Wireless Info</td> <td>Wireless Info</td>
<td class="nd_center-cell">SSID: [% wlan.ssid | html_entity %]<br> <td class="nd_center-cell">SSID: [% wlan.ssid | html_entity %]<br>
@@ -128,12 +140,16 @@
[% END %] [% END %]
[% FOREACH nodeip IN row.ip_aliases(archive_filter) %] [% FOREACH nodeip IN row.ip_aliases(archive_filter) %]
<tr> <tr>
<td>&nbsp;</td> <td><a href="[% search_node %]&q=[% nodeip.net_mac.$mac_format_call | uri %]">
[% nodeip.net_mac.$mac_format_call | html_entity %]</a></td>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td>&nbsp;</td> <td>
[% nodeip.oui.company | html_entity %]
</td>
[% END %] [% END %]
<td>MAC &rarr; IP</td> <td>MAC &rarr; IP</td>
<td><a href="[% search_node %]&q=[% nodeip.ip | uri %]">[% nodeip.ip | html_entity %]</a> <td class="nd_center-cell">
<a href="[% search_node %]&q=[% nodeip.ip | uri %]">[% nodeip.ip | html_entity %]</a>
[% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT nodeip.active %] [% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT nodeip.active %]
[% ' (' _ nodeip.dns.remove(settings.domain_suffix) _ ')' IF nodeip.dns %] [% ' (' _ nodeip.dns.remove(settings.domain_suffix) _ ')' IF nodeip.dns %]
</td> </td>
@@ -146,3 +162,55 @@
[% END %] [% END %]
</tbody> </tbody>
</table> </table>
<style>
tr.group,
tr.group:hover {
background-color: #ddd !important;
}
</style>
<script>
$(document).ready(function() {
var table = $('#nsbi-data-table').DataTable({
"columnDefs": [
{ "visible": false, "targets": 0 }
],
"order": [[ 0, 'asc' ]],
"drawCallback": function ( settings ) {
var api = this.api();
var rows = api.rows( {page:'current'} ).nodes();
var last=null;
api.column(0, {page:'current'} ).data().each( function ( group, i ) {
if ( last !== group ) {
$(rows).eq( i ).before(
[% IF params.show_vendor && params.stamps %]
'<tr class="group"><td colspan="5">'+group+'</td></tr>'
[% ELSIF params.stamps %]
'<tr class="group"><td colspan="4">'+group+'</td></tr>'
[% ELSIF params.show_vendor %]
'<tr class="group"><td colspan="3">'+group+'</td></tr>'
[% ELSE %]
'<tr class="group"><td colspan="2">'+group+'</td></tr>'
[% END %]
);
last = group;
}
} );
}
} );
// Order by the grouping
$('#nsbi-data-table tbody').on( 'click', 'tr.group', function () {
var currentOrder = table.order()[0];
if ( currentOrder[0] === 0 && currentOrder[1] === 'asc' ) {
table.order( [ 0, 'desc' ] ).draw();
}
else {
table.order( [ 0, 'asc' ] ).draw();
}
} );
} );
</script>

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

@@ -1,5 +1,5 @@
[% USE Number.Format %] [% USE Number.Format %]
<table class="table table-bordered table-hover nd_floatinghead"> <table id="nsbm-data-table" class="table table-bordered table-hover" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th>MAC</th> <th>MAC</th>
@@ -7,7 +7,7 @@
<th>Vendor</th> <th>Vendor</th>
[% END %] [% END %]
<th>Match</th> <th>Match</th>
<th>Device or Node</th> <th class="nd_center-cell">Device or Node</th>
[% IF params.stamps %] [% IF params.stamps %]
<th>First Seen</th> <th>First Seen</th>
<th>Last Seen</th> <th>Last Seen</th>
@@ -15,29 +15,18 @@
</tr> </tr>
</thead> </thead>
</tbody> </tbody>
[% SET first_row = 1 %]
[% WHILE (row = ips.next) %] [% WHILE (row = ips.next) %]
<tr> <tr>
<td> <td>
[% IF first_row %] <a href="[% search_node %]&q=[% row.net_mac.$mac_format_call | uri %]">
<a class="nd_linkcell"
href="[% search_node %]&q=[% row.net_mac.$mac_format_call | uri %]">
[% row.net_mac.$mac_format_call | html_entity %]</a> [% row.net_mac.$mac_format_call | html_entity %]</a>
[% ELSE %]
&nbsp;
[% END %]
</a>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td> <td>
[% IF first_row %]
[% row.oui.company | html_entity %] [% row.oui.company | html_entity %]
[% ELSE %]
&nbsp;
[% END %]
</td> </td>
[% END %] [% END %]
<td>MAC &rarr; IP</td> <td>MAC &rarr; IP</td>
<td><a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a> <td class="nd_center-cell"><a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a>
[% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT row.active %] [% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT row.active %]
[% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %] [% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
</td> </td>
@@ -46,31 +35,21 @@
<td>[% row.time_last_stamp | html_entity %]</td> <td>[% row.time_last_stamp | html_entity %]</td>
[% END %] [% END %]
</tr> </tr>
[% SET first_row = 0 %]
[% END %] [% END %]
[% WHILE (node = sightings.next) %] [% WHILE (node = sightings.next) %]
<tr> <tr>
<td> <td>
[% IF first_row %] <a href="[% search_node %]&q=[% node.net_mac.$mac_format_call | uri %]">
<a class="nd_linkcell"
href="[% search_node %]&q=[% node.net_mac.$mac_format_call | uri %]">
[% node.net_mac.$mac_format_call | html_entity %]</a> [% node.net_mac.$mac_format_call | html_entity %]</a>
[% ELSE %]
&nbsp;
[% END %]
</td> </td>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td> <td>
[% IF first_row %]
[% node.oui.company | html_entity %] [% node.oui.company | html_entity %]
[% ELSE %]
&nbsp;
[% END %]
</td> </td>
[% END %] [% END %]
<td>Switch Port</td> <td>Switch Port</td>
<td><a class="nd_linkcell" <td class="nd_center-cell">
href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on"> <a href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">
[% node.switch | html_entity %] - [% node.port | html_entity %]</a> [% node.switch | html_entity %] - [% node.port | html_entity %]</a>
[% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT node.active %] [% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT node.active %]
[% IF node.device.dns AND node.device_port AND node.device_port.name %] [% IF node.device.dns AND node.device_port AND node.device_port.name %]
@@ -82,30 +61,20 @@
<td>[% node.time_last_stamp | html_entity %]</td> <td>[% node.time_last_stamp | html_entity %]</td>
[% END %] [% END %]
</tr> </tr>
[% SET first_row = 0 %]
[% END %] [% END %]
[% WHILE (port = ports.next) %] [% WHILE (port = ports.next) %]
<tr> <tr>
<td> <td>
[% IF first_row %] <a href="[% search_node %]&q=[% port.net_mac.$mac_format_call | uri %]">[% port.net_mac.$mac_format_call | html_entity %]</a>
<a class="nd_linkcell"
href="[% search_node %]&q=[% port.mac | uri %]">[% port.mac | html_entity %]</a>
[% ELSE %]
&nbsp;
[% END %]
</td> </td>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td> <td>
[% IF first_row %]
[% port.oui.company | html_entity %] [% port.oui.company | html_entity %]
[% ELSE %]
&nbsp;
[% END %]
</td> </td>
[% END %] [% END %]
<td>Switch Port</td> <td>Switch Port</td>
<td><a class="nd_linkcell" <td class="nd_center-cell">
href="[% device_ports %]&q=[% port.ip | uri %]&f=[% port.port | uri %]&c_mac=on&c_nodes=on&c_neighbors=on"> <a href="[% device_ports %]&q=[% port.ip | uri %]&f=[% port.port | uri %]&c_mac=on&c_nodes=on&c_neighbors=on">
[% port.ip | html_entity %] - [% port.descr | html_entity %]</a> [% port.ip | html_entity %] - [% port.descr | html_entity %]</a>
[% IF port.device.dns AND port.name %] [% IF port.device.dns AND port.name %]
([% port.device.dns | html_entity %] - [% port.name | html_entity %]) ([% port.device.dns | html_entity %] - [% port.name | html_entity %])
@@ -116,25 +85,19 @@
<td>[% port.creation | html_entity %]</td> <td>[% port.creation | html_entity %]</td>
[% END %] [% END %]
</tr> </tr>
[% SET first_row = 0 %]
[% END %] [% END %]
[% WHILE (nbt = netbios.next) %] [% WHILE (nbt = netbios.next) %]
<tr> <tr>
<td> <td>
[% IF first_row %] <a href="[% search_node %]&q=[% nbt.net_mac.$mac_format_call | uri %]">[% nbt.net_mac.$mac_format_call | html_entity %]</a>
<a class="nd_linkcell"
href="[% search_node %]&q=[% nbt.mac | uri %]">[% nbt.mac | html_entity %]</a>
[% ELSE %]
&nbsp;
[% END %]
</td> </td>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td> <td>
&nbsp; [% nbt.oui.company | html_entity %]
</td> </td>
[% END %] [% END %]
<td>NetBIOS</td> <td>NetBIOS</td>
<td class="nd_linkcell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a> <td class="nd_center-cell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
<br>[% nbt.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a> <br>[% nbt.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
</td> </td>
[% IF params.stamps %] [% IF params.stamps %]
@@ -142,21 +105,15 @@
<td>[% nbt.time_last_stamp | html_entity %]</td> <td>[% nbt.time_last_stamp | html_entity %]</td>
[% END %] [% END %]
</tr> </tr>
[% SET first_row = 0 %]
[% END %] [% END %]
[% WHILE (wlan = wireless.next) %] [% WHILE (wlan = wireless.next) %]
<tr> <tr>
<td> <td>
[% IF first_row %] <a href="[% search_node %]&q=[% wlan.net_mac.$mac_format_call | uri %]">[% wlan.net_mac.$mac_format_call | html_entity %]</a>
<a class="nd_linkcell"
href="[% search_node %]&q=[% wireless.mac | uri %]">[% wireless.mac | html_entity %]</a>
[% ELSE %]
&nbsp;
[% END %]
</td> </td>
[% IF params.show_vendor %] [% IF params.show_vendor %]
<td> <td>
&nbsp; [% wlan.oui.company | html_entity %]
</td> </td>
[% END %] [% END %]
<td>Wireless Info</td> <td>Wireless Info</td>
@@ -171,7 +128,58 @@
<td>[% wlan.get_column('time_last_stamp') | html_entity %]</td> <td>[% wlan.get_column('time_last_stamp') | html_entity %]</td>
[% END %] [% END %]
</tr> </tr>
[% SET first_row = 0 %]
[% END %] [% END %]
</tbody> </tbody>
</table> </table>
<style>
tr.group,
tr.group:hover {
background-color: #ddd !important;
}
</style>
<script>
$(document).ready(function() {
var table = $('#nsbm-data-table').DataTable({
"columnDefs": [
{ "visible": false, "targets": 0 }
],
"order": [[ 0, 'asc' ]],
"drawCallback": function ( settings ) {
var api = this.api();
var rows = api.rows( {page:'current'} ).nodes();
var last=null;
api.column(0, {page:'current'} ).data().each( function ( group, i ) {
if ( last !== group ) {
$(rows).eq( i ).before(
[% IF params.show_vendor && params.stamps %]
'<tr class="group"><td colspan="5">'+group+'</td></tr>'
[% ELSIF params.stamps %]
'<tr class="group"><td colspan="4">'+group+'</td></tr>'
[% ELSIF params.show_vendor %]
'<tr class="group"><td colspan="3">'+group+'</td></tr>'
[% ELSE %]
'<tr class="group"><td colspan="2">'+group+'</td></tr>'
[% END %]
);
last = group;
}
} );
}
} );
// Order by the grouping
$('#nsbm-data-table tbody').on( 'click', 'tr.group', function () {
var currentOrder = table.order()[0];
if ( currentOrder[0] === 0 && currentOrder[1] === 'asc' ) {
table.order( [ 0, 'desc' ] ).draw();
}
else {
table.order( [ 0, 'asc' ] ).draw();
}
} );
} );
</script>