Merge branch 'master' into admin-login

This commit is contained in:
André Peters
2019-03-31 15:49:18 +02:00
committed by GitHub
20 changed files with 157 additions and 66 deletions

View File

@@ -312,7 +312,8 @@ jQuery(function($){
{"name":"domain","title":lang.domain,"breakpoints":"xs sm"},
{"name":"quota","style":{"whiteSpace":"nowrap"},"title":lang.domain_quota,"formatter": function(value){
res = value.split("/");
return humanFileSize(res[0]) + " / " + humanFileSize(res[1]);
var of_q = (res[1] == 0 ? "" : humanFileSize(res[1]));
return humanFileSize(res[0]) + " / " + of_q;
},
"sortValue": function(value){
res = value.split("/");
@@ -1018,4 +1019,4 @@ jQuery(function($){
draw_tls_policy_table();
draw_transport_maps_table();
});
});