diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 3ad06330e..5babe0c10 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -535,7 +535,13 @@ $(function () { }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); // change color of csv-button if dark mode is chosen @@ -666,7 +672,13 @@ $(function () { }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); // change color of csv-button if dark mode is chosen @@ -836,7 +848,7 @@ function showActivatorsMap(call, count, grids) { var grid = "No"; - + session->userdata('dashboard_last_qso_count')) ?> initmap(grid,'map',{'dataPost':{'nb_qso': dashboard_qso_count}}); @@ -875,7 +887,13 @@ function findlotwunconfirmed(){ }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); // change color of csv-button if dark mode is chosen @@ -901,7 +919,13 @@ function findincorrectcqzones() { }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); // change color of csv-button if dark mode is chosen @@ -940,8 +964,14 @@ function findincorrectituzones() { }, dom: 'Bfrtip', buttons: [ - 'csv' - ] + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } +] }); // change color of csv-button if dark mode is chosen if (isDarkModeTheme()) { @@ -1776,7 +1806,13 @@ $(document).ready(function(){ }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -1793,7 +1829,13 @@ $(document).ready(function(){ url: getDataTablesLanguageUrl(), }, buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -1842,7 +1884,13 @@ $('#sats').change(function(){ }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -1859,7 +1907,13 @@ $('#sats').change(function(){ url: getDataTablesLanguageUrl(), }, buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -1885,7 +1939,13 @@ $('#sats').change(function(){ }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -1902,7 +1962,13 @@ $('#sats').change(function(){ url: getDataTablesLanguageUrl(), }, buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -1928,7 +1994,13 @@ $('#sats').change(function(){ }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -1955,7 +2027,13 @@ $('#sats').change(function(){ }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -1972,7 +2050,13 @@ $('#sats').change(function(){ url: getDataTablesLanguageUrl(), }, buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -1999,7 +2083,13 @@ $('#sats').change(function(){ }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -2016,7 +2106,13 @@ $('#sats').change(function(){ url: getDataTablesLanguageUrl(), }, buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -2042,7 +2138,13 @@ $('#sats').change(function(){ }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -2059,7 +2161,13 @@ $('#sats').change(function(){ url: getDataTablesLanguageUrl(), }, buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -2105,10 +2213,18 @@ $('#sats').change(function(){ dom: 'Bfrtip', buttons: [ { - extend: 'csv' - }, + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + }, { extend: 'clear', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, text: lang_admin_clear } ] @@ -2232,10 +2348,14 @@ $('#sats').change(function(){ "order": [ 2, 'desc' ], dom: 'Bfrtip', buttons: [ - { - extend: 'clear', - text: lang_admin_clear - } + { + extend: 'clear', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + text: lang_admin_clear + } ] }); // change color of csv-button if dark mode is chosen @@ -2404,7 +2524,13 @@ function viewEqsl(picture, callsign) { }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { @@ -2470,7 +2596,13 @@ function viewEqsl(picture, callsign) { }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { @@ -2661,7 +2793,13 @@ function viewEqsl(picture, callsign) { }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -2714,7 +2852,13 @@ function viewEqsl(picture, callsign) { }, dom: 'Bfrtip', buttons: [ - 'csv' + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + } ] }); @@ -2799,11 +2943,19 @@ function viewEqsl(picture, callsign) { "order": [ 2, 'desc' ], dom: 'Bfrtip', buttons: [ - { - extend: 'csv' - }, + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + }, { extend: 'clear', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, text: lang_admin_clear } ] @@ -2878,11 +3030,19 @@ function viewEqsl(picture, callsign) { "order": [ 0, 'asc' ], dom: 'Bfrtip', buttons: [ - { - extend: 'csv' - }, + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + }, { extend: 'clear', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, text: lang_admin_clear } ] @@ -2915,11 +3075,19 @@ function viewEqsl(picture, callsign) { "order": [ 0, 'asc' ], dom: 'Bfrtip', buttons: [ - { - extend: 'csv' - }, + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + }, { extend: 'clear', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, text: lang_admin_clear } ] @@ -2950,11 +3118,19 @@ function viewEqsl(picture, callsign) { }, dom: 'Bfrtip', buttons: [ - { - extend: 'csv' - }, + { + extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, + }, { extend: 'clear', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, text: lang_admin_clear } ] diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php index 10d7e4563..19cdce68e 100644 --- a/application/views/visitor/layout/footer.php +++ b/application/views/visitor/layout/footer.php @@ -239,12 +239,20 @@ if ($lang_code != 'en' && !file_exists(FCPATH . "assets/json/datatables_language dom: 'Bfrtip', buttons: [ { - extend: 'csv', - text: '' + extend: 'csv', + text: '', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, }, { extend: 'clear', - text: '' + text: '', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, } ] }); diff --git a/assets/js/sections/club_permissions.js b/assets/js/sections/club_permissions.js index f7c629707..a17071fd5 100644 --- a/assets/js/sections/club_permissions.js +++ b/assets/js/sections/club_permissions.js @@ -14,6 +14,10 @@ $(document).ready(function(){ buttons: [ { extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, exportOptions: { columns: [ 0, 1, 2, 3, 4, 5 ] } @@ -69,4 +73,4 @@ $(document).ready(function(){ $(this).prop('disabled', true).addClass('running'); $(this).closest('form').submit(); }); -}); \ No newline at end of file +}); diff --git a/assets/js/sections/contestingnames.js b/assets/js/sections/contestingnames.js index 777965c3e..e1be7d586 100644 --- a/assets/js/sections/contestingnames.js +++ b/assets/js/sections/contestingnames.js @@ -13,6 +13,10 @@ $('.contesttable').DataTable({ buttons: [ { extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, exportOptions: { columns: [ 0, 1, 2 ] } diff --git a/assets/js/sections/user.js b/assets/js/sections/user.js index 940c791bc..c74de4105 100644 --- a/assets/js/sections/user.js +++ b/assets/js/sections/user.js @@ -1,4 +1,4 @@ -// +// // Javascript for User Section // @@ -21,9 +21,9 @@ function actions_modal(user_id, modal) { $.ajax({ url: base_url + 'index.php/user/actions_modal', type: 'POST', - data: { + data: { modal: modal, - user_id: user_id + user_id: user_id }, success: function(response) { $('#actionsModal-container').html(response); @@ -35,7 +35,7 @@ function actions_modal(user_id, modal) { }); $(window).on('blur', function() { $('#actionsModal').modal('hide'); - }); + }); } function send_passwort_reset(user_id) { @@ -46,7 +46,7 @@ function send_passwort_reset(user_id) { $.ajax({ url: base_url + 'index.php/user/admin_send_password_reset', type: 'POST', - data: { + data: { user_id: user_id, submit_allowed: true }, @@ -77,7 +77,7 @@ function convert_user(user_id, convert_to) { $.ajax({ url: base_url + 'index.php/user/convert', type: 'POST', - data: { + data: { user_id: user_id, convert_to: convert_to, }, @@ -117,6 +117,10 @@ $(document).ready(function(){ buttons: [ { extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, exportOptions: { columns: [ 0, 1, 2, 3, 4, 5 ] } @@ -138,6 +142,10 @@ $(document).ready(function(){ buttons: [ { extend: 'csv', + className: 'mb-1 btn btn-primary', // Bootstrap classes + init: function(api, node, config) { + $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies + }, exportOptions: { columns: [ 0, 1, 2, 3, 4, 5 ] } @@ -218,8 +226,8 @@ $(document).ready(function(){ BootstrapDialog.confirm({ title: lang_general_word_warning, message: - lang_admin_confirm_pwd_reset + "\n\n" + - lang_admin_user + ": " + pwd_reset_user_name + "\n" + + lang_admin_confirm_pwd_reset + "\n\n" + + lang_admin_user + ": " + pwd_reset_user_name + "\n" + lang_gen_hamradio_callsign + ": " + pwd_reset_user_callsign, type: BootstrapDialog.TYPE_DANGER, btnCancelLabel: lang_general_word_cancel, @@ -237,7 +245,7 @@ $(document).ready(function(){ $.ajax({ url: base_url + 'index.php/user/admin_send_password_reset', type: 'POST', - data: { + data: { user_id: pwd_reset_user_id, submit_allowed: true },