mirror/mailcow-dockerized
2
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2024-12-09 08:50:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mailcow:staging' into staging

Browse Source
This commit is contained in:
BD 2023-04-13 17:22:13 +02:00 committed by GitHub
commit b4a9df76b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/css/site/mailbox.css
View File

@ -66,4 +66,6 @@ table tbody tr td input[type="checkbox"] {
padding: .2em .4em .3em !important; padding: .2em .4em .3em !important;
background-color: #ececec!important; background-color: #ececec!important;
} }
.badge.bg-info .bi {
font-size: inherit;
}

5
data/web/css/themes/mailcow-darkmode.css
View File

@ -20,6 +20,11 @@ legend {
background-color: #7a7a7a !important; background-color: #7a7a7a !important;
border-color: #5c5c5c !important; border-color: #5c5c5c !important;
} }
.btn-dark {
color: #000 !important;;
background-color: #f6f6f6 !important;;
border-color: #ddd !important;;
}
.btn-check:checked+.btn-secondary, .btn-check:active+.btn-secondary, .btn-secondary:active, .btn-secondary.active, .show>.btn-secondary.dropdown-toggle { .btn-check:checked+.btn-secondary, .btn-check:active+.btn-secondary, .btn-secondary:active, .btn-secondary.active, .show>.btn-secondary.dropdown-toggle {
border-color: #7a7a7a !important; border-color: #7a7a7a !important;
} }

4
data/web/js/site/mailbox.js
View File

