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

Conflicts:
	Netdisco/share/public/css/netdisco.css
	Netdisco/share/views/ajax/device/ports.tt
This commit is contained in:
Oliver Gorwits
2014-09-16 19:29:41 +01:00
66 changed files with 936 additions and 320 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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."
}

View File

@@ -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>

View File

@@ -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

View File

@@ -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>

View File

@@ -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

View File

@@ -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>

View File

@@ -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' -%]
});
});

View File

@@ -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>

View File

@@ -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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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' -%]
});
});

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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

View File

@@ -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

View File

@@ -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>

View File

@@ -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>