git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/web/templates/modals/admin.twig b/mailcow/src/mailcow-dockerized/data/web/templates/modals/admin.twig
index a545404..15971e5 100644
--- a/mailcow/src/mailcow-dockerized/data/web/templates/modals/admin.twig
+++ b/mailcow/src/mailcow-dockerized/data/web/templates/modals/admin.twig
@@ -1,40 +1,40 @@
<!-- add settings rule modal -->
-<div class="modal fade" id="addRsettingModal" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-dialog modal-lg">
+<div class="modal fade" id="addRsettingModal" tabindex="-1" role="dialog" aria-hidden="false">
+ <div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span></button>
<h3 class="modal-title">{{ lang.admin.add_settings_rule }}</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form class="form-horizontal" data-cached-form="true" data-id="rsetting" role="form" method="post">
- <div class="form-group">
- <label class="control-label col-sm-2" for="desc">{{ lang.admin.rsetting_desc }}:</label>
+ <div class="row mb-2">
+ <label class="control-label col-sm-2 text-sm-end" for="desc">{{ lang.admin.rsetting_desc }}:</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="adminRspamdSettingsDesc" name="desc" required>
</div>
</div>
- <div class="form-group">
- <label class="control-label col-sm-2" for="content">{{ lang.admin.rsetting_content }}:</label>
+ <div class="row mb-4">
+ <label class="control-label col-sm-2 text-sm-end" for="content">{{ lang.admin.rsetting_content }}:</label>
<div class="col-sm-10">
<textarea class="form-control" id="adminRspamdSettingsContent" name="content" rows="10"></textarea>
</div>
</div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
+ <div class="row mb-2">
+ <div class="offset-sm-2 col-sm-10">
<div class="checkbox">
<label><input type="checkbox" value="1" name="active" checked> {{ lang.admin.active }}</label>
</div>
</div>
</div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
- <button class="btn btn-xs-lg visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-success" data-action="add_item" data-id="rsetting" data-api-url='add/rsetting' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
+ <div class="row mb-4">
+ <div class="offset-sm-2 col-sm-10">
+ <button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="rsetting" data-api-url='add/rsetting' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
</div>
</div>
</form>
<hr>
- <p>{{ lang.admin.rspamd-com_settings }}</p>
+ <p>{{ lang.admin.rspamd_com_settings | raw }}</p>
<ul id="rspamd_presets"></ul>
</div>
</div>
@@ -42,23 +42,23 @@
</div><!-- add settings rule modal -->
<!-- add domain admin modal -->
<div class="modal fade" id="addDomainAdminModal" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-dialog modal-lg">
+ <div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span></button>
<h3 class="modal-title">{{ lang.admin.add_domain_admin }}</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form class="form-horizontal" data-cached-form="true" data-id="add_domain_admin" role="form" method="post" autocomplete="off">
- <div class="form-group">
- <label class="control-label col-sm-2" for="username">{{ lang.admin.username }}:</label>
+ <div class="row mb-2">
+ <label class="control-label col-sm-2 text-sm-end" for="username">{{ lang.admin.username }}:</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="username" onkeyup="this.value = this.value.toLowerCase();" required>
↳ <kbd>a-z - _ .</kbd>
</div>
</div>
- <div class="form-group">
- <label class="control-label col-sm-2" for="name">{{ lang.admin.admin_domains }}:</label>
+ <div class="row mb-4">
+ <label class="control-label col-sm-2 text-sm-end" for="name">{{ lang.admin.admin_domains }}:</label>
<div class="col-sm-10">
<select title="{{ lang.admin.search_domain_da }}" class="full-width-select" name="domains" size="5" multiple>
{% for domain in domains %}
@@ -67,28 +67,28 @@
</select>
</div>
</div>
- <div class="form-group">
- <label class="control-label col-sm-2" for="password">{{ lang.admin.password }} (<a href="#" class="generate_password">{{ lang.admin.generate }}</a>)</label>
+ <div class="row mb-2">
+ <label class="control-label col-sm-2 text-sm-end" for="password">{{ lang.admin.password }} (<a href="#" class="generate_password">{{ lang.admin.generate }}</a>)</label>
<div class="col-sm-10">
<input type="password" class="form-control" data-pwgen-field="true" data-hibp="true" name="password" placeholder="" autocomplete="new-password" required>
</div>
</div>
- <div class="form-group">
- <label class="control-label col-sm-2" for="password2">{{ lang.admin.password_repeat }}:</label>
+ <div class="row mb-4">
+ <label class="control-label col-sm-2 text-sm-end" for="password2">{{ lang.admin.password_repeat }}:</label>
<div class="col-sm-10">
<input type="password" class="form-control" data-pwgen-field="true" name="password2" placeholder="" autocomplete="new-password" required>
</div>
</div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
+ <div class="row mb-2">
+ <div class="offset-sm-2 col-sm-10">
<div class="checkbox">
<label><input type="checkbox" value="1" name="active" checked> {{ lang.admin.active }}</label>
</div>
</div>
</div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
- <button class="btn btn-xs-lg visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-success" data-action="add_item" data-id="add_domain_admin" data-api-url='add/domain-admin' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
+ <div class="row mb-4">
+ <div class="offset-sm-2 col-sm-10">
+ <button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="add_domain_admin" data-api-url='add/domain-admin' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
</div>
</div>
</form>
@@ -98,25 +98,25 @@
</div><!-- add domain admin modal -->
<!-- change fido2 fn -->
<div class="modal fade" id="fido2ChangeFn" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-dialog modal-lg">
+ <div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span></button>
<h3 class="modal-title">{{ lang.fido2.set_fn }}</h3>
- <p class="help-block" style="word-break:break-all" id="fido2_subject_desc" data-fido2-subject=""></p>
+ <p class="text-muted" style="word-break:break-all" id="fido2_subject_desc" data-fido2-subject=""></p>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form class="form-horizontal" data-cached-form="false" data-id="fido2ChangeFn" role="form" method="post" autocomplete="off">
<input type="hidden" class="form-control" name="fido2_cid" id="fido2_cid">
- <div class="form-group">
+ <div class="row mb-4">
<label class="control-label col-sm-4" for="fido2_fn">{{ lang.fido2.fn }}:</label>
<div class="col-sm-8">
<input type="text" class="form-control" name="fido2_fn">
</div>
</div>
- <div class="form-group">
- <div class="col-sm-offset-4 col-sm-8">
- <button class="btn btn-xs-lg visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-success" data-action="edit_selected" data-id="fido2ChangeFn" data-item="null" data-api-url='edit/fido2-fn' data-api-attr='{}' href="#">{{ lang.admin.save }}</button>
+ <div class="row mb-4">
+ <div class="offset-sm-4 col-sm-8">
+ <button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="edit_selected" data-id="fido2ChangeFn" data-item="null" data-api-url='edit/fido2-fn' data-api-attr='{}' href="#">{{ lang.admin.save }}</button>
</div>
</div>
</form>
@@ -126,23 +126,23 @@
</div><!-- add domain admin modal -->
<!-- add oauth2 client modal -->
<div class="modal fade" id="addOAuth2ClientModal" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-dialog modal-lg">
+ <div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span></button>
<h3 class="modal-title">OAuth2</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form class="form-horizontal" data-cached-form="true" data-id="add_oauth2_client" role="form" method="post">
- <div class="form-group">
- <label class="control-label col-sm-2" for="redirect_uri">{{ lang.admin.oauth2_redirect_uri }}:</label>
+ <div class="row mb-4">
+ <label class="control-label col-sm-2 text-sm-end" for="redirect_uri">{{ lang.admin.oauth2_redirect_uri }}:</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="redirect_uri" required>
</div>
</div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
- <button class="btn btn-xs-lg visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-success" data-action="add_item" data-id="add_oauth2_client" data-api-url='add/oauth2-client' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
+ <div class="row mb-4">
+ <div class="offset-sm-2 col-sm-10">
+ <button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="add_oauth2_client" data-api-url='add/oauth2-client' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
</div>
</div>
</form>
@@ -152,43 +152,43 @@
</div><!-- add domain admin modal -->
<!-- add admin modal -->
<div class="modal fade" id="addAdminModal" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-dialog modal-lg">
+ <div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span></button>
<h3 class="modal-title">{{ lang.admin.add_admin }}</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form class="form-horizontal" data-cached-form="true" data-id="add_admin" role="form" method="post" autocomplete="off">
- <div class="form-group">
- <label class="control-label col-sm-2" for="username">{{ lang.admin.username }}:</label>
+ <div class="row mb-4">
+ <label class="control-label col-sm-2 text-sm-end" for="username">{{ lang.admin.username }}:</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="username" onkeyup="this.value = this.value.toLowerCase();" required>
↳ <kbd>a-z - _ .</kbd>
</div>
</div>
- <div class="form-group">
- <label class="control-label col-sm-2" for="password">{{ lang.admin.password }} (<a href="#" class="generate_password">{{ lang.admin.generate }}</a>):</label>
+ <div class="row mb-2">
+ <label class="control-label col-sm-2 text-sm-end" for="password">{{ lang.admin.password }} (<a href="#" class="generate_password">{{ lang.admin.generate }}</a>):</label>
<div class="col-sm-10">
<input type="password" class="form-control" data-pwgen-field="true" data-hibp="true" name="password" placeholder="" autocomplete="new-password" required>
</div>
</div>
- <div class="form-group">
- <label class="control-label col-sm-2" for="password2">{{ lang.admin.password_repeat }}:</label>
+ <div class="row mb-4">
+ <label class="control-label col-sm-2 text-sm-end" for="password2">{{ lang.admin.password_repeat }}:</label>
<div class="col-sm-10">
<input type="password" class="form-control" data-pwgen-field="true" name="password2" placeholder="" autocomplete="new-password" required>
</div>
</div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
+ <div class="row mb-2">
+ <div class="offset-sm-2 col-sm-10">
<div class="checkbox">
<label><input type="checkbox" value="1" name="active" checked> {{ lang.admin.active }}</label>
</div>
</div>
</div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
- <button class="btn btn-xs-lg visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-success" data-action="add_item" data-id="add_admin" data-api-url='add/admin' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
+ <div class="row mb-4">
+ <div class="offset-sm-2 col-sm-10">
+ <button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="add_admin" data-api-url='add/admin' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
</div>
</div>
</form>
@@ -198,32 +198,32 @@
</div><!-- add admin modal -->
<!-- test transport modal -->
<div class="modal fade" id="testTransportModal" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-dialog modal-lg">
+ <div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span></button>
<h3 class="modal-title"><i class="bi bi-info-circle-fill"></i> Transport</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form class="form-horizontal" data-cached-form="true" id="test_transport_form" role="form" method="post">
<input type="hidden" class="form-control" name="transport_id" id="transport_id">
<input type="hidden" class="form-control" name="transport_type" id="transport_type">
- <div class="form-group">
- <label class="control-label col-sm-2" for="mail_from">{{ lang.admin.relay_from }}</label>
+ <div class="row mb-2">
+ <label class="control-label col-sm-2 text-sm-end" for="mail_from">{{ lang.admin.relay_from }}</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="mail_from" placeholder="relay@example.org">
</div>
</div>
- <div class="form-group">
- <label class="control-label col-sm-2" for="mail_rcpt">{{ lang.admin.relay_rcpt }}</label>
+ <div class="row mb-4">
+ <label class="control-label col-sm-2 text-sm-end" for="mail_rcpt">{{ lang.admin.relay_rcpt }}</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="mail_rcpt" placeholder="null@hosted.mailcow.de" value="null@hosted.mailcow.de">
- <p class="help-block">{{ lang.admin.transport_test_rcpt_info|raw }}</p>
+ <p class="text-muted">{{ lang.admin.transport_test_rcpt_info|raw }}</p>
</div>
</div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
- <button class="btn btn-xs-lg visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-default" id="test_transport" href="#">{{ lang.admin.relay_run }}</button>
+ <div class="row mb-4">
+ <div class="offset-sm-2 col-sm-10">
+ <button class="btn btn-xs-lg d-block d-sm-inline btn-secondary" id="test_transport" href="#">{{ lang.admin.relay_run }}</button>
</div>
</div>
</form>
@@ -233,27 +233,13 @@
</div>
</div>
</div><!-- test transport modal -->
-<!-- show queue item modal -->
-<div class="modal fade" id="showQueuedMsg" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-dialog modal-lg">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span></button>
- <h3 class="modal-title"><i class="bi bi-card-checklist" style="font-size:18px"></i> ID <span id="queue_id"></span></h3>
- </div>
- <div class="modal-body">
- <textarea class="form-control" id="queue_msg_content" name="content" rows="40"></textarea>
- </div>
- </div>
- </div>
-</div><!-- show queue item modal -->
<!-- priv key modal -->
<div class="modal fade" id="showDKIMprivKey" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span></button>
<h3 class="modal-title"><i class="bi bi-key-fill"></i> Private key</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<pre id="priv_key_pre"></pre>