Merge branch 'master' into og-autoload

Conflicts: Netdisco/share/config.yml
2014-07-01 21:50:01 +01:00
parent 13957e82dc 58e5d05ac0
commit 95b6cb61b3
60 changed files with 124 additions and 70 deletions
--- a/Netdisco/share/config.yml
+++ b/Netdisco/share/config.yml
@@ -79,6 +79,7 @@ extra_web_plugins: []
 jobqueue_refresh: 10
 safe_password_store: true
 reports: []
+table_pagesize: 10

 # -------------
 # NETDISCO CORE
--- a/Netdisco/share/views/ajax/admintask/orphaned_csv.tt
+++ b/Netdisco/share/views/ajax/admintask/orphaned_csv.tt
@@ -48,4 +48,4 @@

  [% END %]
 [% END %]
-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/admintask/pseudodevice.tt
+++ b/Netdisco/share/views/ajax/admintask/pseudodevice.tt
@@ -65,7 +65,7 @@ $(document).ready(function() {
  $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- 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": 25,
+        "pageLength": [% settings.table_pagesize %],
    } );
 } );
 </script>
--- a/Netdisco/share/views/ajax/admintask/topology.tt
+++ b/Netdisco/share/views/ajax/admintask/topology.tt
@@ -91,7 +91,7 @@ $(document).ready(function() {
  $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt
+++ b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt
@@ -29,7 +29,7 @@ $(document).ready(function() {
  $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/admintask/userlog.tt
+++ b/Netdisco/share/views/ajax/admintask/userlog.tt
@@ -19,7 +19,7 @@ $(document).ready(function() {
  $('#aul-data-table').dataTable( {
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/admintask/users.tt
+++ b/Netdisco/share/views/ajax/admintask/users.tt
@@ -80,7 +80,7 @@ $(document).ready(function() {
  $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/device/addresses.tt
+++ b/Netdisco/share/views/ajax/device/addresses.tt
@@ -15,7 +15,7 @@ $(document).ready(function() {
  var table = $('#da-data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/device/addresses_csv.tt
+++ b/Netdisco/share/views/ajax/device/addresses_csv.tt
@@ -8,4 +8,4 @@
  [% END %]
  [% CSV.dump(mylist) %]

-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -389,7 +389,7 @@ $(document).ready(function() {
        "order": [[ 1, 'asc' ]],
        "processing": true,
        "stateSave": true,
-        "pageLength": 25,
+        "pageLength": [% settings.table_pagesize %],
        "language": {
            "search": 'Filter records: '
        },
--- a/Netdisco/share/views/ajax/report/apchanneldist.tt
+++ b/Netdisco/share/views/ajax/report/apchanneldist.tt
@@ -12,7 +12,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/apradiochannelpower.tt
+++ b/Netdisco/share/views/ajax/report/apradiochannelpower.tt
@@ -40,7 +40,7 @@ $(document).ready(function() {
  var table = $('#data-table').DataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/deviceaddrnodns.tt
+++ b/Netdisco/share/views/ajax/report/deviceaddrnodns.tt
@@ -14,7 +14,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/devicebylocation.tt
+++ b/Netdisco/share/views/ajax/report/devicebylocation.tt
@@ -15,7 +15,7 @@ $(document).ready(function() {
    var table = $('#data-table').dataTable({
        "processing": true,
        "stateSave": true,
-        "pageLength": 25,
+        "pageLength": [% settings.table_pagesize %],
        "language": {
          "search": 'Filter records: '
        },
--- a/Netdisco/share/views/ajax/report/devicednsmismatch.tt
+++ b/Netdisco/share/views/ajax/report/devicednsmismatch.tt
@@ -15,7 +15,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/devicepoestatus.tt
+++ b/Netdisco/share/views/ajax/report/devicepoestatus.tt
@@ -66,7 +66,7 @@ $(document).ready(function() {
    var table = $('#data-table').DataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/devicepoestatus_csv.tt
+++ b/Netdisco/share/views/ajax/report/devicepoestatus_csv.tt
@@ -16,4 +16,4 @@
  [% END %]
  [% CSV.dump(mydlist) %]

-[%END%]
+[%END%]
--- a/Netdisco/share/views/ajax/report/duplexmismatch.tt
+++ b/Netdisco/share/views/ajax/report/duplexmismatch.tt
@@ -16,7 +16,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/duplexmismatch_csv.tt
+++ b/Netdisco/share/views/ajax/report/duplexmismatch_csv.tt
@@ -10,4 +10,4 @@
  [% END %]
  [% CSV.dump(mylist) %]

-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/report/generic_report.tt
+++ b/Netdisco/share/views/ajax/report/generic_report.tt
@@ -22,7 +22,7 @@ $(document).ready(function() {
  $('#rg-data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    }
--- a/Netdisco/share/views/ajax/report/halfduplex.tt
+++ b/Netdisco/share/views/ajax/report/halfduplex.tt
@@ -14,7 +14,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/halfduplex_csv.tt
+++ b/Netdisco/share/views/ajax/report/halfduplex_csv.tt
@@ -9,4 +9,4 @@
  [% END %]
  [% CSV.dump(mylist) %]

-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/report/ipinventory.tt
+++ b/Netdisco/share/views/ajax/report/ipinventory.tt
@@ -14,7 +14,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/moduleinventory.tt
+++ b/Netdisco/share/views/ajax/report/moduleinventory.tt
@@ -32,7 +32,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/moduleinventory_csv.tt
+++ b/Netdisco/share/views/ajax/report/moduleinventory_csv.tt
@@ -22,4 +22,4 @@
    [% CSV.dump(mylist) %]

  [% END %]
-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/report/netbios.tt
+++ b/Netdisco/share/views/ajax/report/netbios.tt
@@ -28,7 +28,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/netbios_csv.tt
+++ b/Netdisco/share/views/ajax/report/netbios_csv.tt
@@ -24,4 +24,4 @@
    [% CSV.dump(mylist) %]

  [% END %]
-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/report/nodemultiips.tt
+++ b/Netdisco/share/views/ajax/report/nodemultiips.tt
@@ -15,7 +15,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/nodevendor.tt
+++ b/Netdisco/share/views/ajax/report/nodevendor.tt
@@ -28,7 +28,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/nodevendor_csv.tt
+++ b/Netdisco/share/views/ajax/report/nodevendor_csv.tt
@@ -23,4 +23,4 @@
    [% CSV.dump(mylist) %]

  [% END %]
-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/report/phonesdiscovered.tt
+++ b/Netdisco/share/views/ajax/report/phonesdiscovered.tt
@@ -16,7 +16,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/phonesdiscovered_csv.tt
+++ b/Netdisco/share/views/ajax/report/phonesdiscovered_csv.tt
@@ -9,4 +9,4 @@
  [% END %]
  [% CSV.dump(mylist) %]

-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/report/portadmindown.tt
+++ b/Netdisco/share/views/ajax/report/portadmindown.tt
@@ -14,7 +14,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/portblocking.tt
+++ b/Netdisco/share/views/ajax/report/portblocking.tt
@@ -14,7 +14,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/portlog.tt
+++ b/Netdisco/share/views/ajax/report/portlog.tt
@@ -32,7 +32,7 @@ $(document).ready(function() {
  $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    }
--- a/Netdisco/share/views/ajax/report/portmultinodes.tt
+++ b/Netdisco/share/views/ajax/report/portmultinodes.tt
@@ -14,7 +14,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/portssid.tt
+++ b/Netdisco/share/views/ajax/report/portssid.tt
@@ -28,7 +28,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/portssid_csv.tt
+++ b/Netdisco/share/views/ajax/report/portssid_csv.tt
@@ -23,4 +23,4 @@
    [% CSV.dump(mylist) %]

  [% END %]
-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/report/portutilization.tt
+++ b/Netdisco/share/views/ajax/report/portutilization.tt
@@ -15,7 +15,7 @@ $(document).ready(function() {
    var table = $('#data-table').dataTable({
        "processing": true,
        "stateSave": true,
-        "pageLength": 25,
+        "pageLength": [% settings.table_pagesize %],
        "language": {
            "search": 'Filter records: '
        },
--- a/Netdisco/share/views/ajax/report/portutilization_csv.tt
+++ b/Netdisco/share/views/ajax/report/portutilization_csv.tt
@@ -9,4 +9,4 @@
  [% END %]
  [% CSV.dump(mylist) %]

-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/report/subnets.tt
+++ b/Netdisco/share/views/ajax/report/subnets.tt
@@ -11,7 +11,7 @@
  </tbody>
    [% FOREACH row IN results %]
    <tr>
-      <td class="nd_center-cell"><a href="[% uri_for('/report/ipinventory') %]?subnet=[% row.subnet | uri %]&daterange=[% daterange | uri %]&limit=[% row.subnet_size | uri %]">
+      <td class="nd_center-cell"><a href="[% uri_for('/report/ipinventory') %]?subnet=[% row.subnet | uri %]&daterange=[% params.daterange | uri %]&age_invert=[% params.age_invert | uri %]&limit=[% row.subnet_size | uri %]">
               [% row.subnet | html_entity %]</a></td>
      <td class="nd_center-cell">[% row.subnet_size | format_number %]</td>
      <td class="nd_center-cell">[% row.active | format_number %]</td>
@@ -26,7 +26,7 @@ $(document).ready(function() {
  $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/report/vlaninventory.tt
+++ b/Netdisco/share/views/ajax/report/vlaninventory.tt
@@ -14,7 +14,7 @@ $(document).ready(function() {
  var table = $('#data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/search/device.tt
+++ b/Netdisco/share/views/ajax/search/device.tt
@@ -19,7 +19,7 @@ $(document).ready(function() {
  var table = $('#ds-data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/search/device_csv.tt
+++ b/Netdisco/share/views/ajax/search/device_csv.tt
@@ -9,4 +9,4 @@
  [% END %]
  [% CSV.dump(mylist) %]

-[% END %]
+[% END %]
--- a/Netdisco/share/views/ajax/search/node_by_ip.tt
+++ b/Netdisco/share/views/ajax/search/node_by_ip.tt
@@ -177,7 +177,7 @@ $(document).ready(function() {
    var table = $('#nsbi-data-table').DataTable({
        "processing": true,
        "stateSave": true,
-        "pageLength": 25,
+        "pageLength": [% settings.table_pagesize %],
        "language": {
            "search": 'Filter records: '
        },
--- a/Netdisco/share/views/ajax/search/node_by_mac.tt
+++ b/Netdisco/share/views/ajax/search/node_by_mac.tt
@@ -137,7 +137,7 @@ $(document).ready(function() {
    var table = $('#nsbm-data-table').DataTable({
        "processing": true,
        "stateSave": true,
-        "pageLength": 25,
+        "pageLength": [% settings.table_pagesize %],
        "language": {
            "search": 'Filter records: '
        },
--- a/Netdisco/share/views/ajax/search/port.tt
+++ b/Netdisco/share/views/ajax/search/port.tt
@@ -14,7 +14,7 @@ $(document).ready(function() {
  var table = $('#ps-data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/ajax/search/vlan.tt
+++ b/Netdisco/share/views/ajax/search/vlan.tt
@@ -16,7 +16,7 @@ $(document).ready(function() {
  var table = $('#vs-data-table').dataTable({
    "processing": true,
    "stateSave": true,
-    "pageLength": 25,
+    "pageLength": [% settings.table_pagesize %],
    "language": {
      "search": 'Filter records: '
    },
--- a/Netdisco/share/views/sidebar/report/subnets.tt
+++ b/Netdisco/share/views/sidebar/report/subnets.tt
@@ -10,6 +10,7 @@
              <legend class="nd_sidebar-legend">
                <label><em><strong>Date Range</strong></em></label>
              </legend>
+              <!--
              <div class="clearfix input-prepend">
                <label class="add-on">
                  <input type="checkbox" id="age_invert"
@@ -19,6 +20,7 @@
                  <span class="nd_searchcheckbox uneditable-input">Not within...</span>
                </label>
              </div>
+              -->
              <div class="clearfix">
                <input class="nd_side-input" id="daterange" required="required"
                  type="text" name="daterange" value="[%