Merge pull request #2810 from friedPotat0/quarantinetable

Minor adjustments to tables in UI
master
André Peters 2019-07-27 19:40:43 +02:00 committed by GitHub
commit 2061181d82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 68 additions and 17 deletions

View File

@ -53,3 +53,11 @@ table.footable>tbody>tr.footable-empty>td {
font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;
font-size:smaller;
}
table tbody tr {
cursor: pointer;
}
table tbody tr td input[type="checkbox"] {
cursor: pointer;
}

View File

@ -57,3 +57,11 @@ span.mail-address-item {
padding: 2px 7px;
margin-right: 7px;
}
table tbody tr {
cursor: pointer;
}
table tbody tr td input[type="checkbox"] {
cursor: pointer;
}

View File

@ -39,4 +39,12 @@ table.footable>tbody>tr.footable-empty>td {
}
body {
overflow-y:scroll;
}
table tbody tr {
cursor: pointer;
}
table tbody tr td input[type="checkbox"] {
cursor: pointer;
}

View File

@ -52,12 +52,12 @@ $(document).ready(function() {
auto_fill_quota = function(domain) {
$.get("/api/v1/get/domain/" + domain, function(data){
var result = $.parseJSON(JSON.stringify(data));
def_new_mailbox_quota = ( result.def_new_mailbox_quota / 1048576);
def_new_mailbox_quota = ( result.def_new_mailbox_quota / 1048576);
max_new_mailbox_quota = ( result.max_new_mailbox_quota / 1048576);
if (max_new_mailbox_quota != '0') {
$("#quotaBadge").html('max. ' + max_new_mailbox_quota + ' MiB');
$('#addInputQuota').attr({"disabled": false, "value": "", "type": "number", "max": max_new_mailbox_quota});
$('#addInputQuota').val(def_new_mailbox_quota);
$('#addInputQuota').val(def_new_mailbox_quota);
}
else {
$("#quotaBadge").html('max. ' + max_new_mailbox_quota + ' MiB');
@ -230,7 +230,7 @@ jQuery(function($){
return Number(res[0]);
},
},
{"name":"def_quota_for_mbox","title":lang.mailbox_defquota,"breakpoints":"xs sm md","style":{"width":"125px"}},
{"name":"def_quota_for_mbox","title":lang.mailbox_defquota,"breakpoints":"xs sm md","style":{"width":"125px"}},
{"name":"max_quota_for_mbox","title":lang.mailbox_quota,"breakpoints":"xs sm","style":{"width":"125px"}},
{"name":"rl","title":"RL","breakpoints":"xs sm md lg","style":{"maxWidth":"100px","width":"100px"}},
{"name":"backupmx","filterable": false,"style":{"maxWidth":"120px","width":"120px"},"title":lang.backup_mx,"breakpoints":"xs sm md lg"},
@ -256,7 +256,7 @@ jQuery(function($){
return e;
}).join('/1');
}
item.def_quota_for_mbox = humanFileSize(item.def_quota_for_mbox);
item.def_quota_for_mbox = humanFileSize(item.def_quota_for_mbox);
item.max_quota_for_mbox = humanFileSize(item.max_quota_for_mbox);
item.chkbox = '<input type="checkbox" data-id="domain" name="multi_select" value="' + encodeURIComponent(item.domain_name) + '" />';
item.action = '<div class="btn-group">';
@ -300,7 +300,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'domain_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
function draw_mailbox_table() {
@ -419,7 +420,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'mailbox_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
function draw_resource_table() {
@ -491,7 +493,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'resource_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
function draw_bcc_table() {
@ -559,7 +562,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'bcc_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
function draw_recipient_map_table() {
@ -622,7 +626,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'recipient_map_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
function draw_tls_policy_table() {
@ -691,7 +696,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'tls_policy_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
function draw_transport_maps_table() {
@ -758,7 +764,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'transport_maps_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
function draw_alias_table() {
@ -854,7 +861,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'alias_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
@ -914,7 +922,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'aliasdomain_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
@ -995,7 +1004,8 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'sync_job_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
@ -1064,10 +1074,15 @@ jQuery(function($){
"after.ft.filtering": function(e, ft){
table_mailbox_ready(ft, 'filter_table');
}
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
};
$('body').on('click', 'span.footable-toggle', function () {
event.stopPropagation();
})
draw_domain_table();
draw_mailbox_table();
draw_resource_table();

View File

@ -63,6 +63,7 @@ jQuery(function($){
"paging": {"enabled": true,"limit": 5,"size": pagination_size},
"sorting": {"enabled": true},
"filtering": {"enabled": true,"position": "left","connectors": false,"placeholder": lang.filter_table},
"toggleSelector": "table tbody span.footable-toggle"
});
}
@ -117,6 +118,10 @@ jQuery(function($){
});
});
$('body').on('click', 'span.footable-toggle', function () {
event.stopPropagation();
})
// Initial table drawings
draw_quarantine_table();
});

View File

@ -84,7 +84,8 @@ jQuery(function($){
"state": {"enabled": true},
"sorting": {
"enabled": true
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
function draw_sync_job_table() {
@ -151,7 +152,8 @@ jQuery(function($){
"state": {"enabled": true},
"sorting": {
"enabled": true
}
},
"toggleSelector": "table tbody span.footable-toggle"
});
}
function draw_wl_policy_mailbox_table() {
@ -236,6 +238,11 @@ jQuery(function($){
}
});
}
$('body').on('click', 'span.footable-toggle', function () {
event.stopPropagation();
})
draw_sync_job_table();
draw_tla_table();
draw_wl_policy_mailbox_table();