diff --git a/data/web/admin.php b/data/web/admin.php index 81b36ba8..ce3deb69 100644 --- a/data/web/admin.php +++ b/data/web/admin.php @@ -657,7 +657,7 @@ $tfa_data = get_tfa();

- + diff --git a/data/web/css/admin.css b/data/web/css/admin.css index 880bb6bd..bd6ce1a5 100644 --- a/data/web/css/admin.css +++ b/data/web/css/admin.css @@ -64,4 +64,10 @@ body.modal-open { font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace; font-size:9pt; background:transparent; -} \ No newline at end of file +} +.bootstrap-select { + width: auto!important; +} +.table-condensed .input-sm { + width: 100%!important; +} diff --git a/data/web/js/admin.js b/data/web/js/admin.js index 72a5c3bb..8c9876c0 100644 --- a/data/web/js/admin.js +++ b/data/web/js/admin.js @@ -79,7 +79,7 @@ jQuery(function($){ {"name":"id","type":"text","title":"ID","style":{"width":"50px"}}, {"name":"hostname","type":"text","title":lang.host,"style":{"width":"250px"}}, {"name":"username","title":lang.username,"breakpoints":"xs sm"}, - {"name":"used_by_domains","title":lang.in_use_by, "type": "text","breakpoints":"xs sm"}, + {"name":"used_by_domains","title":lang.in_use_by,"style":{"width":"110px"}, "type": "text","breakpoints":"xs sm"}, {"name":"active","filterable": false,"style":{"maxWidth":"80px","width":"80px"},"title":lang.active}, {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","maxWidth":"280px","width":"280px"},"type":"html","title":lang.action,"breakpoints":"xs sm"} ], diff --git a/data/web/js/mailbox.js b/data/web/js/mailbox.js index 886c28ca..33d5519d 100644 --- a/data/web/js/mailbox.js +++ b/data/web/js/mailbox.js @@ -168,7 +168,7 @@ jQuery(function($){ return Number(res[0]); }, }, - {"name":"max_quota_for_mbox","title":lang.mailbox_quota,"breakpoints":"xs sm"}, + {"name":"max_quota_for_mbox","title":lang.mailbox_quota,"breakpoints":"xs sm","style":{"width":"125px"}}, {"name":"backupmx","filterable": false,"style":{"maxWidth":"120px","width":"120px"},"title":lang.backup_mx,"breakpoints":"xs sm"}, {"name":"active","filterable": false,"style":{"maxWidth":"80px","width":"80px"},"title":lang.active}, {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","maxWidth":"240px","width":"240px"},"type":"html","title":lang.action,"breakpoints":"xs sm"} diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php index d6a1c3ef..6ad8b27e 100644 --- a/data/web/lang/lang.en.php +++ b/data/web/lang/lang.en.php @@ -104,7 +104,7 @@ $lang['user']['new_password_description'] = 'Requirement: 6 characters long, let $lang['user']['spam_aliases'] = 'Temporary email aliases'; $lang['user']['alias'] = 'Alias'; $lang['user']['shared_aliases'] = 'Shared alias addresses'; -$lang['user']['shared_aliases_desc'] = 'A shared alias address is not affected by any user specific settings. A custom spam filter setting can be archived by a domain-wide policy set by an administrator..'; +$lang['user']['shared_aliases_desc'] = 'Shared aliases are not affected by user specific settings such as the spam filter or encryption policy. Corresponding spam filters can only be made by an administrator as a domain-wide policy..'; $lang['user']['direct_aliases'] = 'Direct alias addresses'; $lang['user']['direct_aliases_desc'] = 'Direct alias addresses are affected by spam filter and TLS policy settings.'; $lang['user']['is_catch_all'] = 'Catch-all for domain/s';