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/footer.twig b/mailcow/src/mailcow-dockerized/data/web/templates/modals/footer.twig
index 8e5cb17..ab5630d 100644
--- a/mailcow/src/mailcow-dockerized/data/web/templates/modals/footer.twig
+++ b/mailcow/src/mailcow-dockerized/data/web/templates/modals/footer.twig
@@ -3,69 +3,69 @@
<div class="modal-dialog" role="document">
<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.tfa.yubi_otp }}</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form role="form" method="post">
- <div class="form-group">
+ <div class="mb-4">
<input type="text" class="form-control" name="key_id" placeholder="{{ lang.tfa.key_id }}" autocomplete="off" required>
</div>
<hr>
- <p class="help-block">{{ lang.tfa.api_register|format(ui_texts.main_name)|raw }}</p>
- <div class="form-group">
+ <p class="text-muted">{{ lang.tfa.api_register|format(ui_texts.main_name)|raw }}</p>
+ <div class="mb-2">
<input type="text" class="form-control" name="yubico_id" placeholder="Yubico API ID" autocomplete="off" required>
</div>
- <div class="form-group">
+ <div class="mb-4">
<input type="text" class="form-control" name="yubico_key" placeholder="Yubico API Key" autocomplete="off" required>
</div>
<hr>
- <div class="form-group">
+ <div class="mb-4">
<input type="password" class="form-control" name="confirm_password" placeholder="{{ lang.user.password_now }}" autocomplete="off" required>
</div>
- <div class="form-group">
+ <div class="mb-4">
<div class="input-group">
- <span class="input-group-addon" id="yubi-addon"><img alt="Yubicon Icon" src="/img/yubi.ico"></span>
+ <span class="input-group-text" id="yubi-addon"><img alt="Yubicon Icon" src="/img/yubi.ico"></span>
<input type="text" name="otp_token" class="form-control" placeholder="Touch Yubikey" aria-describedby="yubi-addon">
<input type="hidden" name="tfa_method" value="yubi_otp">
</div>
</div>
- <button class="btn btn-sm visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-success" type="submit" name="set_tfa">{{ lang.user.save_changes }}</button>
+ <button class="btn btn-sm d-block d-sm-inline btn-success" type="submit" name="set_tfa">{{ lang.user.save_changes }}</button>
</form>
</div>
</div>
</div>
</div>
-<div class="modal fade" id="U2FModal" tabindex="-1" role="dialog" aria-labelledby="U2FModalLabel">
+<div class="modal fade" id="WebAuthnModal" tabindex="-1" role="dialog" aria-labelledby="WebAuthnModalLabel">
<div class="modal-dialog" role="document">
<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.tfa.u2f }}</h3>
+ <h3 class="modal-title">{{ lang.tfa.webauthn }}</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
- <form role="form" method="post" id="u2f_reg_form">
- <div class="form-group">
+ <form class="d-flex flex-column" role="form" method="post" id="webauthn_reg_form">
+ <div class="mb-2">
<input type="text" class="form-control" name="key_id" placeholder="{{ lang.tfa.key_id }}" autocomplete="off" required>
</div>
- <div class="form-group">
+ <div class="mb-4">
<input type="password" class="form-control" name="confirm_password" placeholder="{{ lang.user.password_now }}" autocomplete="off" required>
</div>
<hr>
- <center>
- <div style="cursor:pointer" id="start_u2f_register">
+ <div class="text-center">
+ <div style="cursor:pointer" id="start_webauthn_register">
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 24 24">
<path d="M17.81 4.47c-.08 0-.16-.02-.23-.06C15.66 3.42 14 3 12.01 3c-1.98 0-3.86.47-5.57 1.41-.24.13-.54.04-.68-.2-.13-.24-.04-.55.2-.68C7.82 2.52 9.86 2 12.01 2c2.13 0 3.99.47 6.03 1.52.25.13.34.43.21.67-.09.18-.26.28-.44.28zM3.5 9.72c-.1 0-.2-.03-.29-.09-.23-.16-.28-.47-.12-.7.99-1.4 2.25-2.5 3.75-3.27C9.98 4.04 14 4.03 17.15 5.65c1.5.77 2.76 1.86 3.75 3.25.16.22.11.54-.12.7-.23.16-.54.11-.7-.12-.9-1.26-2.04-2.25-3.39-2.94-2.87-1.47-6.54-1.47-9.4.01-1.36.7-2.5 1.7-3.4 2.96-.08.14-.23.21-.39.21zm6.25 12.07c-.13 0-.26-.05-.35-.15-.87-.87-1.34-1.43-2.01-2.64-.69-1.23-1.05-2.73-1.05-4.34 0-2.97 2.54-5.39 5.66-5.39s5.66 2.42 5.66 5.39c0 .28-.22.5-.5.5s-.5-.22-.5-.5c0-2.42-2.09-4.39-4.66-4.39-2.57 0-4.66 1.97-4.66 4.39 0 1.44.32 2.77.93 3.85.64 1.15 1.08 1.64 1.85 2.42.19.2.19.51 0 .71-.11.1-.24.15-.37.15zm7.17-1.85c-1.19 0-2.24-.3-3.1-.89-1.49-1.01-2.38-2.65-2.38-4.39 0-.28.22-.5.5-.5s.5.22.5.5c0 1.41.72 2.74 1.94 3.56.71.48 1.54.71 2.54.71.24 0 .64-.03 1.04-.1.27-.05.53.13.58.41.05.27-.13.53-.41.58-.57.11-1.07.12-1.21.12zM14.91 22c-.04 0-.09-.01-.13-.02-1.59-.44-2.63-1.03-3.72-2.1-1.4-1.39-2.17-3.24-2.17-5.22 0-1.62 1.38-2.94 3.08-2.94 1.7 0 3.08 1.32 3.08 2.94 0 1.07.93 1.94 2.08 1.94s2.08-.87 2.08-1.94c0-3.77-3.25-6.83-7.25-6.83-2.84 0-5.44 1.58-6.61 4.03-.39.81-.59 1.76-.59 2.8 0 .78.07 2.01.67 3.61.1.26-.03.55-.29.64-.26.1-.55-.04-.64-.29-.49-1.31-.73-2.61-.73-3.96 0-1.2.23-2.29.68-3.24 1.33-2.79 4.28-4.6 7.51-4.6 4.55 0 8.25 3.51 8.25 7.83 0 1.62-1.38 2.94-3.08 2.94s-3.08-1.32-3.08-2.94c0-1.07-.93-1.94-2.08-1.94s-2.08.87-2.08 1.94c0 1.71.66 3.31 1.87 4.51.95.94 1.86 1.46 3.27 1.85.27.07.42.35.35.61-.05.23-.26.38-.47.38z"></path>
</svg>
- <p>{{ lang.tfa.start_u2f_validation }}</p>
- <hr>
+ <p>{{ lang.tfa.start_webauthn_validation }}</p>
</div>
- </center>
- <p id="u2f_status_reg"></p>
- <div class="alert alert-danger" style="display:none" id="u2f_return_code"></div>
- <input type="hidden" name="token" id="u2f_register_data"/>
- <input type="hidden" name="tfa_method" value="u2f">
+ </div>
+ <hr>
+ <p id="webauthn_status_reg"></p>
+ <div class="alert alert-danger" style="display:none" id="webauthn_return_code"></div>
+ <input type="hidden" name="token" id="webauthn_register_data"/>
+ <input type="hidden" name="tfa_method" value="webauthn">
<input type="hidden" name="set_tfa"/><br/>
</form>
</div>
@@ -77,32 +77,32 @@
<div class="modal-dialog" role="document">
<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.tfa.totp }}</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form role="form" method="post">
- <div class="form-group">
+ <div class="mb-2">
<input type="text" class="form-control" name="key_id" placeholder="{{ lang.tfa.key_id_totp }}" autocomplete="off" required>
</div>
- <div class="form-group">
+ <div class="mb-4">
<input type="password" class="form-control" name="confirm_password" placeholder="{{ lang.user.password_now }}" autocomplete="off" required>
</div>
<hr>
<input type="hidden" value="{{ totp_secret }}" name="totp_secret">
<input type="hidden" name="tfa_method" value="totp">
- <ol>
+ <ol class="mb-4">
<li>
<p>{{ lang.tfa.scan_qr_code }}</p>
<img id="tfa-qr-img" data-totp-secret="{{ totp_secret }}" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=">
- <p class="help-block">{{ lang.tfa.enter_qr_code }}:<br />
+ <p class="text-muted">{{ lang.tfa.enter_qr_code }}:<br />
<code>{{ totp_secret }}</code>
</p>
</li>
<li>
<p>{{ lang.tfa.confirm_totp_token }}:</p>
<p><input type="number" style="width:33%" class="form-control" name="totp_confirm_token" autocomplete="off" required></p>
- <p><button class="btn btn-sm visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-success" type="submit" name="set_tfa">{{ lang.tfa.confirm }}</button></p>
+ <p><button class="btn btn-sm d-block d-sm-inline btn-success" type="submit" name="set_tfa">{{ lang.tfa.confirm }}</button></p>
</li>
</ol>
</form>
@@ -115,78 +115,197 @@
<div class="modal-dialog" role="document">
<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.tfa.delete_tfa }}</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form role="form" method="post">
<div class="input-group">
- <input type="password" class="form-control input-xs-lg" name="confirm_password" placeholder="{{ lang.user.password_now }}" autocomplete="off" required>
- <span class="input-group-btn">
- <input type="hidden" name="tfa_method" value="none">
- <button class="btn btn-sm visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-danger" type="submit" name="set_tfa">{{ lang.tfa.delete_tfa|replace({" ": " "})|raw }}</button>
- </span>
+ <input type="password" class="form-control" name="confirm_password" placeholder="{{ lang.user.password_now }}" autocomplete="off" required>
+ <button class="btn btn-sm d-block d-sm-inline btn-danger" type="submit" name="set_tfa">{{ lang.tfa.delete_tfa|replace({" ": " "})|raw }}</button>
</div>
+ <input type="hidden" name="tfa_method" value="none">
</form>
</div>
</div>
</div>
</div>
{% endif %}
-{% if pending_tfa_method %}
+{% if pending_tfa_methods %}
<div class="modal fade" id="ConfirmTFAModal" tabindex="-1" role="dialog" aria-labelledby="ConfirmTFAModalLabel">
<div class="modal-dialog" role="document">
<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.tfa[pending_tfa_method] }}</h3>
+ <h3 class="modal-title">{{ lang.tfa.tfa }}</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
- <div class="modal-body">
- {% if pending_tfa_method == 'yubi_otp' %}
- <form role="form" method="post">
- <div class="form-group">
- <div class="input-group">
- <span class="input-group-addon" id="yubi-addon"><img alt="Yubicon Icon" src="/img/yubi.ico"></span>
- <input type="text" name="token" class="form-control" autocomplete="off" placeholder="Touch Yubikey" aria-describedby="yubi-addon">
- <input type="hidden" name="tfa_method" value="yubi_otp">
+
+
+ <div class="modal-body p-0 pt-4">
+ <ul class="nav nav-tabs px-1" id="tabContent">
+ {% if pending_tfa_authmechs["webauthn"] is defined and pending_tfa_authmechs["u2f"] is not defined %}
+ <li class="nav-item"><a class="nav-link active" href="#tfa_tab_webauthn" data-bs-toggle="tab" id="pending_tfa_tab_webauthn"><i class="bi bi-fingerprint"></i> WebAuthn</a></li>
+ {% endif %}
+
+ {% if pending_tfa_authmechs["yubi_otp"] is defined and pending_tfa_authmechs["u2f"] is not defined %}
+ <li class="nav-item">
+ <a class="nav-link {% if pending_tfa_authmechs["yubi_otp"] %}active{% endif %}" href="#tfa_tab_yubi_otp" data-bs-toggle="tab" id="pending_tfa_tab_yubi_otp"><i class="bi bi-usb-drive"></i> Yubi OTP</a>
+ </li>
+ {% endif %}
+
+ {% if pending_tfa_authmechs["totp"] is defined and pending_tfa_authmechs["u2f"] is not defined %}
+ <li class="nav-item">
+ <a class="nav-link {% if pending_tfa_authmechs["totp"] %}active{% endif %}" href="#tfa_tab_totp" data-bs-toggle="tab" id="pending_tfa_tab_totp"><i class="bi bi-clock-history"></i> Time based OTP</a>
+ </li>
+ {% endif %}
+
+ <!-- <li class="nav-item"><a class="nav-link" href="#tfa_tab_hotp" data-bs-toggle="tab">HOTP</a></li> -->
+ {% if pending_tfa_authmechs["u2f"] is defined %}
+ <li class="nav-item"><a class="nav-link active" href="#tfa_tab_u2f" data-bs-toggle="tab"><i class="bi bi-x-octagon"></i> U2F</a></li>
+ {% endif %}
+ </ul>
+
+ <div class="tab-content">
+ {% if pending_tfa_authmechs["webauthn"] is defined and pending_tfa_authmechs["u2f"] is not defined %}
+ <div role="tabpanel" class="tab-pane active" id="tfa_tab_webauthn">
+ <div class="card border-0" style="margin-bottom: 0px;">
+ <div class="card-body">
+ <form role="form" method="post" id="webauthn_auth_form">
+ <legend class="mt-2 mb-2">
+ <i class="bi bi-shield-fill-check"></i>
+ Authenticators
+ <hr />
+ </legend>
+ <div class="list-group">
+ {% for authenticator in pending_tfa_methods %}
+ {% if authenticator["authmech"] == "webauthn" %}
+ <a href="#" class="list-group-item webauthn-authenticator-selection">
+ <i class="bi bi-key-fill" style="margin-right: 5px"></i>
+ <span>{{ authenticator["key_id"] }}</span>
+ <input type="hidden" value="{{ authenticator["id"] }}" /><br/>
+ </a>
+ {% endif %}
+ {% endfor %}
+ </div>
+ <div class="collapse pending-tfa-collapse" id="collapseWebAuthnTFA">
+ <div class="row mt-4 mb-4">
+ <div class="col-12">
+ <div class="mt-4 d-flex align-items-center" id="webauthn_status_auth">
+ <div class="spinner-border me-2" role="status">
+ <span class="visually-hidden">Loading...</span>
+ </div>
+ {{ lang.tfa.init_webauthn }}
+ </div>
+ <div class="mt-4 alert alert-danger" style="display:none" id="webauthn_return_code"></div>
+ </div>
+ </div>
+ </div>
+ <input type="hidden" name="token" id="webauthn_auth_data"/>
+ <input type="hidden" name="tfa_method" value="webauthn">
+ <input type="hidden" name="verify_tfa_login"/>
+ <input type="hidden" name="id" id="webauthn_selected_id" /><br/>
+ </form>
+ </div>
+ </div>
</div>
- </div>
- <button class="btn btn-sm visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-sm btn-default" type="submit" name="verify_tfa_login">{{ lang.login.login }}</button>
- </form>
- {% endif %}
- {% if pending_tfa_method == 'u2f' %}
- <form role="form" method="post" id="u2f_auth_form">
- <center>
- <div id="start_u2f_confirmation">
- <svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 24 24">
- <path d="M17.81 4.47c-.08 0-.16-.02-.23-.06C15.66 3.42 14 3 12.01 3c-1.98 0-3.86.47-5.57 1.41-.24.13-.54.04-.68-.2-.13-.24-.04-.55.2-.68C7.82 2.52 9.86 2 12.01 2c2.13 0 3.99.47 6.03 1.52.25.13.34.43.21.67-.09.18-.26.28-.44.28zM3.5 9.72c-.1 0-.2-.03-.29-.09-.23-.16-.28-.47-.12-.7.99-1.4 2.25-2.5 3.75-3.27C9.98 4.04 14 4.03 17.15 5.65c1.5.77 2.76 1.86 3.75 3.25.16.22.11.54-.12.7-.23.16-.54.11-.7-.12-.9-1.26-2.04-2.25-3.39-2.94-2.87-1.47-6.54-1.47-9.4.01-1.36.7-2.5 1.7-3.4 2.96-.08.14-.23.21-.39.21zm6.25 12.07c-.13 0-.26-.05-.35-.15-.87-.87-1.34-1.43-2.01-2.64-.69-1.23-1.05-2.73-1.05-4.34 0-2.97 2.54-5.39 5.66-5.39s5.66 2.42 5.66 5.39c0 .28-.22.5-.5.5s-.5-.22-.5-.5c0-2.42-2.09-4.39-4.66-4.39-2.57 0-4.66 1.97-4.66 4.39 0 1.44.32 2.77.93 3.85.64 1.15 1.08 1.64 1.85 2.42.19.2.19.51 0 .71-.11.1-.24.15-.37.15zm7.17-1.85c-1.19 0-2.24-.3-3.1-.89-1.49-1.01-2.38-2.65-2.38-4.39 0-.28.22-.5.5-.5s.5.22.5.5c0 1.41.72 2.74 1.94 3.56.71.48 1.54.71 2.54.71.24 0 .64-.03 1.04-.1.27-.05.53.13.58.41.05.27-.13.53-.41.58-.57.11-1.07.12-1.21.12zM14.91 22c-.04 0-.09-.01-.13-.02-1.59-.44-2.63-1.03-3.72-2.1-1.4-1.39-2.17-3.24-2.17-5.22 0-1.62 1.38-2.94 3.08-2.94 1.7 0 3.08 1.32 3.08 2.94 0 1.07.93 1.94 2.08 1.94s2.08-.87 2.08-1.94c0-3.77-3.25-6.83-7.25-6.83-2.84 0-5.44 1.58-6.61 4.03-.39.81-.59 1.76-.59 2.8 0 .78.07 2.01.67 3.61.1.26-.03.55-.29.64-.26.1-.55-.04-.64-.29-.49-1.31-.73-2.61-.73-3.96 0-1.2.23-2.29.68-3.24 1.33-2.79 4.28-4.6 7.51-4.6 4.55 0 8.25 3.51 8.25 7.83 0 1.62-1.38 2.94-3.08 2.94s-3.08-1.32-3.08-2.94c0-1.07-.93-1.94-2.08-1.94s-2.08.87-2.08 1.94c0 1.71.66 3.31 1.87 4.51.95.94 1.86 1.46 3.27 1.85.27.07.42.35.35.61-.05.23-.26.38-.47.38z"></path>
- </svg>
- <p>{{ lang.tfa.start_u2f_validation }}</p>
- <hr>
+ {% endif %}
+ {% if pending_tfa_authmechs["yubi_otp"] is defined and pending_tfa_authmechs["u2f"] is not defined %}
+ <div role="tabpanel" class="tab-pane {% if pending_tfa_authmechs["yubi_otp"] %}active{% endif %}" id="tfa_tab_yubi_otp">
+ <div class="card border-0" style="margin-bottom: 0px;">
+ <div class="card-body">
+ <form role="form" method="post">
+ <legend class="mt-2 mb-2">
+ <i class="bi bi-shield-fill-check"></i>
+ Authenticate
+ <hr />
+ </legend>
+ <div class="collapse show pending-tfa-collapse" id="collapseYubiTFA">
+ <div class="row mt-4 mb-4">
+ <div class="col-12">
+ <div class="input-group mt-4">
+ <span class="input-group-text" id="yubi-addon"><img alt="Yubicon Icon" src="/img/yubi.ico"></span>
+ <input type="text" name="token" class="form-control" autocomplete="off" placeholder="Touch Yubikey" aria-describedby="yubi-addon">
+ <input type="hidden" name="tfa_method" value="yubi_otp">
+ <input type="hidden" name="id" id="yubi_selected_id" />
+ </div>
+ </div>
+ </div>
+ <button class="btn btn-sm visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-secondary" type="submit" name="verify_tfa_login">{{ lang.login.login }}</button>
+ </div>
+ </form>
+ </div>
+ </div>
</div>
- </center>
- <p id="u2f_status_auth"></p>
- <div class="alert alert-danger" style="display:none" id="u2f_return_code"></div>
- <input type="hidden" name="token" id="u2f_auth_data"/>
- <input type="hidden" name="tfa_method" value="u2f">
- <input type="hidden" name="verify_tfa_login"/><br/>
- </form>
- {% endif %}
- {% if pending_tfa_method == 'totp' %}
- <form role="form" method="post">
- <div class="form-group">
- <div class="input-group">
- <span class="input-group-addon" id="tfa-addon"><i class="bi bi-shield-lock-fill"></i></span>
- <input type="number" min="000000" max="999999" name="token" class="form-control" placeholder="123456" autocomplete="one-time-code" aria-describedby="tfa-addon">
- <input type="hidden" name="tfa_method" value="totp">
+ {% endif %}
+ {% if pending_tfa_authmechs["totp"] is defined and pending_tfa_authmechs["u2f"] is not defined %}
+ <div role="tabpanel" class="tab-pane {% if pending_tfa_authmechs["totp"] %}active{% endif %}" id="tfa_tab_totp">
+ <div class="card border-0" style="margin-bottom: 0px;">
+ <div class="card-body">
+ <form role="form" method="post">
+ <legend class="mt-2 mb-2">
+ <i class="bi bi-shield-fill-check"></i>
+ Authenticators
+ <hr />
+ </legend>
+ <div class="list-group">
+ {% for authenticator in pending_tfa_methods %}
+ {% if authenticator["authmech"] == "totp" %}
+ <a href="#" class="list-group-item totp-authenticator-selection">
+ <i class="bi bi-key-fill" style="margin-right: 5px"></i>
+ <span>{{ authenticator["key_id"] }}</span>
+ <input type="hidden" value="{{ authenticator["id"] }}" />
+ </a>
+ {% endif %}
+ {% endfor %}
+ </div>
+ <div class="collapse pending-tfa-collapse" id="collapseTotpTFA">
+ <div class="row mt-4 mb-4">
+ <div class="col-12">
+ <div class="input-group mt-4">
+ <span class="input-group-text" id="tfa-addon"><i class="bi bi-shield-lock-fill"></i></span>
+ <input type="number" min="000000" max="999999" name="token" class="form-control" placeholder="123456" autocomplete="one-time-code" aria-describedby="tfa-addon">
+ <input type="hidden" name="tfa_method" value="totp">
+ <input type="hidden" name="id" id="totp_selected_id" /><br/>
+ </div>
+ <button class="mt-4 btn btn-sm visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-secondary" type="submit" name="verify_tfa_login">{{ lang.login.login }}</button>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
</div>
- </div>
- <button class="btn btn-sm visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-default" type="submit" name="verify_tfa_login">{{ lang.login.login }}</button>
- </form>
- {% endif %}
- {% if pending_tfa_method == 'hotp' %}
- <div class="empty"></div>
- {% endif %}
+ {% endif %}
+ <!--
+ <div role="tabpanel" class="tab-pane" id="tfa_tab_hotp">
+ <div class="card" style="margin-bottom: 0px;">
+ <div class="card-body">
+ <div class="empty"></div>
+ </div>
+ </div>
+ </div>
+ -->
+ {% if pending_tfa_authmechs["u2f"] is defined %}
+ <div role="tabpanel" class="tab-pane active" id="tfa_tab_u2f">
+ <div class="card border-0" style="margin-bottom: 0px;">
+ <div class="card-body">
+ {# leave this here to inform users that u2f is deprecated #}
+ <form role="form" method="post" id="u2f_auth_form">
+ <div>
+ <p>{{ lang.tfa.u2f_deprecated }}</p>
+ <p><b>{{ lang.tfa.u2f_deprecated_important }}</b></p>
+ <input type="hidden" name="token" value="destroy" />
+ <input type="hidden" name="tfa_method" value="u2f">
+ <input type="hidden" name="verify_tfa_login"/><br/>
+ <button type="submit" class="btn btn-xs-lg btn-success" value="Login">{{ lang.login.login }}</button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ {% endif %}
+ </div>
+
</div>
</div>
</div>
@@ -197,13 +316,13 @@
<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>
<h4 class="modal-title">{{ lang.footer.restart_container }} (<code id="containerName"></code>)</h4>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<p>{{ lang.footer.restart_container_info|raw }}</p>
<hr>
- <button class="btn btn-md visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-primary" id="triggerRestartContainer">{{ lang.footer.restart_now }}</button>
+ <button class="btn btn-md d-block d-sm-inline btn-primary" id="triggerRestartContainer">{{ lang.footer.restart_now }}</button>
<br><br>
<div id="statusTriggerRestartContainer"></div>
</div>
@@ -215,17 +334,32 @@
<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">{{ lang.footer.confirm_delete }}</h3>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<p id="DeleteText">{{ lang.footer.delete_these_items }}</p>
<ul id="ItemsToDelete"></ul>
<hr>
- <button class="btn btn-sm btn-xs-half visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-danger" id="IsConfirmed">{{ lang.footer.delete_now }}</button>
- <button class="btn btn-sm btn-xs-half visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline btn-default" id="isCanceled">{{ lang.footer.cancel }}</button>
- <div class="clearfix visible-xs"></div>
+ <button class="btn btn-sm btn-xs-half d-block d-sm-inline btn-danger" id="IsConfirmed">{{ lang.footer.delete_now }}</button>
+ <button class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="isCanceled">{{ lang.footer.cancel }}</button>
</div>
</div>
</div>
</div>
+<!-- version modal -->
+<div class="modal fade" id="showVersionModal" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-dialog modal-lg">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title"></h5>
+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+ </div>
+ <div class="modal-body d-flex flex-column mt-2 p-4">
+ <div class="spinner-border mx-auto" role="status">
+ <span class="visually-hidden">Loading...</span>
+ </div>
+ </div>
+ </div>
+ </div>
+</div><!-- version modal -->