diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css index 8c6edcc1..d6010d59 100644 --- a/Netdisco/share/public/css/netdisco.css +++ b/Netdisco/share/public/css/netdisco.css @@ -653,3 +653,10 @@ form .clearfix.success input { } /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +/* dataTables */ + +div.nd_datatables-pager { + float: left; + margin-left: 50px; +} + diff --git a/Netdisco/share/views/ajax/admintask/nodemonitor.tt b/Netdisco/share/views/ajax/admintask/nodemonitor.tt index c80419f5..dcd47e3e 100644 --- a/Netdisco/share/views/ajax/admintask/nodemonitor.tt +++ b/Netdisco/share/views/ajax/admintask/nodemonitor.tt @@ -71,11 +71,6 @@ diff --git a/Netdisco/share/views/ajax/admintask/pseudodevice.tt b/Netdisco/share/views/ajax/admintask/pseudodevice.tt index 2184f163..51e6ee56 100644 --- a/Netdisco/share/views/ajax/admintask/pseudodevice.tt +++ b/Netdisco/share/views/ajax/admintask/pseudodevice.tt @@ -63,17 +63,12 @@ diff --git a/Netdisco/share/views/ajax/admintask/slowdevices.tt b/Netdisco/share/views/ajax/admintask/slowdevices.tt index 256cb412..f2c5ebe8 100644 --- 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 + }); } ); diff --git a/Netdisco/share/views/ajax/admintask/topology.tt b/Netdisco/share/views/ajax/admintask/topology.tt index 50f57731..0dcec0aa 100644 --- a/Netdisco/share/views/ajax/admintask/topology.tt +++ b/Netdisco/share/views/ajax/admintask/topology.tt @@ -89,17 +89,12 @@ diff --git a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt index f1071460..204b04f8 100644 --- a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt +++ b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt @@ -27,13 +27,8 @@ diff --git a/Netdisco/share/views/ajax/admintask/userlog.tt b/Netdisco/share/views/ajax/admintask/userlog.tt index d4f04c65..65bc50e4 100644 --- a/Netdisco/share/views/ajax/admintask/userlog.tt +++ b/Netdisco/share/views/ajax/admintask/userlog.tt @@ -17,12 +17,6 @@ diff --git a/Netdisco/share/views/ajax/admintask/users.tt b/Netdisco/share/views/ajax/admintask/users.tt index 89db1e5c..a17bd45a 100644 --- a/Netdisco/share/views/ajax/admintask/users.tt +++ b/Netdisco/share/views/ajax/admintask/users.tt @@ -78,12 +78,6 @@ diff --git a/Netdisco/share/views/ajax/datatabledefaults.tt b/Netdisco/share/views/ajax/datatabledefaults.tt new file mode 100644 index 00000000..1c463211 --- /dev/null +++ b/Netdisco/share/views/ajax/datatabledefaults.tt @@ -0,0 +1,11 @@ + + "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." + } diff --git a/Netdisco/share/views/ajax/device/addresses.tt b/Netdisco/share/views/ajax/device/addresses.tt index d392ae17..448bc385 100644 --- a/Netdisco/share/views/ajax/device/addresses.tt +++ b/Netdisco/share/views/ajax/device/addresses.tt @@ -13,12 +13,6 @@ diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt index f696052f..4e23349c 100644 --- a/Netdisco/share/views/ajax/device/ports.tt +++ b/Netdisco/share/views/ajax/device/ports.tt @@ -399,12 +399,7 @@ $(document).ready(function() { { "type": 'portsort', "targets": [ 'portsort' ] } ], "order": [[ 1, 'asc' ]], - "processing": true, - "stateSave": true, - "pageLength": [% settings.table_pagesize %], - "language": { - "search": 'Filter records: ' - }, +[% INCLUDE 'ajax/datatabledefaults.tt' -%] } ); } ); diff --git a/Netdisco/share/views/ajax/report/apchanneldist.tt b/Netdisco/share/views/ajax/report/apchanneldist.tt index 4abc7f3c..22f16d74 100644 --- a/Netdisco/share/views/ajax/report/apchanneldist.tt +++ b/Netdisco/share/views/ajax/report/apchanneldist.tt @@ -10,12 +10,6 @@ diff --git a/Netdisco/share/views/ajax/report/apradiochannelpower.tt b/Netdisco/share/views/ajax/report/apradiochannelpower.tt index aab21a89..3a283562 100644 --- 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 diff --git a/Netdisco/share/views/ajax/report/deviceaddrnodns.tt b/Netdisco/share/views/ajax/report/deviceaddrnodns.tt index 94b17416..08b7c4da 100644 --- a/Netdisco/share/views/ajax/report/deviceaddrnodns.tt +++ b/Netdisco/share/views/ajax/report/deviceaddrnodns.tt @@ -12,12 +12,6 @@ diff --git a/Netdisco/share/views/ajax/report/devicebylocation.tt b/Netdisco/share/views/ajax/report/devicebylocation.tt index 07a3c6a6..6c563d5f 100644 --- a/Netdisco/share/views/ajax/report/devicebylocation.tt +++ b/Netdisco/share/views/ajax/report/devicebylocation.tt @@ -13,12 +13,6 @@ diff --git a/Netdisco/share/views/ajax/report/devicepoestatus.tt b/Netdisco/share/views/ajax/report/devicepoestatus.tt index bdcaecdf..76e0ec33 100644 --- 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 diff --git a/Netdisco/share/views/ajax/report/duplexmismatch.tt b/Netdisco/share/views/ajax/report/duplexmismatch.tt index 2cda1424..17548fc3 100644 --- a/Netdisco/share/views/ajax/report/duplexmismatch.tt +++ b/Netdisco/share/views/ajax/report/duplexmismatch.tt @@ -14,12 +14,6 @@ diff --git a/Netdisco/share/views/ajax/report/generic_report.tt b/Netdisco/share/views/ajax/report/generic_report.tt index 7d3aac74..d2a27386 100644 --- a/Netdisco/share/views/ajax/report/generic_report.tt +++ b/Netdisco/share/views/ajax/report/generic_report.tt @@ -20,12 +20,7 @@ diff --git a/Netdisco/share/views/ajax/report/halfduplex.tt b/Netdisco/share/views/ajax/report/halfduplex.tt index c0601263..4427ce99 100644 --- a/Netdisco/share/views/ajax/report/halfduplex.tt +++ b/Netdisco/share/views/ajax/report/halfduplex.tt @@ -12,12 +12,6 @@ diff --git a/Netdisco/share/views/ajax/report/ipinventory.tt b/Netdisco/share/views/ajax/report/ipinventory.tt index 5eeadd61..53f859f7 100644 --- a/Netdisco/share/views/ajax/report/ipinventory.tt +++ b/Netdisco/share/views/ajax/report/ipinventory.tt @@ -12,12 +12,6 @@ diff --git a/Netdisco/share/views/ajax/report/moduleinventory.tt b/Netdisco/share/views/ajax/report/moduleinventory.tt index be393121..19c0ab6c 100644 --- a/Netdisco/share/views/ajax/report/moduleinventory.tt +++ b/Netdisco/share/views/ajax/report/moduleinventory.tt @@ -30,12 +30,6 @@ diff --git a/Netdisco/share/views/ajax/report/netbios.tt b/Netdisco/share/views/ajax/report/netbios.tt index 964d949b..6134b412 100644 --- a/Netdisco/share/views/ajax/report/netbios.tt +++ b/Netdisco/share/views/ajax/report/netbios.tt @@ -26,12 +26,6 @@ diff --git a/Netdisco/share/views/ajax/report/nodemultiips.tt b/Netdisco/share/views/ajax/report/nodemultiips.tt index b3a8279d..1d70e853 100644 --- a/Netdisco/share/views/ajax/report/nodemultiips.tt +++ b/Netdisco/share/views/ajax/report/nodemultiips.tt @@ -13,12 +13,6 @@ diff --git a/Netdisco/share/views/ajax/report/nodesdiscovered.tt b/Netdisco/share/views/ajax/report/nodesdiscovered.tt index f5a28098..98db813e 100644 --- a/Netdisco/share/views/ajax/report/nodesdiscovered.tt +++ b/Netdisco/share/views/ajax/report/nodesdiscovered.tt @@ -14,12 +14,6 @@ diff --git a/Netdisco/share/views/ajax/report/nodevendor.tt b/Netdisco/share/views/ajax/report/nodevendor.tt index dade6972..0f6f70b0 100644 --- a/Netdisco/share/views/ajax/report/nodevendor.tt +++ b/Netdisco/share/views/ajax/report/nodevendor.tt @@ -26,12 +26,6 @@ diff --git a/Netdisco/share/views/ajax/report/portadmindown.tt b/Netdisco/share/views/ajax/report/portadmindown.tt index 1eb25fa3..9a8c516c 100644 --- a/Netdisco/share/views/ajax/report/portadmindown.tt +++ b/Netdisco/share/views/ajax/report/portadmindown.tt @@ -12,12 +12,6 @@ diff --git a/Netdisco/share/views/ajax/report/portblocking.tt b/Netdisco/share/views/ajax/report/portblocking.tt index 241545dd..5ff08dc9 100644 --- a/Netdisco/share/views/ajax/report/portblocking.tt +++ b/Netdisco/share/views/ajax/report/portblocking.tt @@ -12,12 +12,6 @@ diff --git a/Netdisco/share/views/ajax/report/portlog.tt b/Netdisco/share/views/ajax/report/portlog.tt index 1616980c..777e32d1 100644 --- a/Netdisco/share/views/ajax/report/portlog.tt +++ b/Netdisco/share/views/ajax/report/portlog.tt @@ -30,12 +30,7 @@ diff --git a/Netdisco/share/views/ajax/report/portmultinodes.tt b/Netdisco/share/views/ajax/report/portmultinodes.tt index d359ffc1..8482edfd 100644 --- a/Netdisco/share/views/ajax/report/portmultinodes.tt +++ b/Netdisco/share/views/ajax/report/portmultinodes.tt @@ -12,12 +12,6 @@ diff --git a/Netdisco/share/views/ajax/report/portssid.tt b/Netdisco/share/views/ajax/report/portssid.tt index ce8270ee..23e5e9e8 100644 --- a/Netdisco/share/views/ajax/report/portssid.tt +++ b/Netdisco/share/views/ajax/report/portssid.tt @@ -26,12 +26,6 @@ diff --git a/Netdisco/share/views/ajax/report/portutilization.tt b/Netdisco/share/views/ajax/report/portutilization.tt index 822f0bee..cb1ec9d7 100644 --- a/Netdisco/share/views/ajax/report/portutilization.tt +++ b/Netdisco/share/views/ajax/report/portutilization.tt @@ -13,12 +13,6 @@ diff --git a/Netdisco/share/views/ajax/report/vlaninventory.tt b/Netdisco/share/views/ajax/report/vlaninventory.tt index a7aee16e..5b27c15d 100644 --- a/Netdisco/share/views/ajax/report/vlaninventory.tt +++ b/Netdisco/share/views/ajax/report/vlaninventory.tt @@ -12,12 +12,6 @@ diff --git a/Netdisco/share/views/ajax/search/device.tt b/Netdisco/share/views/ajax/search/device.tt index b36f61b8..b9f11a2a 100644 --- a/Netdisco/share/views/ajax/search/device.tt +++ b/Netdisco/share/views/ajax/search/device.tt @@ -17,12 +17,6 @@ diff --git a/Netdisco/share/views/ajax/search/node_by_ip.tt b/Netdisco/share/views/ajax/search/node_by_ip.tt index 879c6967..e91df02d 100644 --- 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 { diff --git a/Netdisco/share/views/ajax/search/vlan.tt b/Netdisco/share/views/ajax/search/vlan.tt index 010d54b8..aa75ce85 100644 --- a/Netdisco/share/views/ajax/search/vlan.tt +++ b/Netdisco/share/views/ajax/search/vlan.tt @@ -14,12 +14,6 @@