@ -1952,6 +1952,10 @@ jQuery(function($){
table.on('responsive-resize', function (e, datatable, columns){ table.on('responsive-resize', function (e, datatable, columns){
hideTableExpandCollapseBtn('#tab-mbox-aliases', '#alias_table'); hideTableExpandCollapseBtn('#tab-mbox-aliases', '#alias_table');
}); });
table.on( 'draw', function (){
$('#alias_table [data-bs-toggle="tooltip"]').tooltip();
});
} }
function draw_aliasdomain_table() { function draw_aliasdomain_table() {
// just recalc width if instance already exists // just recalc width if instance already exists

9
data/web/lang/lang.cs-cz.json
View File

@ -105,7 +105,8 @@
"timeout2": "Časový limit pro připojení k lokálnímu serveru", "timeout2": "Časový limit pro připojení k lokálnímu serveru",
"username": "Uživatelské jméno", "username": "Uživatelské jméno",
"validate": "Ověřit", "validate": "Ověřit",
"validation_success": "Úspěšně ověřeno" "validation_success": "Úspěšně ověřeno",
"tags": "Štítky"
}, },
"admin": { "admin": {
"access": "Přístupy", "access": "Přístupy",
@ -333,7 +334,11 @@
"username": "Uživatelské jméno", "username": "Uživatelské jméno",
"validate_license_now": "Ověřit GUID na licenčním serveru", "validate_license_now": "Ověřit GUID na licenčním serveru",
"verify": "Ověřit", "verify": "Ověřit",
"yes": "✓" "yes": "✓",
"f2b_ban_time_increment": "Délka banu je prodlužována s každým dalším banem",
"f2b_max_ban_time": "Maximální délka banu (s)",
"ip_check": "Kontrola IP",
"ip_check_disabled": "Kontrola IP je vypnuta. Můžete ji zapnout v <br> <strong>System > Nastavení > Options > Přizpůsobení</strong>"
}, },
"danger": { "danger": {
"access_denied": "Přístup odepřen nebo jsou neplatná data ve formuláři", "access_denied": "Přístup odepřen nebo jsou neplatná data ve formuláři",

18
data/web/templates/edit/mailbox.twig
View File

@ -109,25 +109,25 @@
<label class="control-label col-sm-2">{{ lang.user.quarantine_notification }}</label> <label class="control-label col-sm-2">{{ lang.user.quarantine_notification }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<div class="btn-group" data-acl="{{ acl.quarantine_notification }}"> <div class="btn-group" data-acl="{{ acl.quarantine_notification }}">
<button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-secondary{% if quarantine_notification == 'never' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-light{% if quarantine_notification == 'never' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailbox }}" data-item="{{ mailbox }}"
data-id="quarantine_notification" data-id="quarantine_notification"
data-api-url='edit/quarantine_notification' data-api-url='edit/quarantine_notification'
data-api-attr='{"quarantine_notification":"never"}'>{{ lang.user.never }}</button> data-api-attr='{"quarantine_notification":"never"}'>{{ lang.user.never }}</button>
<button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-secondary{% if quarantine_notification == 'hourly' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-light{% if quarantine_notification == 'hourly' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailbox }}" data-item="{{ mailbox }}"
data-id="quarantine_notification" data-id="quarantine_notification"
data-api-url='edit/quarantine_notification' data-api-url='edit/quarantine_notification'
data-api-attr='{"quarantine_notification":"hourly"}'>{{ lang.user.hourly }}</button> data-api-attr='{"quarantine_notification":"hourly"}'>{{ lang.user.hourly }}</button>
<button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-secondary{% if quarantine_notification == 'daily' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-light{% if quarantine_notification == 'daily' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailbox }}" data-item="{{ mailbox }}"
data-id="quarantine_notification" data-id="quarantine_notification"
data-api-url='edit/quarantine_notification' data-api-url='edit/quarantine_notification'
data-api-attr='{"quarantine_notification":"daily"}'>{{ lang.user.daily }}</button> data-api-attr='{"quarantine_notification":"daily"}'>{{ lang.user.daily }}</button>
<button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-secondary{% if quarantine_notification == 'weekly' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-light{% if quarantine_notification == 'weekly' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailbox }}" data-item="{{ mailbox }}"
data-id="quarantine_notification" data-id="quarantine_notification"
@ -141,19 +141,19 @@
<label class="control-label col-sm-2">{{ lang.user.quarantine_category }}</label> <label class="control-label col-sm-2">{{ lang.user.quarantine_category }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<div class="btn-group" data-acl="{{ acl.quarantine_category }}"> <div class="btn-group" data-acl="{{ acl.quarantine_category }}">
<button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-secondary{% if quarantine_category == 'reject' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-light{% if quarantine_category == 'reject' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailbox }}" data-item="{{ mailbox }}"
data-id="quarantine_category" data-id="quarantine_category"
data-api-url='edit/quarantine_category' data-api-url='edit/quarantine_category'
data-api-attr='{"quarantine_category":"reject"}'>{{ lang.user.q_reject }}</button> data-api-attr='{"quarantine_category":"reject"}'>{{ lang.user.q_reject }}</button>
<button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-secondary{% if quarantine_category == 'add_header' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-light{% if quarantine_category == 'add_header' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailbox }}" data-item="{{ mailbox }}"
data-id="quarantine_category" data-id="quarantine_category"
data-api-url='edit/quarantine_category' data-api-url='edit/quarantine_category'
data-api-attr='{"quarantine_category":"add_header"}'>{{ lang.user.q_add_header }}</button> data-api-attr='{"quarantine_category":"add_header"}'>{{ lang.user.q_add_header }}</button>
<button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-secondary{% if quarantine_category == 'all' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-light{% if quarantine_category == 'all' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailbox }}" data-item="{{ mailbox }}"
data-id="quarantine_category" data-id="quarantine_category"
@ -167,13 +167,13 @@
<label class="control-label col-sm-2" for="sender_acl">{{ lang.user.tls_policy }}</label> <label class="control-label col-sm-2" for="sender_acl">{{ lang.user.tls_policy }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<div class="btn-group" data-acl="{{ acl.tls_policy }}"> <div class="btn-group" data-acl="{{ acl.tls_policy }}">
<button type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary{% if get_tls_policy.tls_enforce_in == '1' %} active"{% endif %}" <button type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-light{% if get_tls_policy.tls_enforce_in == '1' %} btn-dark"{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailbox }}" data-item="{{ mailbox }}"
data-id="tls_policy" data-id="tls_policy"
data-api-url='edit/tls_policy' data-api-url='edit/tls_policy'
data-api-attr='{"tls_enforce_in": {% if get_tls_policy.tls_enforce_in == '1' %}0{% else %}1{% endif %} }'>{{ lang.user.tls_enforce_in }}</button> data-api-attr='{"tls_enforce_in": {% if get_tls_policy.tls_enforce_in == '1' %}0{% else %}1{% endif %} }'>{{ lang.user.tls_enforce_in }}</button>
<button type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary{% if get_tls_policy.tls_enforce_out == '1' %} active"{% endif %}" <button type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-light{% if get_tls_policy.tls_enforce_out == '1' %} btn-dark"{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailbox }}" data-item="{{ mailbox }}"
data-id="tls_policy" data-id="tls_policy"

24
data/web/templates/user/tab-user-settings.twig
View File

@ -12,19 +12,19 @@
<div class="col-sm-3 col-12 text-sm-end text-start text-xs-bold mb-4">{{ lang.user.tag_handling }}:</div> <div class="col-sm-3 col-12 text-sm-end text-start text-xs-bold mb-4">{{ lang.user.tag_handling }}:</div>
<div class="col-sm-9 col-12"> <div class="col-sm-9 col-12">
<div class="btn-group" data-acl="{{ acl.delimiter_action }}"> <div class="btn-group" data-acl="{{ acl.delimiter_action }}">
<button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-secondary{% if get_tagging_options == 'subfolder' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-light{% if get_tagging_options == 'subfolder' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="delimiter_action" data-id="delimiter_action"
data-api-url='edit/delimiter_action' data-api-url='edit/delimiter_action'
data-api-attr='{"tagged_mail_handler":"subfolder"}'>{{ lang.user.tag_in_subfolder }}</button> data-api-attr='{"tagged_mail_handler":"subfolder"}'>{{ lang.user.tag_in_subfolder }}</button>
<button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-secondary{% if get_tagging_options == 'subject' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-light{% if get_tagging_options == 'subject' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="delimiter_action" data-id="delimiter_action"
data-api-url='edit/delimiter_action' data-api-url='edit/delimiter_action'
data-api-attr='{"tagged_mail_handler":"subject"}'>{{ lang.user.tag_in_subject }}</button> data-api-attr='{"tagged_mail_handler":"subject"}'>{{ lang.user.tag_in_subject }}</button>
<button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-secondary{% if get_tagging_options == 'none' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-light{% if get_tagging_options == 'none' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="delimiter_action" data-id="delimiter_action"
@ -40,13 +40,13 @@
<div class="col-sm-3 col-12 text-sm-end text-start text-xs-bold mb-4">{{ lang.user.tls_policy }}:</div> <div class="col-sm-3 col-12 text-sm-end text-start text-xs-bold mb-4">{{ lang.user.tls_policy }}:</div>
<div class="col-sm-9 col-12"> <div class="col-sm-9 col-12">
<div class="btn-group" data-acl="{{ acl.tls_policy }}"> <div class="btn-group" data-acl="{{ acl.tls_policy }}">
<button type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary{% if get_tls_policy.tls_enforce_in == '1' %} active"{% endif %}" <button type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-light{% if get_tls_policy.tls_enforce_in == '1' %} btn-dark"{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="tls_policy" data-id="tls_policy"
data-api-url='edit/tls_policy' data-api-url='edit/tls_policy'
data-api-attr='{"tls_enforce_in": {% if get_tls_policy.tls_enforce_in == '1' %}0{% else %}1{% endif %} }'>{{ lang.user.tls_enforce_in }}</button> data-api-attr='{"tls_enforce_in": {% if get_tls_policy.tls_enforce_in == '1' %}0{% else %}1{% endif %} }'>{{ lang.user.tls_enforce_in }}</button>
<button type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary{% if get_tls_policy.tls_enforce_out == '1' %} active"{% endif %}" <button type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-light{% if get_tls_policy.tls_enforce_out == '1' %} btn-dark"{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="tls_policy" data-id="tls_policy"
@ -61,25 +61,25 @@
<div class="col-sm-3 col-12 text-sm-end text-start text-xs-bold mb-4">{{ lang.user.quarantine_notification }}:</div> <div class="col-sm-3 col-12 text-sm-end text-start text-xs-bold mb-4">{{ lang.user.quarantine_notification }}:</div>
<div class="col-sm-9 col-12"> <div class="col-sm-9 col-12">
<div class="btn-group" data-acl="{{ acl.quarantine_notification }}"> <div class="btn-group" data-acl="{{ acl.quarantine_notification }}">
<button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-secondary{% if quarantine_notification == 'never' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-light{% if quarantine_notification == 'never' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="quarantine_notification" data-id="quarantine_notification"
data-api-url='edit/quarantine_notification' data-api-url='edit/quarantine_notification'
data-api-attr='{"quarantine_notification":"never"}'>{{ lang.user.never }}</button> data-api-attr='{"quarantine_notification":"never"}'>{{ lang.user.never }}</button>
<button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-secondary{% if quarantine_notification == 'hourly' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-light{% if quarantine_notification == 'hourly' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="quarantine_notification" data-id="quarantine_notification"
data-api-url='edit/quarantine_notification' data-api-url='edit/quarantine_notification'
data-api-attr='{"quarantine_notification":"hourly"}'>{{ lang.user.hourly }}</button> data-api-attr='{"quarantine_notification":"hourly"}'>{{ lang.user.hourly }}</button>
<button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-secondary{% if quarantine_notification == 'daily' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-light{% if quarantine_notification == 'daily' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="quarantine_notification" data-id="quarantine_notification"
data-api-url='edit/quarantine_notification' data-api-url='edit/quarantine_notification'
data-api-attr='{"quarantine_notification":"daily"}'>{{ lang.user.daily }}</button> data-api-attr='{"quarantine_notification":"daily"}'>{{ lang.user.daily }}</button>
<button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-secondary{% if quarantine_notification == 'weekly' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-quart d-block d-sm-inline btn-light{% if quarantine_notification == 'weekly' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="quarantine_notification" data-id="quarantine_notification"
@ -93,19 +93,19 @@
<div class="col-sm-3 col-12 text-sm-end text-start text-xs-bold mb-4">{{ lang.user.quarantine_category }}:</div> <div class="col-sm-3 col-12 text-sm-end text-start text-xs-bold mb-4">{{ lang.user.quarantine_category }}:</div>
<div class="col-sm-9 col-12"> <div class="col-sm-9 col-12">
<div class="btn-group" data-acl="{{ acl.quarantine_category }}"> <div class="btn-group" data-acl="{{ acl.quarantine_category }}">
<button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-secondary{% if quarantine_category == 'reject' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-light{% if quarantine_category == 'reject' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="quarantine_category" data-id="quarantine_category"
data-api-url='edit/quarantine_category' data-api-url='edit/quarantine_category'
data-api-attr='{"quarantine_category":"reject"}'>{{ lang.user.q_reject }}</button> data-api-attr='{"quarantine_category":"reject"}'>{{ lang.user.q_reject }}</button>
<button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-secondary{% if quarantine_category == 'add_header' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-light{% if quarantine_category == 'add_header' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="quarantine_category" data-id="quarantine_category"
data-api-url='edit/quarantine_category' data-api-url='edit/quarantine_category'
data-api-attr='{"quarantine_category":"add_header"}'>{{ lang.user.q_add_header }}</button> data-api-attr='{"quarantine_category":"add_header"}'>{{ lang.user.q_add_header }}</button>
<button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-secondary{% if quarantine_category == 'all' %} active{% endif %}" <button type="button" class="btn btn-sm btn-xs-third d-block d-sm-inline btn-light{% if quarantine_category == 'all' %} btn-dark{% endif %}"
data-action="edit_selected" data-action="edit_selected"
data-item="{{ mailcow_cc_username }}" data-item="{{ mailcow_cc_username }}"
data-id="quarantine_category" data-id="quarantine_category"