Sync job tables enhanced
Signed-off-by: Kristián Feldsam <feldsam@gmail.com> # Conflicts: # data/web/js/mailbox.jsmaster
parent
921741cf7a
commit
254397af60
|
@ -473,6 +473,7 @@ jQuery(function($){
|
||||||
{"sorted": true,"name":"id","title":"ID","style":{"maxWidth":"60px","width":"60px","text-align":"center"}},
|
{"sorted": true,"name":"id","title":"ID","style":{"maxWidth":"60px","width":"60px","text-align":"center"}},
|
||||||
{"name":"user2","title":lang.owner},
|
{"name":"user2","title":lang.owner},
|
||||||
{"name":"server_w_port","title":"Server","breakpoints":"xs"},
|
{"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":"mins_interval","title":lang.mins_interval,"breakpoints":"all"},
|
||||||
{"name":"last_run","title":lang.last_run,"breakpoints":"all"},
|
{"name":"last_run","title":lang.last_run,"breakpoints":"all"},
|
||||||
{"name":"log","title":"Log"},
|
{"name":"log","title":"Log"},
|
||||||
|
@ -491,7 +492,11 @@ jQuery(function($){
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
$.each(data, function (i, item) {
|
$.each(data, function (i, item) {
|
||||||
item.log = '<a href="#syncjobLogModal" data-toggle="modal" data-syncjob-id="' + encodeURI(item.id) + '">Open logs</a>'
|
item.log = '<a href="#syncjobLogModal" data-toggle="modal" data-syncjob-id="' + encodeURI(item.id) + '">Open logs</a>'
|
||||||
item.exclude = '<code>' + item.exclude + '</code>'
|
if (!item.exclude > 0) {
|
||||||
|
item.exclude = '-';
|
||||||
|
} else {
|
||||||
|
item.exclude = '<code>' + item.exclude + '</code>';
|
||||||
|
}
|
||||||
item.server_w_port = item.user1 + '@' + item.host1 + ':' + item.port1;
|
item.server_w_port = item.user1 + '@' + item.host1 + ':' + item.port1;
|
||||||
item.action = '<div class="btn-group">' +
|
item.action = '<div class="btn-group">' +
|
||||||
'<a href="/edit.php?syncjob=' + item.id + '" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-pencil"></span> ' + lang.edit + '</a>' +
|
'<a href="/edit.php?syncjob=' + item.id + '" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-pencil"></span> ' + lang.edit + '</a>' +
|
||||||
|
|
|
@ -86,14 +86,14 @@ jQuery(function($){
|
||||||
function draw_sync_job_table() {
|
function draw_sync_job_table() {
|
||||||
ft_syncjob_table = FooTable.init('#sync_job_table', {
|
ft_syncjob_table = FooTable.init('#sync_job_table', {
|
||||||
"columns": [
|
"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"}},
|
{"sorted": true,"name":"id","title":"ID","style":{"maxWidth":"60px","width":"60px","text-align":"center"}},
|
||||||
{"name":"server_w_port","title":"Server"},
|
{"name":"server_w_port","title":"Server"},
|
||||||
{"name":"enc1","title":lang.encryption,"breakpoints":"xs sm"},
|
{"name":"enc1","title":lang.encryption,"breakpoints":"xs sm"},
|
||||||
{"name":"user1","title":lang.username},
|
{"name":"user1","title":lang.username},
|
||||||
{"name":"exclude","title":lang.excludes,"breakpoints":"xs sm"},
|
{"name":"exclude","title":lang.excludes,"breakpoints":"all"},
|
||||||
{"name":"mins_interval","title":lang.interval + " (min)"},
|
{"name":"mins_interval","title":lang.interval + " (min)","breakpoints":"all"},
|
||||||
{"name":"last_run","title":lang.last_run,"breakpoints":"xs sm"},
|
{"name":"last_run","title":lang.last_run,"breakpoints":"all"},
|
||||||
{"name":"log","title":"Log"},
|
{"name":"log","title":"Log"},
|
||||||
{"name":"active","filterable": false,"style":{"maxWidth":"70px","width":"70px"},"title":lang.active},
|
{"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},
|
{"name":"is_running","filterable": false,"style":{"maxWidth":"120px","width":"100px"},"title":lang.status},
|
||||||
|
|
|
@ -274,6 +274,7 @@ $lang['mailbox']['deactivate'] = 'Deactivate';
|
||||||
$lang['mailbox']['owner'] = 'Owner';
|
$lang['mailbox']['owner'] = 'Owner';
|
||||||
$lang['mailbox']['mins_interval'] = 'Interval (min)';
|
$lang['mailbox']['mins_interval'] = 'Interval (min)';
|
||||||
$lang['mailbox']['last_run'] = 'Last run';
|
$lang['mailbox']['last_run'] = 'Last run';
|
||||||
|
$lang['mailbox']['excludes'] = 'Excludes';
|
||||||
$lang['mailbox']['last_run_reset'] = 'Schedule next';
|
$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.<br>
|
$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.<br>
|
||||||
Each filter will be processed in the described order. Neither a failed script nor an issued "keep;" will stop processing of further scripts.<br>
|
Each filter will be processed in the described order. Neither a failed script nor an issued "keep;" will stop processing of further scripts.<br>
|
||||||
|
|
Loading…
Reference in New Issue