diff --git a/airy/airy/routes/silica/.ax.py.kate-swp b/airy/airy/routes/silica/.ax.py.kate-swp new file mode 100644 index 00000000..d0b6037e Binary files /dev/null and b/airy/airy/routes/silica/.ax.py.kate-swp differ diff --git a/airy/airy/routes/silica/ax.py b/airy/airy/routes/silica/ax.py index f9f624a8..55136b74 100644 --- a/airy/airy/routes/silica/ax.py +++ b/airy/airy/routes/silica/ax.py @@ -430,6 +430,7 @@ def uaf_verify(aidid: str, afid: str): context=aid.context, form=form, af=af, + aid=aid, **template_kwargs, **(dict(ul=UserLogin.query.get(aid.ulid)) if aid.ulid else {}), ) diff --git a/airy/airy/static/base.css b/airy/airy/static/base.css index 1c5cf6a5..d2052847 100644 --- a/airy/airy/static/base.css +++ b/airy/airy/static/base.css @@ -247,3 +247,19 @@ table td { padding: 8px; text-align: center; } + +.aligned-form { + display: table; +.} + +.aligned-form p { + display: table-row; +.} + +.aligned-form label { + display: table-cell; +.} + +.aligned-form input { + display: table-cell; +.} diff --git a/airy/airy/templates/silica/ax/verify_limited.html b/airy/airy/templates/silica/ax/verify_limited.html index 40352112..dd16f979 100644 --- a/airy/airy/templates/silica/ax/verify_limited.html +++ b/airy/airy/templates/silica/ax/verify_limited.html @@ -4,7 +4,7 @@ {% block title %}{{ _("認証方法確認") }}{% endblock %} {% block content %} - {{ _("認証方法を確認してください。") }} + {{ macros.ax_af_msg(aid) }}
{{ form.hidden_tag() }} {{ form.password.label }} {{ form.password }} diff --git a/airy/airy/templates/silica/ax/verify_otp_totp.html b/airy/airy/templates/silica/ax/verify_otp_totp.html index 9430c38e..903d2ee0 100644 --- a/airy/airy/templates/silica/ax/verify_otp_totp.html +++ b/airy/airy/templates/silica/ax/verify_otp_totp.html @@ -23,7 +23,7 @@ - {{ _("認証方法を確認してください。") }} + {{ macros.ax_af_msg(aid) }} {{ form.hidden_tag() }} {{ form.code.label }} {{ form.code }} diff --git a/airy/airy/templates/silica/ax/verify_pw.html b/airy/airy/templates/silica/ax/verify_pw.html index 40352112..dd16f979 100644 --- a/airy/airy/templates/silica/ax/verify_pw.html +++ b/airy/airy/templates/silica/ax/verify_pw.html @@ -4,7 +4,7 @@ {% block title %}{{ _("認証方法確認") }}{% endblock %} {% block content %} - {{ _("認証方法を確認してください。") }} + {{ macros.ax_af_msg(aid) }} {{ form.hidden_tag() }} {{ form.password.label }} {{ form.password }} diff --git a/airy/airy/templates/silica/ax/verify_webauthn.html b/airy/airy/templates/silica/ax/verify_webauthn.html index 964db673..ad156afa 100644 --- a/airy/airy/templates/silica/ax/verify_webauthn.html +++ b/airy/airy/templates/silica/ax/verify_webauthn.html @@ -8,7 +8,7 @@ {% endblock %} {% block content %} - {{ _("認証方法を確認してください。") }} + {{ macros.ax_af_msg(aid) }} diff --git a/airy/airy/templates/silica/base.html b/airy/airy/templates/silica/base.html index 72976f80..a6bcc7dc 100644 --- a/airy/airy/templates/silica/base.html +++ b/airy/airy/templates/silica/base.html @@ -11,7 +11,7 @@ {# アイコン字体 #} - {% block title %}{{ _("Silica") }}{% endblock %} + {% block title %}{{ _("Kankin") }}{% endblock %} @@ -27,7 +27,7 @@