diff --git a/data/web/js/mailbox.js b/data/web/js/mailbox.js index 415b6e281..39afe7179 100644 --- a/data/web/js/mailbox.js +++ b/data/web/js/mailbox.js @@ -473,6 +473,7 @@ jQuery(function($){ {"sorted": true,"name":"id","title":"ID","style":{"maxWidth":"60px","width":"60px","text-align":"center"}}, {"name":"user2","title":lang.owner}, {"name":"server_w_port","title":"Server","breakpoints":"xs"}, + {"name":"exclude","title":lang.excludes,"breakpoints":"all"}, {"name":"mins_interval","title":lang.mins_interval,"breakpoints":"all"}, {"name":"last_run","title":lang.last_run,"breakpoints":"all"}, {"name":"log","title":"Log"}, @@ -491,7 +492,11 @@ jQuery(function($){ success: function (data) { $.each(data, function (i, item) { item.log = 'Open logs' - item.exclude = '' + item.exclude + '' + if (!item.exclude > 0) { + item.exclude = '-'; + } else { + item.exclude = '' + item.exclude + ''; + } item.server_w_port = item.user1 + '@' + item.host1 + ':' + item.port1; item.action = '
' + ' ' + lang.edit + '' + diff --git a/data/web/js/user.js b/data/web/js/user.js index 900dced17..3984e8557 100644 --- a/data/web/js/user.js +++ b/data/web/js/user.js @@ -86,14 +86,14 @@ jQuery(function($){ function draw_sync_job_table() { ft_syncjob_table = FooTable.init('#sync_job_table', { "columns": [ - {"name":"chkbox","title":"","style":{"maxWidth":"40px","width":"40px","text-align":"center"},"filterable": false,"sortable": false,"type":"html"}, + {"name":"chkbox","title":"","style":{"maxWidth":"60px","width":"60px","text-align":"center"},"filterable": false,"sortable": false,"type":"html"}, {"sorted": true,"name":"id","title":"ID","style":{"maxWidth":"60px","width":"60px","text-align":"center"}}, {"name":"server_w_port","title":"Server"}, {"name":"enc1","title":lang.encryption,"breakpoints":"xs sm"}, {"name":"user1","title":lang.username}, - {"name":"exclude","title":lang.excludes,"breakpoints":"xs sm"}, - {"name":"mins_interval","title":lang.interval + " (min)"}, - {"name":"last_run","title":lang.last_run,"breakpoints":"xs sm"}, + {"name":"exclude","title":lang.excludes,"breakpoints":"all"}, + {"name":"mins_interval","title":lang.interval + " (min)","breakpoints":"all"}, + {"name":"last_run","title":lang.last_run,"breakpoints":"all"}, {"name":"log","title":"Log"}, {"name":"active","filterable": false,"style":{"maxWidth":"70px","width":"70px"},"title":lang.active}, {"name":"is_running","filterable": false,"style":{"maxWidth":"120px","width":"100px"},"title":lang.status}, diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php index b68cf5ee4..9c490dd60 100644 --- a/data/web/lang/lang.en.php +++ b/data/web/lang/lang.en.php @@ -274,6 +274,7 @@ $lang['mailbox']['deactivate'] = 'Deactivate'; $lang['mailbox']['owner'] = 'Owner'; $lang['mailbox']['mins_interval'] = 'Interval (min)'; $lang['mailbox']['last_run'] = 'Last run'; +$lang['mailbox']['excludes'] = 'Excludes'; $lang['mailbox']['last_run_reset'] = 'Schedule next'; $lang['mailbox']['sieve_info'] = 'You can store multiple filters per user, but only one prefilter and one postfilter can be active at the same time.
Each filter will be processed in the described order. Neither a failed script nor an issued "keep;" will stop processing of further scripts.