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/domainadmin.twig b/mailcow/src/mailcow-dockerized/data/web/templates/domainadmin.twig
index 6aae54b..56f5e75 100644
--- a/mailcow/src/mailcow-dockerized/data/web/templates/domainadmin.twig
+++ b/mailcow/src/mailcow-dockerized/data/web/templates/domainadmin.twig
@@ -2,12 +2,12 @@
{% block content %}
<h3>{{ lang.user.user_settings }}</h3>
-<div class="panel panel-default">
- <div class="panel-heading">{{ lang.user.user_settings }}</div>
- <div class="panel-body">
+<div class="card">
+ <div class="card-header">{{ lang.user.user_settings }}</div>
+ <div class="card-body">
<div class="row">
- <div class="col-sm-offset-3 col-sm-9">
- <p><a href="#pwChangeModal" data-toggle="modal">[{{ lang.user.change_password }}]</a></p>
+ <div class="offset-sm-3 col-sm-9">
+ <p><a href="#pwChangeModal" data-bs-toggle="modal">[{{ lang.user.change_password }}]</a></p>
<div class="last-login"></div>
<span class="clear-last-logins">{{ lang.user.clear_recent_successful_connections }}</span>
</div>
@@ -16,19 +16,19 @@
{# TFA #}
<div class="row">
- <div class="col-sm-3 col-xs-5 text-right">{{ lang.tfa.tfa }}</div>
- <div class="col-sm-9 col-xs-7">
+ <div class="col-sm-3 col-5 text-end">{{ lang.tfa.tfa }}</div>
+ <div class="col-sm-9 col-7">
<p id="tfa_pretty">{{ tfa_data.pretty }}</p>
{% include 'tfa_keys.twig' %}
<br>
</div>
</div>
<div class="row">
- <div class="col-sm-3 col-xs-5 text-right">{{ lang.tfa.set_tfa }}</div>
- <div class="col-sm-9 col-xs-7">
+ <div class="col-sm-3 col-5 text-end">{{ lang.tfa.set_tfa }}</div>
+ <div class="col-sm-9 col-7">
<select id="selectTFA" class="selectpicker" title="{{ lang.tfa.select }}">
<option value="yubi_otp">{{ lang.tfa.yubi_otp }}</option>
- <option value="u2f">{{ lang.tfa.u2f }}</option>
+ <option value="webauthn">{{ lang.tfa.webauthn }}</option>
<option value="totp">{{ lang.tfa.totp }}</option>
<option value="none">{{ lang.tfa.none }}</option>
</select>
@@ -38,13 +38,13 @@
<hr>
{# FIDO2 #}
<div class="row">
- <div class="col-sm-3 col-xs-5 text-right">
+ <div class="col-sm-3 col-5 text-end">
<p><i class="bi bi-shield-fill-check"></i> {{ lang.fido2.fido2_auth }}</p>
</div>
</div>
<div class="row">
- <div class="col-sm-3 col-xs-5 text-right">{{ lang.fido2.known_ids }}:</div>
- <div class="col-sm-9 col-xs-7">
+ <div class="col-sm-3 col-5 text-end">{{ lang.fido2.known_ids }}:</div>
+ <div class="col-sm-9 col-7">
<div class="table-responsive">
<table class="table table-striped table-hover table-condensed" id="fido2_keys">
<tr>
@@ -58,22 +58,20 @@
</div>
</div>
<div class="row">
- <div class="col-sm-offset-3 col-sm-9">
+ <div class="offset-sm-3 col-sm-9">
<div class="btn-group">
<button class="btn btn-sm btn-primary" id="register-fido2">{{ lang.fido2.set_fido2 }}</button>
- <button type="button" class="btn btn-sm btn-xs-lg btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <span class="caret"></span>
- </button>
+ <button type="button" class="btn btn-sm btn-xs-lg btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
<ul class="dropdown-menu">
- <li><a href="#" id="register-fido2-touchid" style="line-height:1.4;"><i class="bi bi-shield-fill-check"></i> {{ lang.fido2.set_fido2_touchid }}</a></li>
+ <li><a class="dropdown-item" href="#" id="register-fido2-touchid"><i class="bi bi-shield-fill-check"></i> {{ lang.fido2.set_fido2_touchid }}</a></li>
</ul>
</div>
</div>
</div>
<br>
<div class="row" id="status-fido2">
- <div class="col-sm-3 col-xs-5 text-right">{{ lang.fido2.register_status }}:</div>
- <div class="col-sm-9 col-xs-7">
+ <div class="col-sm-3 col-5 text-end">{{ lang.fido2.register_status }}:</div>
+ <div class="col-sm-9 col-7">
<div id="fido2-alerts">-</div>
</div>
<br>