Merge branch 'master' into em-device-ports-json

Conflicts: Netdisco/share/public/css/netdisco.css Netdisco/share/views/ajax/device/ports.tt
2014-09-16 19:29:41 +01:00
parent a2d805d6f4 c70dcf60d5
commit 97d1232860
66 changed files with 936 additions and 320 deletions
--- a/Netdisco/share/config.yml
+++ b/Netdisco/share/config.yml
@@ -54,7 +54,7 @@ web_plugins:
  - Report::Netbios
  - Report::NodeMultiIPs
  - Report::NodeVendor
-  - Report::PhonesDiscovered
+  - Report::NodesDiscovered
  - Report::SsidInventory
  - Report::VlanInventory
  - Report::SubnetUtilization
@@ -82,6 +82,9 @@ jobqueue_refresh: 10
 safe_password_store: true
 reports: []
 table_pagesize: 10
+table_showrecordsmenu:
+  - [10, 25, 50, 100, '-1']
+  - [10, 25, 50, 100, 'All']

 # -------------
 # NETDISCO CORE
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -657,6 +657,7 @@ form .clearfix.success input {
 }

 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* dataTables */

 /* Clear div for DataTables ColVis plugin */
 div.nd_clear-both {
--- a/Netdisco/share/views/ajax/admintask/nodemonitor.tt
+++ b/Netdisco/share/views/ajax/admintask/nodemonitor.tt
@@ -71,11 +71,6 @@
 <script>
 $(document).ready(function() {
  $('#data-table').dataTable({
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "columnDefs": [ 
      {
        "targets": [ 0, 2, 5 ],
@@ -85,7 +80,8 @@ $(document).ready(function() {
        "targets": [ 0, 2, 5 ],
        "orderable": false
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/admintask/pseudodevice.tt
+++ b/Netdisco/share/views/ajax/admintask/pseudodevice.tt
@@ -63,17 +63,12 @@
 <script>
 $(document).ready(function() {
  $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "columnDefs": [ {
        "targets": [ 2, 3 ],
        "orderable": false,
        "searchable": false
-      } ]
+      } ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/admintask/slowdevices.tt
+++ b/Netdisco/share/views/ajax/admintask/slowdevices.tt
@@ -33,7 +33,7 @@ $(document).ready(function() {
        "searching": false,
        "info":     false,
        "order": [[ 4, 'desc' ], [ 0, 'asc' ], [ 1, 'asc' ] ],
-        "pageLength": [% settings.table_pagesize %],
-    } );
+        "pageLength": 12
+    });
 } );
 </script>
--- a/Netdisco/share/views/ajax/admintask/topology.tt
+++ b/Netdisco/share/views/ajax/admintask/topology.tt
@@ -89,17 +89,12 @@
 <script>
 $(document).ready(function() {
  $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "columnDefs": [ {
        "targets": [ 4 ],
        "orderable": false,
        "searchable": false
-      } ]
+      } ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt
+++ b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt
@@ -27,13 +27,8 @@
 <script>
 $(document).ready(function() {
  $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "order": [[ 2, 'desc' ], [ 1, 'asc' ] ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/admintask/userlog.tt
+++ b/Netdisco/share/views/ajax/admintask/userlog.tt
@@ -17,12 +17,6 @@
 <script>
 $(document).ready(function() {
  $('#aul-data-table').dataTable( {
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "serverSide": true,
    "order": [[ 0, "desc" ]],
    "ajax": "[% uri_for('/ajax/control/admin/userlog/data') %]",
@@ -60,7 +54,8 @@ $(document).ready(function() {
        '"><button class="btn nd_adminbutton" name="del" type="submit"><i class="icon-trash text-error"></i></button>';
      }
    }
-  ]
+  ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/admintask/users.tt
+++ b/Netdisco/share/views/ajax/admintask/users.tt
@@ -78,12 +78,6 @@
 <script>
 $(document).ready(function() {
  $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "columnDefs": [ 
      {
        "targets": [ 2, 3, 4, 5, 6 ],
@@ -93,7 +87,8 @@ $(document).ready(function() {
        "targets": [ 0, 1, 2, 3, 4, 5, 6 ],
        "orderable": false
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/datatabledefaults.tt
+++ b/Netdisco/share/views/ajax/datatabledefaults.tt
@@ -0,0 +1,11 @@
+
+    "processing": true,
+    "stateSave": true,
+    "pageLength": [% settings.table_pagesize %],
+    "lengthMenu": [% table_showrecordsmenu %],
+    "dom": '<"top"l<"nd_datatables-pager"p>f>rt<"bottom"><"clear">',
+    "language": {
+      "search": '_INPUT_',
+      "searchPlaceholder": 'Filter records...',
+      "lengthMenu": "Show _MENU_ records."
+    }
--- a/Netdisco/share/views/ajax/device/addresses.tt
+++ b/Netdisco/share/views/ajax/device/addresses.tt
@@ -13,12 +13,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#da-data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [
@@ -51,7 +45,8 @@ $(document).ready(function() {
          return '<a href="[% search_device %]&q=' + encodeURIComponent(data) + '&ip=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>';
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -31,16 +31,6 @@
 $(document).ready(function() {
  var freeDate = moment().subtract( [% params.age_num %], '[% params.age_unit %]' );
  var table = $('#dp-data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "lengthMenu": [ [10, 25, 50, 100, -1], [10, 25, 50, 100, "All"] ],
-    "dom": '<"top"l<"nd_datatables-pager"p>f>rt<"bottom"><"clear">',
-    "language": {
-      "search": '_INPUT_',
-      "searchPlaceholder": 'Filter records...',
-      "lengthMenu": "Show _MENU_ records."
-    },
    "deferRender": true,
    "order": [[ 1, "asc" ]],
    "colVis": {
@@ -601,7 +591,8 @@ $(document).ready(function() {
          [% END %]
      [% END %]
    ],
-    "data": [% results %]
+    "data": [% results %],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });

  // display the column show/hide buttons in the sidebar
--- a/Netdisco/share/views/ajax/report/apchanneldist.tt
+++ b/Netdisco/share/views/ajax/report/apchanneldist.tt
@@ -10,12 +10,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "order": [[ 1, "desc" ]],
    "data": [% results %],
@@ -29,7 +23,8 @@ $(document).ready(function() {
          return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/apradiochannelpower.tt
+++ b/Netdisco/share/views/ajax/report/apradiochannelpower.tt
@@ -38,12 +38,6 @@ function groupString(d) {

 $(document).ready(function() {
  var table = $('#data-table').DataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "serverSide": true,
    "ajax": "[% uri_for('/ajax/content/report/apradiochannelpower/data') %]",
    "order": [[ 0, 'asc' ]],
@@ -103,7 +97,8 @@ $(document).ready(function() {
          last = group;
        }
      } );
-    }
+    },
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 
  // Order by the grouping
--- a/Netdisco/share/views/ajax/report/deviceaddrnodns.tt
+++ b/Netdisco/share/views/ajax/report/deviceaddrnodns.tt
@@ -12,12 +12,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [{
@@ -41,6 +35,7 @@ $(document).ready(function() {
          return he.encode(data || '');
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });</script>
--- a/Netdisco/share/views/ajax/report/devicebylocation.tt
+++ b/Netdisco/share/views/ajax/report/devicebylocation.tt
@@ -13,12 +13,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
    var table = $('#data-table').dataTable({
-        "processing": true,
-        "stateSave": true,
-        "pageLength": [% settings.table_pagesize %],
-        "language": {
-          "search": 'Filter records: '
-        },
        "deferRender": true,
        "order": [[ 0, "asc" ], [2, "asc"], [ 3, "asc" ], [4, "asc"]],
        "data": [% results %],
@@ -54,7 +48,8 @@ $(document).ready(function() {
                    return '<a href="[% search_device %]&q=' + encodeURIComponent(data) + '&model=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>';
                }
            }
-        ]
+        ].
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
    });

 });
--- a/Netdisco/share/views/ajax/report/devicednsmismatch.tt
+++ b/Netdisco/share/views/ajax/report/devicednsmismatch.tt
@@ -13,12 +13,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [
@@ -48,7 +42,8 @@ $(document).ready(function() {
          return he.encode(data || '');
        }
      }
-    ]
+    ].
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/devicepoestatus.tt
+++ b/Netdisco/share/views/ajax/report/devicepoestatus.tt
@@ -64,12 +64,6 @@ function groupString(d) {

 $(document).ready(function() {
    var table = $('#data-table').DataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "serverSide": true,
    "ajax": "[% uri_for('/ajax/content/report/devicepoestatus/data') %]",
    "order": [[ 0, 'asc' ]],
@@ -168,7 +162,8 @@ $(document).ready(function() {
          last = group;
        }
      } );
-    }
+    },
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 
    // Order by the grouping
--- a/Netdisco/share/views/ajax/report/duplexmismatch.tt
+++ b/Netdisco/share/views/ajax/report/duplexmismatch.tt
@@ -14,12 +14,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [
@@ -60,7 +54,8 @@ $(document).ready(function() {
          return he.encode(capitalizeFirstLetter(data || ''));
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/generic_report.tt
+++ b/Netdisco/share/views/ajax/report/generic_report.tt
@@ -20,12 +20,7 @@
 <script>
 $(document).ready(function() {
  $('#rg-data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    }
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/report/halfduplex.tt
+++ b/Netdisco/share/views/ajax/report/halfduplex.tt
@@ -12,12 +12,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [
@@ -47,7 +41,8 @@ $(document).ready(function() {
          return he.encode(capitalizeFirstLetter(data));
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/ipinventory.tt
+++ b/Netdisco/share/views/ajax/report/ipinventory.tt
@@ -12,12 +12,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [
@@ -53,7 +47,8 @@ $(document).ready(function() {
          return he.encode(data || 'Never');
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/moduleinventory.tt
+++ b/Netdisco/share/views/ajax/report/moduleinventory.tt
@@ -30,12 +30,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    [% IF opt %] 
    "serverSide": true,
    "searching": false,
@@ -93,7 +87,7 @@ $(document).ready(function() {
          return he.encode(data || '');
        }
      }
-    ]
+    ],
    [% ELSE %]
    "deferRender": true,
    "data": [% results %],
@@ -109,8 +103,9 @@ $(document).ready(function() {
          return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
        }
      }
-    ]
+    ],
      [% END %]
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/netbios.tt
+++ b/Netdisco/share/views/ajax/report/netbios.tt
@@ -26,12 +26,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    [% IF opt %]
    "serverSide": true,
    "order": [[ 0, "desc" ]],
@@ -73,7 +67,7 @@ $(document).ready(function() {
        }
      }
    ],
-    "order": [[0, "asc"], [5, "desc"]]
+    "order": [[0, "asc"], [5, "desc"]],
    [% ELSE %]
    "deferRender": true,
    "data": [% results %],
@@ -90,8 +84,9 @@ $(document).ready(function() {
        }
      }
    ],
-    "order": [[1, "desc"]]
+    "order": [[1, "desc"]],
    [% END %]
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/nodemultiips.tt
+++ b/Netdisco/share/views/ajax/report/nodemultiips.tt
@@ -13,12 +13,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "order": [[ 3, "desc" ]],
    "data": [% results %],
@@ -45,7 +39,8 @@ $(document).ready(function() {
          return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/phonesdiscovered.tt
+++ b/Netdisco/share/views/ajax/report/phonesdiscovered.tt
@@ -14,12 +14,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [
@@ -33,7 +27,7 @@ $(document).ready(function() {
        "type": 'portsort',
        "render": function(data, type, row, meta) {
          return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>' :
+            '<a href="[% device_ports %]&c_nodes=on&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>' :
            data;
        }
      }, {
@@ -44,7 +38,7 @@ $(document).ready(function() {
      }, {
        "data": 'remote_ip',
        "render": function(data, type, row, meta) {
-          return '<a href="[% search_node %]&q=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>';
+          return '<a href="[% search_node %]&q=' + encodeURIComponent(data || '') + '">' + he.encode(data || '') + '</a>';
        }
      }, {
        "data": 'remote_port',
@@ -57,7 +51,8 @@ $(document).ready(function() {
          return he.encode(data || '');
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/phonesdiscovered_csv.tt
+++ b/Netdisco/share/views/ajax/report/phonesdiscovered_csv.tt
--- a/Netdisco/share/views/ajax/report/nodevendor.tt
+++ b/Netdisco/share/views/ajax/report/nodevendor.tt
@@ -26,12 +26,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    [% IF opt %]
    "serverSide": true,
    "order": [[ 0, "desc" ]],
@@ -69,7 +63,7 @@ $(document).ready(function() {
        "data": 'switch',
        "visible": false
      }
-    ]
+    ],
    [% ELSE %]
    "deferRender": true,
    "data": [% results %],
@@ -86,8 +80,9 @@ $(document).ready(function() {
        }
      }
    ],
-    "order": [[1, "desc"]]
+    "order": [[1, "desc"]],
    [% END %]
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/portadmindown.tt
+++ b/Netdisco/share/views/ajax/report/portadmindown.tt
@@ -12,12 +12,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "order": [[ 0, "asc" ], [1, "asc"]],
    "columns": [
@@ -48,7 +42,8 @@ $(document).ready(function() {
        }
      }
    ],
-    "data": [% results %]
+    "data": [% results %],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/portblocking.tt
+++ b/Netdisco/share/views/ajax/report/portblocking.tt
@@ -12,12 +12,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "order": [[ 0, "asc" ], [1, "asc"]],
    "data": [% results %],
@@ -48,7 +42,8 @@ $(document).ready(function() {
          return he.encode(data || '');
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/portlog.tt
+++ b/Netdisco/share/views/ajax/report/portlog.tt
@@ -30,12 +30,7 @@
 <script>
 $(document).ready(function() {
  $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    }
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/report/portmultinodes.tt
+++ b/Netdisco/share/views/ajax/report/portmultinodes.tt
@@ -12,12 +12,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "order": [[ 3, "desc" ]],
    "data": [% results %],
@@ -47,7 +41,8 @@ $(document).ready(function() {
          return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/portssid.tt
+++ b/Netdisco/share/views/ajax/report/portssid.tt
@@ -26,12 +26,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    [% IF opt %]
@@ -64,7 +58,7 @@ $(document).ready(function() {
          return he.encode(data || '');
        }
      }
-    ]
+    ],
    [% ELSE %]
    "columns": [
      {
@@ -87,6 +81,7 @@ $(document).ready(function() {
    ],
    "order": [[ 2, "desc" ]],
  [% END %]  
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/report/portutilization.tt
+++ b/Netdisco/share/views/ajax/report/portutilization.tt
@@ -13,12 +13,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
    var table = $('#data-table').dataTable({
-        "processing": true,
-        "stateSave": true,
-        "pageLength": [% settings.table_pagesize %],
-        "language": {
-            "search": 'Filter records: '
-        },
        "deferRender": true,
        "data": [% results %],
        "columns": [
@@ -52,7 +46,8 @@ $(document).ready(function() {
                    return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
                }
            }
-        ]
+        ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
    });

 });
--- a/Netdisco/share/views/ajax/report/subnets.tt
+++ b/Netdisco/share/views/ajax/report/subnets.tt
@@ -24,13 +24,8 @@
 <script>
 $(document).ready(function() {
  $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "order": [[ 3, 'desc' ]],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/report/vlaninventory.tt
+++ b/Netdisco/share/views/ajax/report/vlaninventory.tt
@@ -12,12 +12,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [
@@ -44,7 +38,8 @@ $(document).ready(function() {
          return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });
 </script>
--- a/Netdisco/share/views/ajax/search/device.tt
+++ b/Netdisco/share/views/ajax/search/device.tt
@@ -17,12 +17,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#ds-data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [{
@@ -71,6 +65,7 @@ $(document).ready(function() {
          return he.encode(data || '');
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });</script>
--- a/Netdisco/share/views/ajax/search/node_by_ip.tt
+++ b/Netdisco/share/views/ajax/search/node_by_ip.tt
@@ -175,12 +175,6 @@ tr.group:hover {
 <script>
 $(document).ready(function() {
    var table = $('#nsbi-data-table').DataTable({
-        "processing": true,
-        "stateSave": true,
-        "pageLength": [% settings.table_pagesize %],
-        "language": {
-            "search": 'Filter records: '
-        },
        "columnDefs": [
            { "visible": false, "targets": 0 }
        ],
@@ -203,7 +197,8 @@ $(document).ready(function() {
                    last = group;
                }
            } );
-        }
+        },
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
    } );
 
    // Order by the grouping
--- a/Netdisco/share/views/ajax/search/node_by_mac.tt
+++ b/Netdisco/share/views/ajax/search/node_by_mac.tt
@@ -135,12 +135,6 @@ tr.group:hover {
 <script>
 $(document).ready(function() {
    var table = $('#nsbm-data-table').DataTable({
-        "processing": true,
-        "stateSave": true,
-        "pageLength": [% settings.table_pagesize %],
-        "language": {
-            "search": 'Filter records: '
-        },
        "columnDefs": [
            { "visible": false, "targets": 0 }
        ],
@@ -163,7 +157,8 @@ $(document).ready(function() {
                    last = group;
                }
            } );
-        }
+        },
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
    } );
 
    // Order by the grouping
--- a/Netdisco/share/views/ajax/search/port.tt
+++ b/Netdisco/share/views/ajax/search/port.tt
@@ -12,12 +12,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#ps-data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [{
@@ -32,7 +26,9 @@ $(document).ready(function() {
          if (row.device.dns || row.device.name) {
            ddns = ' (' + he.encode(row.device.dns || row.device.name)  + ')';
          }
-          return '<a href="[% device_ports %]&q=' + encodeURIComponent(data) + '&f=' + encodeURIComponent(row.port) + '">' + he.encode(data) + '[' + he.encode(row.port) + ']</a>' + ddns;
+          return '<a href="[% device_ports %]&q=' + encodeURIComponent(data)
+            + '&f=' + encodeURIComponent(row.port) + '">' + he.encode(data)
+            + ' [' + he.encode(row.port) + ']</a>' + ddns;
        }
      }, {
        "data": 'descr',
@@ -45,7 +41,8 @@ $(document).ready(function() {
          return data || '';
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });</script>

--- a/Netdisco/share/views/ajax/search/vlan.tt
+++ b/Netdisco/share/views/ajax/search/vlan.tt
@@ -14,12 +14,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
  var table = $('#vs-data-table').dataTable({
-    "processing": true,
-    "stateSave": true,
-    "pageLength": [% settings.table_pagesize %],
-    "language": {
-      "search": 'Filter records: '
-    },
    "deferRender": true,
    "data": [% results %],
    "columns": [{
@@ -53,6 +47,7 @@ $(document).ready(function() {
          return '<a class="nd_linkcell nd_stealth-link" href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(data || '') + '</a>';
        }
      }
-    ]
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
  });
 });</script>
--- a/Netdisco/share/views/sidebar/report/nodesdiscovered.tt
+++ b/Netdisco/share/views/sidebar/report/nodesdiscovered.tt
@@ -0,0 +1,52 @@
+
+            <p class="nd_sidebar-title"><em>Node Search Options</em></p>
+            <input name="q" value="[% params.q | html_entity %]" type="hidden"/>
+            <div class="clearfix">
+              <input class="nd_side-input" placeholder="Remote ID (host name)"
+                type="text" name="remote_id" value="[% params.name | html_entity %]"
+                rel="tooltip" data-placement="left" data-offset="5" data-title="Remote ID"/>
+            </div>
+            <div class="clearfix">
+              <input class="nd_side-input" placeholder="Remote Type (platform)"
+                type="text" name="remote_type" value="[% params.name | html_entity %]"
+                rel="tooltip" data-placement="left" data-offset="5" data-title="Remote Type"/>
+            </div>
+            <div class="clearfix">
+              <select class="nd_side-select nd_colored-input" size="[% type_list.size > 8 ? 8 : type_list.size %]"
+                multiple="on" name="remote_type"
+                rel="tooltip" data-placement="left" data-offset="5" data-title="Remote Type"/>
+                [% FOREACH opt IN type_list %]
+                    <option[% ' selected="selected"' IF type_lkp.exists(opt) %]>[% opt | html_entity %]</option>
+                [% END %]
+              </select>
+            </div>
+            <div class="clearfix input-prepend">
+              <label class="add-on">
+                <input type="checkbox" id="phones"
+                  name="phones"[% ' checked="checked"' IF params.phones %]/>
+              </label>
+              <label class="nd_checkboxlabel" for="phones">
+                <span class="nd_searchcheckbox uneditable-input"><i class="icon-li icon-phone"></i>&nbsp; IP Phones</span>
+              </label>
+            </div>
+            <div class="clearfix input-prepend">
+              <label class="add-on">
+                <input type="checkbox" id="aps"
+                  name="aps"[% ' checked="checked"' IF params.aps %]/>
+              </label>
+              <label class="nd_checkboxlabel" for="aps">
+                <span class="nd_searchcheckbox uneditable-input"><i class="icon-li icon-signal"></i>&nbsp Wireless APs</span>
+              </label>
+            </div>
+            <div class="clearfix"><p></p></div>
+            <div class="clearfix input-prepend">
+              <label class="add-on">
+                <input type="checkbox" id="matchall"
+                  name="matchall"[% ' checked="checked"' IF params.matchall %]/>
+              </label>
+              <label class="nd_checkboxlabel" for="matchall">
+                <span class="nd_searchcheckbox uneditable-input">Match All Options</span>
+              </label>
+            </div>
+            <button id="[% tab.tag %]_submit" type="submit" class="btn btn-info">
+              <i class="icon-search icon-large pull-left nd_navbar-icon"></i> Search Nodes</button>