diff --git a/src/sunstone/public/js/layout.js b/src/sunstone/public/js/layout.js index d88012b94d..e19c0d2393 100644 --- a/src/sunstone/public/js/layout.js +++ b/src/sunstone/public/js/layout.js @@ -36,8 +36,8 @@ function showTab(tabname,highlight_tab){ //we no longer expect #tab_id here, but simply tab_id //So safety check - remove # from #tab_id if present to ensure compatibility - $('tbody input.check_item:checked').click(); - $('td').removeClass('markrowchecked markrowselected'); + //$('tbody input.check_item:checked').click(); + //$('td').removeClass('markrowchecked markrowselected'); last_select_row = null; if (tabname.indexOf('#') == 0) diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 96894721d1..9b2851a7ee 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -614,7 +614,6 @@ function setAclAutorefresh(){ $(document).ready(function(){ //if we are not oneadmin, our tab will not even be in the DOM. dataTable_acls = $("#datatable_acls",main_tabs_context).dataTable({ - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "oColVis": { "aiExclude": [ 0 ] }, @@ -622,11 +621,7 @@ $(document).ready(function(){ { "bSortable": false, "aTargets": ["check"] }, { "sWidth": "35px", "aTargets": [0,1] }, { "bVisible": false, "aTargets": [6]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 4116dad15c..7e37a4d1fd 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -1811,18 +1811,13 @@ $(document).ready(function(){ //prepare host datatable dataTable_clusters = $("#datatable_clusters",main_tabs_context).dataTable({ - "sDom" :"<'H'>t<'row'<'six columns'i><'six columns'p>>", "oColVis": { "aiExclude": [ 0 ] }, "aoColumnDefs": [ { "bSortable": false, "aTargets": ["check"] }, { "sWidth": "35px", "aTargets": [0,1] }, - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); $('#cluster_search').keyup(function(){ diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 4361325d04..197b52a312 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -986,18 +986,13 @@ function setDatastoreAutorefresh(){ $(document).ready(function(){ dataTable_datastores = $("#datatable_datastores",main_tabs_context).dataTable({ - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "oColVis": { "aiExclude": [ 0 ] }, "aoColumnDefs": [ { "sWidth": "35px", "aTargets": [0,1] }, { "bVisible": false, "aTargets": [6,7,8,9] } - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); $('#datastore_search').keyup(function(){ diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index f2d32ea0b7..8389b22402 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -1042,7 +1042,6 @@ function popUpFileCloneDialog(){ $(document).ready(function(){ dataTable_files = $("#datatable_files",main_tabs_context).dataTable({ - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "oColVis": { "aiExclude": [ 0 ] }, @@ -1053,11 +1052,7 @@ $(document).ready(function(){ { "sWidth": "100px", "aTargets": [5,7] }, { "sWidth": "150px", "aTargets": [8] }, { "bVisible": false, "aTargets": [6,8,9,11,12]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); $('#file_search').keyup(function(){ diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 7c384b15c6..baeb711940 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -795,15 +795,10 @@ function setGroupAutorefresh(){ $(document).ready(function(){ dataTable_groups = $("#datatable_groups",main_tabs_context).dataTable({ - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "aoColumnDefs": [ { "bSortable": false, "aTargets": ["check"] }, { "sWidth": "35px", "aTargets": [0,1] } - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); //addElement([ diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 2de13c46b2..7d4b922267 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -1038,7 +1038,6 @@ $(document).ready(function(){ //prepare host datatable dataTable_hosts = $("#datatable_hosts",main_tabs_context).dataTable({ - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "oColVis": { //exclude checkbox column "aiExclude": [ 0 ] }, @@ -1046,11 +1045,7 @@ $(document).ready(function(){ //{ "bSortable": false, "aTargets": ["check"] }, { "sWidth": "35px", "aTargets": [0,1,4,9] }, //check, ID, RVMS, Status { "bVisible": false, "aTargets": [5,7,10,11,12]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); $('#hosts_search').keyup(function(){ diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index cc43bc9252..2e9ddf8e77 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -1253,7 +1253,6 @@ function popUpImageCloneDialog(){ $(document).ready(function(){ dataTable_images = $("#datatable_images",main_tabs_context).dataTable({ - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "oColVis": { "aiExclude": [ 0 ] }, @@ -1264,11 +1263,7 @@ $(document).ready(function(){ { "sWidth": "100px", "aTargets": [5,7] }, { "sWidth": "150px", "aTargets": [8] }, { "bVisible": false, "aTargets": [6,8,12]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); $('#image_search').keyup(function(){ diff --git a/src/sunstone/public/js/plugins/marketplace-tab.js b/src/sunstone/public/js/plugins/marketplace-tab.js index 2afcd1ced2..33cb596b2a 100644 --- a/src/sunstone/public/js/plugins/marketplace-tab.js +++ b/src/sunstone/public/js/plugins/marketplace-tab.js @@ -285,7 +285,6 @@ function onlyOneCheckboxListener(dataTable) { $(document).ready(function(){ dataTable_marketplace = $("#datatable_marketplace", main_tabs_context).dataTable({ "bSortClasses": true, - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "aoColumns": [ { "bSortable": false, "mData": function ( o, val, data ) { @@ -304,11 +303,7 @@ $(document).ready(function(){ { "mDataProp": "files.0.os-arch", "sWidth" : "100px"}, { "mDataProp": "files.0.format", "sWidth" : "100px"}, { "mDataProp": "tags", "bVisible": false} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index f8d3e6e06c..9b71f6b2fd 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -4153,7 +4153,6 @@ $(document).ready(function(){ "oColVis": { "aiExclude": [ 0 ] }, - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "aoColumnDefs": [ { "bSortable": false, "aTargets": ["check"] }, { "sWidth": "35px", "aTargets": [0,1] }, diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 06a60ec234..b5eb0a3b6a 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -1168,7 +1168,6 @@ function setUserAutorefresh(){ $(document).ready(function(){ //if we are not oneadmin, our tab will not even be in the DOM. dataTable_users = $("#datatable_users",main_tabs_context).dataTable({ - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "oColVis": { "aiExclude": [ 0 ] }, @@ -1176,11 +1175,7 @@ $(document).ready(function(){ { "bSortable": false, "aTargets": ["check"] }, { "sWidth": "35px", "aTargets": [0,1] }, { "bVisible": false, "aTargets": [8]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); $('#user_search').keyup(function(){ diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 78aeb7d70f..c3c0f8560f 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -2981,7 +2981,6 @@ function vmMonitorError(req,error_json){ $(document).ready(function(){ dataTable_vMachines = $("#datatable_vmachines",main_tabs_context).dataTable({ - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "oColVis": { "aiExclude": [ 0 ] }, @@ -2989,17 +2988,15 @@ $(document).ready(function(){ { "bSortable": false, "aTargets": ["check"] }, { "sWidth": "35px", "aTargets": [0,1] }, { "bVisible": false, "aTargets": [6,7,10]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); $('#vms_search').keyup(function(){ dataTable_vMachines.fnFilter( $(this).val() ); }) + + //addElement([ // spinner, // '','','','','','','','','','',''],dataTable_vMachines); diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 625632e40f..6886eb60ee 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -1320,18 +1320,13 @@ function setVNetAutorefresh() { $(document).ready(function(){ dataTable_vNetworks = $("#datatable_vnetworks",main_tabs_context).dataTable({ - "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "oColVis": { "aiExclude": [ 0 ] }, "aoColumnDefs": [ { "sWidth": "35px", "aTargets": [0,1] }, { "bVisible": false, "aTargets": [7]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + ] }); $('#vnet_search').keyup(function(){ diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index 79ab8b4d27..d47df2fa5d 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -341,9 +341,9 @@ function prettyPrintRowJSON(field,value,padding,weight, border_bottom,padding_to function initCheckAllBoxes(datatable){ //small css hack - $('input.check_all',datatable).css({"border":"2px"}); - $('input.check_all',datatable).live("change",function(){ - var table = $(this).parents('table'); + $('input.check_all').css({"border":"2px"}); + $('input.check_all').live("change",function(){ + var table = $(this).closest('.dataTables_wrapper'); var checked = $(this).attr('checked'); if (checked) { //check all $('tbody input.check_item',table).attr('checked','checked'); @@ -443,7 +443,7 @@ function onError(request,error_json) { //Used when refreshing elements of a datatable. function waitingNodes(dataTable){ $('tr input.check_item:visible',dataTable).replaceWith(spinner); - recountCheckboxes(dataTable); + //recountCheckboxes(dataTable); } diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss index 4d2d101361..a341cc9c4c 100644 --- a/src/sunstone/public/sass/app.scss +++ b/src/sunstone/public/sass/app.scss @@ -828,4 +828,5 @@ form { .dataTables_scrollBody { margin-top: -3px; -} \ No newline at end of file +} + diff --git a/src/sunstone/public/vendor/4.0/foundation_datatables/javascripts/datatables.foundation.js b/src/sunstone/public/vendor/4.0/foundation_datatables/javascripts/datatables.foundation.js index 31f10e269e..8b9e22d126 100644 --- a/src/sunstone/public/vendor/4.0/foundation_datatables/javascripts/datatables.foundation.js +++ b/src/sunstone/public/vendor/4.0/foundation_datatables/javascripts/datatables.foundation.js @@ -1,12 +1,13 @@ /* Set the defaults for DataTables initialisation */ $.extend( true, $.fn.dataTable.defaults, { - "sDom": "<'row'<'six columns'l><'six columns'f>r><'row'<'twelve columns't>><'row'<'six columns'i><'six columns'p>>", + "sDom": "<'H'>t<'row'<'four columns'l><'six columns'p>>", "sPaginationType": "foundation", "oLanguage": { - "sLengthMenu": 'Show
entries' + "sLengthMenu": ' rows' } } ); + /* API method to get paging information */ $.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings ) { @@ -34,14 +35,18 @@ $.extend( $.fn.dataTableExt.oPagination, { }; $(nPaging).addClass('pagination').append( - '