diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index c0b268eb..abcaa8c2 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -270,7 +270,7 @@ history_table_options = { }); if ($('#row-edit-mode').hasClass('active')) { - $('.delete-control').each(function () { + $('.history_table .delete-control').each(function () { $(this).removeClass('hidden'); }); } @@ -466,7 +466,7 @@ function childTableOptions(rowData) { }); if ($('#row-edit-mode').hasClass('active')) { - $('.delete-control').each(function () { + $('.history_table .delete-control').each(function () { $(this).removeClass('hidden'); }); } diff --git a/data/interfaces/default/js/tables/sync_table.js b/data/interfaces/default/js/tables/sync_table.js index c17db1ab..942e37eb 100644 --- a/data/interfaces/default/js/tables/sync_table.js +++ b/data/interfaces/default/js/tables/sync_table.js @@ -139,6 +139,13 @@ sync_table_options = { // $('html,body').scrollTop(0); $('#ajaxMsg').fadeOut(); + + if ($('#sync-row-edit-mode').hasClass('active')) { + $('.sync_table .delete-control').each(function () { + $(this).removeClass('hidden'); + }); + } + }, "preDrawCallback": function (settings) { var msg = " Fetching rows..."; diff --git a/data/interfaces/default/sync.html b/data/interfaces/default/sync.html index b9ae6f3f..ee63de99 100644 --- a/data/interfaces/default/sync.html +++ b/data/interfaces/default/sync.html @@ -20,10 +20,10 @@
% if _session['user_group'] == 'admin': - +
-  
% endif @@ -138,8 +138,8 @@ loadSyncTable(selected_user_id); % if _session['user_group'] == 'admin': - $('#row-edit-mode').on('click', function() { - $('#row-edit-mode-alert').fadeIn(200); + $('#sync-row-edit-mode').on('click', function() { + $('#sync-row-edit-mode-alert').fadeIn(200); if ($(this).hasClass('active')) { if (syncs_to_delete.length > 0) { @@ -167,7 +167,7 @@ $('.delete-control').each(function () { $(this).addClass('hidden'); - $('#row-edit-mode-alert').fadeOut(200); + $('#sync-row-edit-mode-alert').fadeOut(200); }); } else { diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html index f5ec45fc..3ea0b57b 100644 --- a/data/interfaces/default/user.html +++ b/data/interfaces/default/user.html @@ -214,10 +214,10 @@ DOCUMENTATION :: END
% if _session['user_group'] == 'admin': - +
 
% endif @@ -231,6 +231,7 @@ DOCUMENTATION :: END + @@ -529,14 +530,14 @@ DOCUMENTATION :: END }); } - $('.delete-control').each(function () { + $('.history_table .delete-control').each(function () { $(this).addClass('hidden'); $('#row-edit-mode-alert').fadeOut(200); }); } else { history_to_delete = []; - $('.delete-control').each(function() { + $('.history_table .delete-control').each(function() { $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger'); $(this).removeClass('hidden'); }); @@ -571,14 +572,14 @@ DOCUMENTATION :: END }); } - $('.delete-control').each(function () { + $('.sync_table .delete-control').each(function () { $(this).addClass('hidden'); $('#sync-row-edit-mode-alert').fadeOut(200); }); } else { syncs_to_delete = []; - $('.delete-control').each(function() { + $('.sync_table .delete-control').each(function() { $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger'); $(this).removeClass('hidden'); });
Delete State Username Title