diff --git a/uffd/invite/templates/invite/list.html b/uffd/invite/templates/invite/list.html index 9ddff0303623891cf27292b4ec489edee42ecdd0..cb953dc250ddf78d19f46226dc5d3f46a8276ca7 100644 --- a/uffd/invite/templates/invite/list.html +++ b/uffd/invite/templates/invite/list.html @@ -3,7 +3,7 @@ {% block body %} <div class="btn-toolbar mb-2"> - <a class="btn btn-primary ml-auto" href="{{ url_for("invite.new") }}"><i class="fa fa-plus" aria-hidden="true"></i> {{_('New')}}</a> + <a class="btn btn-primary ml-auto" href="{{ url_for('invite.new') }}"><i class="fa fa-plus" aria-hidden="true"></i> {{_('New')}}</a> </div> <div class="table-responsive"> <table class="table"> diff --git a/uffd/invite/templates/invite/new.html b/uffd/invite/templates/invite/new.html index 5c69f52e59b6414ad3ff06669b48d7877e98c4b7..09c123182dc7c47c8349f8dd5dc87a31bac662ca 100644 --- a/uffd/invite/templates/invite/new.html +++ b/uffd/invite/templates/invite/new.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% block body %} -<form action="{{ url_for("invite.new_submit") }}" method="POST" class="form"> +<form action="{{ url_for('invite.new_submit') }}" method="POST" class="form"> <div class="form-group"> <label for="single-use">{{_('Link Type')}}</label> <select class="form-control" id="single-use" name="single-use"> @@ -53,6 +53,6 @@ </div> {% endif %} <button type="submit" class="btn btn-primary"><i class="fa fa-save" aria-hidden="true"></i> {{_('Create Link')}}</button> - <a href="{{ url_for("invite.index") }}" class="btn btn-secondary">{{_('Cancel')}}</a> + <a href="{{ url_for('invite.index') }}" class="btn btn-secondary">{{_('Cancel')}}</a> </form> {% endblock %} diff --git a/uffd/invite/templates/invite/use.html b/uffd/invite/templates/invite/use.html index f8bb7278e6bb95fd11a31665153e3ca6e10065c1..97010fade2206a8bf45e5afd29cd195475aca9ba 100644 --- a/uffd/invite/templates/invite/use.html +++ b/uffd/invite/templates/invite/use.html @@ -24,20 +24,20 @@ {% endif %} {% if request.user %} {% if invite.roles %} - <form method="POST" action="{{ url_for("invite.grant", invite_id=invite.id, token=invite.token) }}" class="mb-2"> + <form method="POST" action="{{ url_for('invite.grant', invite_id=invite.id, token=invite.token) }}" class="mb-2"> <button type="submit" class="btn btn-primary btn-block">{{_('Add the roles to your account now')}}</button> </form> - <a href="{{ url_for("session.logout", ref=url_for("session.login", ref=request.full_path)) }}" class="btn btn-secondary btn-block">{{_('Logout and switch to a different account')}}</a> + <a href="{{ url_for('session.logout', ref=url_for('session.login', ref=request.full_path)) }}" class="btn btn-secondary btn-block">{{_('Logout and switch to a different account')}}</a> {% endif %} {% if invite.allow_signup %} - <a href="{{ url_for("session.logout", ref=url_for("invite.signup_start", invite_id=invite.id, token=invite.token)) }}" class="btn btn-secondary btn-block">{{_('Logout to register a new account')}}</a> + <a href="{{ url_for('session.logout', ref=url_for('invite.signup_start', invite_id=invite.id, token=invite.token)) }}" class="btn btn-secondary btn-block">{{_('Logout to register a new account')}}</a> {% endif %} {% else %} {% if invite.allow_signup %} - <a href="{{ url_for("invite.signup_start", invite_id=invite.id, token=invite.token) }}" class="btn btn-primary btn-block">{{_('Register a new account')}}</a> + <a href="{{ url_for('invite.signup_start', invite_id=invite.id, token=invite.token) }}" class="btn btn-primary btn-block">{{_('Register a new account')}}</a> {% endif %} {% if invite.roles %} - <a href="{{ url_for("session.login", ref=request.full_path) }}" class="btn btn-primary btn-block">{{_('Login and add the roles to your account')}}</a> + <a href="{{ url_for('session.login', ref=request.full_path) }}" class="btn btn-primary btn-block">{{_('Login and add the roles to your account')}}</a> {% endif %} {% endif %} {% endblock %} diff --git a/uffd/mail/templates/mail/list.html b/uffd/mail/templates/mail/list.html index c2e4e8a7468ab85f005324973fe409c1976ec90f..385259eb06e1d6882dbca9793e8bfa5e71cf2574 100644 --- a/uffd/mail/templates/mail/list.html +++ b/uffd/mail/templates/mail/list.html @@ -4,7 +4,7 @@ <div class="row"> <div class="col"> <p class="text-right"> - <a class="btn btn-primary" href="{{ url_for("mail.show") }}"> + <a class="btn btn-primary" href="{{ url_for('mail.show') }}"> <i class="fa fa-plus" aria-hidden="true"></i> {{_('New')}} </a> </p> @@ -20,7 +20,7 @@ {% for mail in mails|sort(attribute="uid") %} <tr id="mail-{{ mail.id }}"> <th scope="row"> - <a href="{{ url_for("mail.show", mail_id=mail.id) }}"> + <a href="{{ url_for('mail.show', mail_id=mail.id) }}"> {{ mail.uid }} </a> </th> diff --git a/uffd/mail/templates/mail/show.html b/uffd/mail/templates/mail/show.html index 0f11fa9cd71518520c6358fd93904715b27ab9a7..594648024206f413608d3bd4b6870bd4142e2bd6 100644 --- a/uffd/mail/templates/mail/show.html +++ b/uffd/mail/templates/mail/show.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% block body %} -<form action="{{ url_for("mail.update", mail_id=mail.id) }}" method="POST"> +<form action="{{ url_for('mail.update', mail_id=mail.id) }}" method="POST"> <div class="align-self-center"> <div class="form-group col"> <label for="mail-name">{{_('Name')}}</label> @@ -25,9 +25,9 @@ </div> <div class="form-group col"> <button type="submit" class="btn btn-primary"><i class="fa fa-save" aria-hidden="true"></i> {{_('Save')}}</button> - <a href="{{ url_for("mail.index") }}" class="btn btn-secondary">{{_('Cancel')}}</a> + <a href="{{ url_for('mail.index') }}" class="btn btn-secondary">{{_('Cancel')}}</a> {% if mail.id %} - <a href="{{ url_for("mail.delete", mail_id=mail.id) }}" class="btn btn-danger"><i class="fa fa-trash" aria-hidden="true"></i> {{_('Delete')}}</a> + <a href="{{ url_for('mail.delete', mail_id=mail.id) }}" class="btn btn-danger"><i class="fa fa-trash" aria-hidden="true"></i> {{_('Delete')}}</a> {% else %} <a href="#" class="btn btn-danger disabled"><i class="fa fa-trash" aria-hidden="true"></i> {{_('Delete')}}</a> {% endif %} diff --git a/uffd/mfa/templates/mfa/auth.html b/uffd/mfa/templates/mfa/auth.html index 31e92dcc7019f08a0e2cae3cb0516e060fe03add..58d1a9c66da41566f3d8e0291f057af47b8a043b 100644 --- a/uffd/mfa/templates/mfa/auth.html +++ b/uffd/mfa/templates/mfa/auth.html @@ -1,7 +1,7 @@ {% extends 'base_narrow.html' %} {% block body %} -<form action="{{ url_for("mfa.auth_finish", ref=ref) }}" method="POST"> +<form action="{{ url_for('mfa.auth_finish', ref=ref) }}" method="POST"> <div class="col-12 mb-3"> <h2 class="text-center">{{_("Two-Factor Authentication")}}</h2> </div> @@ -24,18 +24,18 @@ <div class="text-center text-muted d-none webauthn-group mb-3">- {{_("or")}} -</div> {% endif %} <div class="form-group col-12 mb-2"> - <input type="text" class="form-control" id="mfa-code" name="code" required="required" placeholder="{{_("Code from your authenticator app or recovery code")}}" autocomplete="off" autofocus> + <input type="text" class="form-control" id="mfa-code" name="code" required="required" placeholder="{{_('Code from your authenticator app or recovery code')}}" autocomplete="off" autofocus> </div> <div class="form-group col-12"> <button type="submit" class="btn btn-primary btn-block">{{_("Verify")}}</button> </div> <div class="form-group col-12"> - <a href="{{ url_for("session.logout") }}" class="btn btn-secondary btn-block">{{_("Cancel")}}</a> + <a href="{{ url_for('session.logout') }}" class="btn btn-secondary btn-block">{{_("Cancel")}}</a> </div> </form> {% if webauthn_supported and request.user_pre_mfa.mfa_webauthn_methods %} -<script src="{{ url_for('static', filename="cbor.js") }}"></script> +<script src="{{ url_for('static', filename='cbor.js') }}"></script> <script> function begin_webauthn() { $('#webauthn-alert').addClass('d-none'); diff --git a/uffd/mfa/templates/mfa/setup.html b/uffd/mfa/templates/mfa/setup.html index 04b90a4a1c8b0d09a202a6f7909e32f3bab29d02..90f19d8b1dd90b726fe7cd87a648a504f6b828bf 100644 --- a/uffd/mfa/templates/mfa/setup.html +++ b/uffd/mfa/templates/mfa/setup.html @@ -96,7 +96,7 @@ mfa_enabled: The user has setup at least one two-factor method. Two-factor authe <form class="form mb-2" action="{{ url_for('mfa.setup_totp') }}"> <div class="row m-0"> <label class="sr-only" for="totp-name">{{_("Name")}}</label> - <input type="text" name="name" class="form-control mb-2 col-12 col-lg-auto mr-2" style="width: 15em;" id="totp-name" placeholder="{{_("Name")}}" required {{ 'disabled' if mfa_init }}> + <input type="text" name="name" class="form-control mb-2 col-12 col-lg-auto mr-2" style="width: 15em;" id="totp-name" placeholder="{{_('Name')}}" required {{ 'disabled' if mfa_init }}> <button type="submit" id="totp-submit" class="btn btn-primary mb-2 col" {{ 'disabled' if mfa_init }}>{{_("Setup new app")}}</button> </div> </form> @@ -155,7 +155,7 @@ mfa_enabled: The user has setup at least one two-factor method. Two-factor authe <form id="webauthn-form" class="form mb-2"> <div class="row m-0"> <label class="sr-only" for="webauthn-name">{{_("Name")}}</label> - <input type="text" class="form-control mb-2 col-12 col-lg-auto mr-2" style="width: 15em;" id="webauthn-name" placeholder="{{_("Name")}}" required disabled> + <input type="text" class="form-control mb-2 col-12 col-lg-auto mr-2" style="width: 15em;" id="webauthn-name" placeholder="{{_('Name')}}" required disabled> <button type="submit" id="webauthn-btn" class="btn btn-primary mb-2 col" disabled> <span id="webauthn-spinner" class="spinner-border spinner-border-sm d-none" role="status" aria-hidden="true"></span> <span id="webauthn-btn-text">{{_("Setup new device")}}</span> @@ -190,7 +190,7 @@ mfa_enabled: The user has setup at least one two-factor method. Two-factor authe </div> {% if webauthn_supported %} -<script src="{{ url_for('static', filename="cbor.js") }}"></script> +<script src="{{ url_for('static', filename='cbor.js') }}"></script> <script> $('#webauthn-form').on('submit', function(e) { diff --git a/uffd/role/templates/role/list.html b/uffd/role/templates/role/list.html index c4825971ef75b433cafdfddea254d155311297c8..b6eb6cb57f87795ee3c812cb3393ba97cd3659ec 100644 --- a/uffd/role/templates/role/list.html +++ b/uffd/role/templates/role/list.html @@ -4,7 +4,7 @@ <div class="row"> <div class="col"> <p class="text-right"> - <a class="btn btn-primary" href="{{ url_for("role.new") }}"> + <a class="btn btn-primary" href="{{ url_for('role.new') }}"> <i class="fa fa-plus" aria-hidden="true"></i> {{_("New")}} </a> </p> @@ -19,7 +19,7 @@ {% for role in roles|sort(attribute="name") %} <tr id="role-{{ role.id }}"> <th scope="row"> - <a href="{{ url_for("role.show", roleid=role.id) }}"> + <a href="{{ url_for('role.show', roleid=role.id) }}"> {{ role.name or _('<empty name>') }} </a> </th> diff --git a/uffd/role/templates/role/show.html b/uffd/role/templates/role/show.html index 3ee88d6908541abcc1e7ab5f0e0ec794b9d036b0..6a31ee49ea4f9aca0e36365f596075dad7af0638 100644 --- a/uffd/role/templates/role/show.html +++ b/uffd/role/templates/role/show.html @@ -3,22 +3,22 @@ {% block body %} {% if role.locked %} <div class="alert alert-warning" role="alert"> -{{_("Name, moderator group, included roles and groups of this role are managed externally.")}} <a href="{{ url_for("role.unlock", roleid=role.id) }}" class="alert-link">Unlock this role</a> to edit them at the risk of having your changes overwritten. +{{_("Name, moderator group, included roles and groups of this role are managed externally.")}} <a href="{{ url_for('role.unlock', roleid=role.id) }}" class="alert-link">Unlock this role</a> to edit them at the risk of having your changes overwritten. </div> {% endif %} -<form action="{{ url_for("role.update", roleid=role.id) }}" method="POST"> +<form action="{{ url_for('role.update', roleid=role.id) }}" method="POST"> <div class="align-self-center"> <div class="float-sm-right pb-2"> <button type="submit" class="btn btn-primary"><i class="fa fa-save" aria-hidden="true"></i> {{_("Save")}}</button> - <a href="{{ url_for("role.index") }}" class="btn btn-secondary">{{_("Cancel")}}</a> + <a href="{{ url_for('role.index') }}" class="btn btn-secondary">{{_("Cancel")}}</a> {% if role.id %} {% if not role.is_default %} - <a href="{{ url_for("role.set_default", roleid=role.id) }}" onClick='return confirm({{_("All non-service users will be removed as members from this role and get its permissions implicitly. Are you sure?")|tojson}});' class="btn btn-secondary">{{_("Set as default")}}</a> + <a href="{{ url_for('role.set_default', roleid=role.id) }}" onClick='return confirm({{_("All non-service users will be removed as members from this role and get its permissions implicitly. Are you sure?")|tojson}});' class="btn btn-secondary">{{_("Set as default")}}</a> {% else %} - <a href="{{ url_for("role.unset_default", roleid=role.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-secondary">{{_("Unset as default")}}</a> + <a href="{{ url_for('role.unset_default', roleid=role.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-secondary">{{_("Unset as default")}}</a> {% endif %} - <a href="{{ url_for("role.delete", roleid=role.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-danger {{ 'disabled' if role.locked }}"><i class="fa fa-trash" aria-hidden="true"></i> {{_("Delete")}}</a> + <a href="{{ url_for('role.delete', roleid=role.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-danger {{ 'disabled' if role.locked }}"><i class="fa fa-trash" aria-hidden="true"></i> {{_("Delete")}}</a> {% else %} <a href="#" class="btn btn-secondary disabled">{{_("Set as default")}}</a> <a href="#" class="btn btn-danger disabled"><i class="fa fa-trash" aria-hidden="true"></i> {{_("Delete")}}</a> @@ -63,7 +63,7 @@ <span>{{_("Moderators")}}:</span> <ul class="row"> {% for moderator in role.moderator_group.members %} - <li class="col-12 col-xs-6 col-sm-4 col-md-3 col-lg-2"><a href="{{ url_for("user.show", id=moderator.id) }}">{{ moderator.loginname }}</a></li> + <li class="col-12 col-xs-6 col-sm-4 col-md-3 col-lg-2"><a href="{{ url_for('user.show', id=moderator.id) }}">{{ moderator.loginname }}</a></li> {% endfor %} </ul> </div> @@ -71,7 +71,7 @@ <span>{{_("Members")}}:</span> <ul class="row"> {% for member in role.members|sort(attribute='loginname') %} - <li class="col-12 col-xs-6 col-sm-4 col-md-3 col-lg-2"><a href="{{ url_for("user.show", id=member.id) }}">{{ member.loginname }}</a></li> + <li class="col-12 col-xs-6 col-sm-4 col-md-3 col-lg-2"><a href="{{ url_for('user.show', id=member.id) }}">{{ member.loginname }}</a></li> {% endfor %} </ul> </div> @@ -99,7 +99,7 @@ </div> </td> <td> - <a href="{{ url_for("role.show", roleid=r.id) }}"> + <a href="{{ url_for('role.show', roleid=r.id) }}"> {{ r.name }} </a> </td> @@ -108,7 +108,7 @@ </td> <td> {% for group in r.groups_effective|sort(attribute='name') %} - <a href="{{ url_for("group.show", id=group.id) }}">{{ group.name }}</a>{{ ', ' if not loop.last }} + <a href="{{ url_for('group.show', id=group.id) }}">{{ group.name }}</a>{{ ', ' if not loop.last }} {% endfor %} </td> </tr> @@ -138,7 +138,7 @@ </div> </td> <td> - <a href="{{ url_for("group.show", id=group.id) }}"> + <a href="{{ url_for('group.show', id=group.id) }}"> {{ group.name }} </a> </td> diff --git a/uffd/rolemod/templates/rolemod/show.html b/uffd/rolemod/templates/rolemod/show.html index 7dba0f8649d1d55e8590e43bbb31f08cacefedbc..823e3a9183207909038b315ac54fc4c1ec1559f2 100644 --- a/uffd/rolemod/templates/rolemod/show.html +++ b/uffd/rolemod/templates/rolemod/show.html @@ -2,11 +2,11 @@ {% block body %} -<form method="POST" action="{{ url_for("rolemod.update", role_id=role.id) }}"> +<form method="POST" action="{{ url_for('rolemod.update', role_id=role.id) }}"> <div class="float-sm-right pb-2"> - <a href="{{ url_for("invite.new", **{"role-%d"%role.id: 1}) }}" class="btn btn-primary mr-2"><i class="fa fa-link" aria-hidden="true"></i> {{_('Invite Members')}}</a> + <a href="{{ url_for('invite.new', **{'role-%d'%role.id: 1}) }}" class="btn btn-primary mr-2"><i class="fa fa-link" aria-hidden="true"></i> {{_('Invite Members')}}</a> <button type="submit" class="btn btn-primary"><i class="fa fa-save" aria-hidden="true"></i> {{_('Save')}}</button> - <a href="{{ url_for("rolemod.index") }}" class="btn btn-secondary">{{_('Cancel')}}</a> + <a href="{{ url_for('rolemod.index') }}" class="btn btn-secondary">{{_('Cancel')}}</a> </div> <ul class="nav nav-tabs pt-2 border-0" id="tablist" role="tablist"> <li class="nav-item"> diff --git a/uffd/selfservice/templates/selfservice/forgot_password.html b/uffd/selfservice/templates/selfservice/forgot_password.html index 9792f15b471d058f385e3c55b6fb82c732755e86..02606620896c0c37056161f7fb18ddcd8efb1dc2 100644 --- a/uffd/selfservice/templates/selfservice/forgot_password.html +++ b/uffd/selfservice/templates/selfservice/forgot_password.html @@ -1,7 +1,7 @@ {% extends 'base_narrow.html' %} {% block body %} -<form action="{{ url_for("selfservice.forgot_password") }}" method="POST"> +<form action="{{ url_for('selfservice.forgot_password') }}" method="POST"> <div class="col-12"> <h2 class="text-center">{{_("Forgot password")}}</h2> </div> diff --git a/uffd/selfservice/templates/selfservice/self.html b/uffd/selfservice/templates/selfservice/self.html index f32b2e19356c7df3d784876bec5531c2a6fab695..f1c165165b80b30fa84e51dee78715c4b549256e 100644 --- a/uffd/selfservice/templates/selfservice/self.html +++ b/uffd/selfservice/templates/selfservice/self.html @@ -16,7 +16,7 @@ <p>{{_("Changes may take several minutes to be visible in all services.")}}</p> </div> <div class="col-12 col-md-7"> - <form class="form" action="{{ url_for("selfservice.update_profile") }}" method="POST"> + <form class="form" action="{{ url_for('selfservice.update_profile') }}" method="POST"> <div class="form-group"> <label>{{_("Login Name")}}</label> <input type="text" class="form-control" value="{{ user.loginname }}" readonly> @@ -45,15 +45,15 @@ <p>{{_("Your login password for the Single-Sign-On. Only enter it on the Single-Sign-On login page! No other legit websites will ask you for this password. We do not ever need your password to assist you.")}}</p> </div> <div class="col-12 col-md-7"> - <form class="form" action="{{ url_for("selfservice.change_password") }}" method="POST"> + <form class="form" action="{{ url_for('selfservice.change_password') }}" method="POST"> <div class="form-group"> - <input type="password" class="form-control" id="user-password1" name="password1" placeholder="{{_("New Password")}}" minlength={{ User.PASSWORD_MINLEN }} maxlength={{ User.PASSWORD_MAXLEN }} pattern="{{ User.PASSWORD_REGEX }}" required> + <input type="password" class="form-control" id="user-password1" name="password1" placeholder="{{_('New Password')}}" minlength="{{ User.PASSWORD_MINLEN }}" maxlength="{{ User.PASSWORD_MAXLEN }}" pattern="{{ User.PASSWORD_REGEX }}" required> <small class="form-text text-muted"> {{ User.PASSWORD_DESCRIPTION|safe }} </small> </div> <div class="form-group"> - <input type="password" class="form-control" id="user-password2" name="password2" placeholder="{{_("Repeat Password")}}" required> + <input type="password" class="form-control" id="user-password2" name="password2" placeholder="{{_('Repeat Password')}}" required> </div> <button type="submit" class="btn btn-primary btn-block">{{_("Change Password")}}</button> </form> @@ -104,12 +104,12 @@ <tr> <td>{{ role.name }} {% if not user.mfa_enabled and role.groups.values()|selectattr('requires_mfa')|list %} - <i class="fas fa-exclamation-triangle text-warning" title="{{_("Some permissions in this role require you to setup two-factor authentication")}}"></i> + <i class="fas fa-exclamation-triangle text-warning" title="{{_('Some permissions in this role require you to setup two-factor authentication')}}"></i> {% endif %} </td> <td>{{ role.description }}</td> <td> - <form action="{{ url_for("selfservice.leave_role", roleid=role.id) }}" method="POST" onsubmit='return confirm({{_("Are you sure?")|tojson|e}});'> + <form action="{{ url_for('selfservice.leave_role', roleid=role.id) }}" method="POST" onsubmit='return confirm({{_("Are you sure?")|tojson|e}});'> <button type="submit" class="btn btn-sm btn-danger float-right">{{_("Leave")}}</button> </form> </td> diff --git a/uffd/selfservice/templates/selfservice/set_password.html b/uffd/selfservice/templates/selfservice/set_password.html index 39e511074f0269dc44e1eb22e870d23a539020a9..37a0342973cba6041e8b8249a71ceae32f362f0a 100644 --- a/uffd/selfservice/templates/selfservice/set_password.html +++ b/uffd/selfservice/templates/selfservice/set_password.html @@ -1,13 +1,13 @@ {% extends 'base_narrow.html' %} {% block body %} -<form action="{{ url_for("selfservice.token_password", token_id=token.id, token=token.token) }}" method="POST" onInput="password2.setCustomValidity(password1.value != password2.value ? 'Passwords do not match.' : '') "> +<form action="{{ url_for('selfservice.token_password', token_id=token.id, token=token.token) }}" method="POST" onInput="password2.setCustomValidity(password1.value != password2.value ? 'Passwords do not match.' : '') "> <div class="col-12"> <h2 class="text-center">{{_("Reset password")}}</h2> </div> <div class="form-group col-12"> <label for="user-password1">{{_("New Password")}}</label> - <input type="password" class="form-control" id="user-password1" name="password1" tabindex="2" minlength={{ User.PASSWORD_MINLEN }} maxlength={{ User.PASSWORD_MAXLEN }} pattern="{{ User.PASSWORD_REGEX }}" required> + <input type="password" class="form-control" id="user-password1" name="password1" tabindex="2" minlength="{{ User.PASSWORD_MINLEN }}" maxlength="{{ User.PASSWORD_MAXLEN }}" pattern="{{ User.PASSWORD_REGEX }}" required> <small class="form-text text-muted"> {{ User.PASSWORD_DESCRIPTION|safe }} </small> diff --git a/uffd/service/templates/service/index.html b/uffd/service/templates/service/index.html index 97e569fd44a94496b4849f977045b7903436bae6..d6a15d91e77ec2942085139b708d0195ce0f860b 100644 --- a/uffd/service/templates/service/index.html +++ b/uffd/service/templates/service/index.html @@ -18,7 +18,7 @@ {% for service in services|sort(attribute="name") %} <tr> <td> - <a href="{{ url_for("service.show", id=service.id) }}"> + <a href="{{ url_for('service.show', id=service.id) }}"> {{ service.name }} </a> </td> diff --git a/uffd/service/templates/service/overview.html b/uffd/service/templates/service/overview.html index 976cad59ab4a668acee018ae92150a4890c61677..f31ca502796e31c4d135b460c539339aca094bed 100644 --- a/uffd/service/templates/service/overview.html +++ b/uffd/service/templates/service/overview.html @@ -92,7 +92,7 @@ <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title">{{ info.title }}</h5> - <button type="button" class="close" data-dismiss="modal" aria-label="{{_("Close")}}"> + <button type="button" class="close" data-dismiss="modal" aria-label="{{_('Close')}}"> <span aria-hidden="true">×</span> </button> </div> diff --git a/uffd/service/templates/service/show.html b/uffd/service/templates/service/show.html index 0bb892c258ea6c6ca36fa066bef3e34208dca675..fa7d15e3b549d9a10f2b40f345d3735135cf58f0 100644 --- a/uffd/service/templates/service/show.html +++ b/uffd/service/templates/service/show.html @@ -51,7 +51,7 @@ {% for client in service.oauth2_clients|sort(attribute='client_id') %} <tr> <td> - <a href="{{ url_for("service.oauth2_show", service_id=service.id, db_id=client.db_id) }}"> + <a href="{{ url_for('service.oauth2_show', service_id=service.id, db_id=client.db_id) }}"> {{ client.client_id }} </a> </td> diff --git a/uffd/session/templates/session/deviceauth.html b/uffd/session/templates/session/deviceauth.html index c0827501355d9003328d68a0d32a47ee67e36b12..14bee23c9b322c8f7e2989de38a2f2c70c467be6 100644 --- a/uffd/session/templates/session/deviceauth.html +++ b/uffd/session/templates/session/deviceauth.html @@ -2,11 +2,11 @@ {% block body %} {% if not initiation %} -<form action="{{ url_for("session.deviceauth") }}"> +<form action="{{ url_for('session.deviceauth') }}"> {% elif not confirmation %} -<form action="{{ url_for("session.deviceauth_submit") }}" method="POST"> +<form action="{{ url_for('session.deviceauth_submit') }}" method="POST"> {% else %} -<form action="{{ url_for("session.deviceauth_finish") }}" method="POST"> +<form action="{{ url_for('session.deviceauth_finish') }}" method="POST"> {% endif %} <div class="col-12"> <h2 class="text-center">{{_('Authorize Device Login')}}</h2> diff --git a/uffd/session/templates/session/devicelogin.html b/uffd/session/templates/session/devicelogin.html index b9874ecdc8f2cff8e4b61a1a212a960a9b0e88c0..2d13c3de31bfd58f2d8e606aa4d750d7c82a46c3 100644 --- a/uffd/session/templates/session/devicelogin.html +++ b/uffd/session/templates/session/devicelogin.html @@ -1,7 +1,7 @@ {% extends 'base_narrow.html' %} {% block body %} -<form action="{{ url_for("session.devicelogin_submit", ref=ref) }}" method="POST"> +<form action="{{ url_for('session.devicelogin_submit', ref=ref) }}" method="POST"> <div class="col-12"> <h2 class="text-center">{{_('Device Login')}}</h2> </div> diff --git a/uffd/session/templates/session/login.html b/uffd/session/templates/session/login.html index 8b963c2945b99799ae40b1b2a10a65fcde6758a1..b639f5831d4aca54d73e8768b3c81793e5dbb5b4 100644 --- a/uffd/session/templates/session/login.html +++ b/uffd/session/templates/session/login.html @@ -1,7 +1,7 @@ {% extends 'base_narrow.html' %} {% block body %} -<form action="{{ url_for("session.login", ref=ref) }}" method="POST"> +<form action="{{ url_for('session.login', ref=ref) }}" method="POST"> <div class="col-12"> <h2 class="text-center">{{_("Login")}}</h2> </div> @@ -27,9 +27,9 @@ {% endif %} <div class="clearfix col-12"> {% if config['SELF_SIGNUP'] %} - <a href="{{ url_for("signup.signup_start") }}" class="float-left">{{_("Register")}}</a> + <a href="{{ url_for('signup.signup_start') }}" class="float-left">{{_("Register")}}</a> {% endif %} - <a href="{{ url_for("selfservice.forgot_password") }}" class="float-right">{{_("Forgot Password?")}}</a> + <a href="{{ url_for('selfservice.forgot_password') }}" class="float-right">{{_("Forgot Password?")}}</a> </div> </form> {% endblock %} diff --git a/uffd/signup/templates/signup/confirm.html b/uffd/signup/templates/signup/confirm.html index ffd13dd4ec0131235bd256af750f7d75d7cfea83..2bfc1e826bff51c5ce43afce6757c8b5a213e0ed 100644 --- a/uffd/signup/templates/signup/confirm.html +++ b/uffd/signup/templates/signup/confirm.html @@ -1,7 +1,7 @@ {% extends 'base_narrow.html' %} {% block body %} -<form action="{{ url_for(".signup_confirm_submit", signup_id=signup.id, token=signup.token) }}" method="POST"> +<form action="{{ url_for('.signup_confirm_submit', signup_id=signup.id, token=signup.token) }}" method="POST"> <div class="col-12"> <h2 class="text-center">{{_('Complete Registration')}}</h2> </div> diff --git a/uffd/signup/templates/signup/start.html b/uffd/signup/templates/signup/start.html index 3238fffecb844b2e6850731d6a97d0933bb4cf39..1f2000fb2cae3d8fe74dedaf36b81cb119a5d73e 100644 --- a/uffd/signup/templates/signup/start.html +++ b/uffd/signup/templates/signup/start.html @@ -39,7 +39,7 @@ </div> <div class="form-group col-12"> <label for="user-password1">{{_('Password')}}</label> - <input type="password" class="form-control" id="user-password1" name="password1" minlength={{ User.PASSWORD_MINLEN }} maxlength={{ User.PASSWORD_MAXLEN }} pattern="{{ User.PASSWORD_REGEX }}" required> + <input type="password" class="form-control" id="user-password1" name="password1" minlength="{{ User.PASSWORD_MINLEN }}" maxlength="{{ User.PASSWORD_MAXLEN }}" pattern="{{ User.PASSWORD_REGEX }}" required> <small class="form-text text-muted"> {{ User.PASSWORD_DESCRIPTION|safe }} </small> diff --git a/uffd/templates/403.html b/uffd/templates/403.html index 5a19dc9820bc1a6edabeb85c2856b48e4b4b5dcb..913913f51bef1a0fafd31d2498f045e22ba53bf7 100644 --- a/uffd/templates/403.html +++ b/uffd/templates/403.html @@ -4,7 +4,7 @@ <div class="row mt-2 justify-content-center"> <div class="col-lg-6 col-md-10" style="background: #f7f7f7; box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); padding: 30px;"> <div class="text-center"> - <img alt="branding logo" src="{{ config.get("BRANDING_LOGO_URL") }}" class="col-lg-8 col-md-12" > + <img alt="branding logo" src="{{ config.get('BRANDING_LOGO_URL') }}" class="col-lg-8 col-md-12" > </div> <div class="col-12"> <h2 class="text-center">{{ _('Access Denied') }}</h2> diff --git a/uffd/templates/base.html b/uffd/templates/base.html index 972e84f78bbae1e34c4be4eb2e3325056bdd8913..7462170e345dec14a1466c81be774957f432b21c 100644 --- a/uffd/templates/base.html +++ b/uffd/templates/base.html @@ -6,12 +6,12 @@ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <title>{% block title %}{{ config['SITE_TITLE'] }}{% endblock %}</title> - <link href="{{ url_for('static', filename="bootstrap/bootstrap.min.css") }}" rel="stylesheet"> - <link href="{{ url_for('static', filename="fa/css/all.css") }}" rel="stylesheet"> - <link href="{{ url_for('static', filename="style.css") }}" rel="stylesheet"> - <script src="{{ url_for('static', filename="jquery/jquery-3.4.1.min.js") }}"></script> - <script src="{{ url_for('static', filename="popper/popper.min.js") }}"></script> - <script src="{{ url_for('static', filename="bootstrap/bootstrap.min.js") }}"></script> + <link href="{{ url_for('static', filename='bootstrap/bootstrap.min.css') }}" rel="stylesheet"> + <link href="{{ url_for('static', filename='fa/css/all.css') }}" rel="stylesheet"> + <link href="{{ url_for('static', filename='style.css') }}" rel="stylesheet"> + <script src="{{ url_for('static', filename='jquery/jquery-3.4.1.min.js') }}"></script> + <script src="{{ url_for('static', filename='popper/popper.min.js') }}"></script> + <script src="{{ url_for('static', filename='bootstrap/bootstrap.min.js') }}"></script> <link rel="icon" href="{{ url_for('static', filename='favicon.ico') }}" type="image/png"> {% endblock %} @@ -88,13 +88,13 @@ {% endif %} {% if request.user %} <li class="nav-item"> - <a class="nav-link" href="{{ url_for("session.deviceauth") }}"> + <a class="nav-link" href="{{ url_for('session.deviceauth') }}"> <span aria-hidden="true" class="fas fa-mobile-alt" title="{{_('Authorize Device Login')}}"></span> <span class="d-inline d-md-none">{{_('Device Login')}}</span> </a> </li> <li class="nav-item"> - <a class="nav-link" href="{{ url_for("session.logout") }}"> + <a class="nav-link" href="{{ url_for('session.logout') }}"> <span aria-hidden="true" class="fa fa-sign-out-alt"></span> {{_("Logout")}} </a> diff --git a/uffd/templates/base_narrow.html b/uffd/templates/base_narrow.html index 2077185b5d63122b730b81d27ac00f8ebb215116..d9c1a11ee4a8108ececdf40affbfe9b2eac0772f 100644 --- a/uffd/templates/base_narrow.html +++ b/uffd/templates/base_narrow.html @@ -16,7 +16,7 @@ <div class="row justify-content-center"> <div class="col-lg-6 col-md-10" style="background: #f7f7f7; box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); padding: 30px;"> <div class="text-center"> - <img alt="branding logo" src="{{ config.get("BRANDING_LOGO_URL") }}" class="col-lg-8 col-md-12" > + <img alt="branding logo" src="{{ config.get('BRANDING_LOGO_URL') }}" class="col-lg-8 col-md-12" > </div> {% block body %} {% endblock body %} diff --git a/uffd/user/templates/group/list.html b/uffd/user/templates/group/list.html index fbad73b6b95f599e9a2b50354c7bb24591f740e0..5835ca39b2c82425f05a65a73cc89e9cb3cdf56b 100644 --- a/uffd/user/templates/group/list.html +++ b/uffd/user/templates/group/list.html @@ -4,7 +4,7 @@ <div class="row"> <div class="col"> <p class="text-right"> - <a class="btn btn-primary" href="{{ url_for("group.show") }}"> + <a class="btn btn-primary" href="{{ url_for('group.show') }}"> <i class="fa fa-plus" aria-hidden="true"></i> {{_("New")}} </a> </p> @@ -23,7 +23,7 @@ {{ group.unix_gid }} </th> <td> - <a href="{{ url_for("group.show", id=group.id) }}"> + <a href="{{ url_for('group.show', id=group.id) }}"> {{ group.name }} </a> </td> diff --git a/uffd/user/templates/group/show.html b/uffd/user/templates/group/show.html index 698d483668ece80a98e101d407fbae0cec533c6d..d9d7dfb4e1500dd287d057c2ffcf9f61e1db03fa 100644 --- a/uffd/user/templates/group/show.html +++ b/uffd/user/templates/group/show.html @@ -1,14 +1,14 @@ {% extends 'base.html' %} {% block body %} -<form action="{{ url_for("group.update", id=group.id) }}" method="POST"> +<form action="{{ url_for('group.update', id=group.id) }}" method="POST"> <div class="align-self-center"> <div class="clearfix pb-2 col"> <div class="float-sm-right"> <button type="submit" class="btn btn-primary"><i class="fa fa-save" aria-hidden="true"></i> {{_("Save")}}</button> - <a href="{{ url_for("group.index") }}" class="btn btn-secondary">{{_("Cancel")}}</a> + <a href="{{ url_for('group.index') }}" class="btn btn-secondary">{{_("Cancel")}}</a> {% if group.id %} - <a href="{{ url_for("group.delete", id=group.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-danger"><i class="fa fa-trash" aria-hidden="true"></i> {{_("Delete")}}</a> + <a href="{{ url_for('group.delete', id=group.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-danger"><i class="fa fa-trash" aria-hidden="true"></i> {{_("Delete")}}</a> {% else %} <a href="#" class="btn btn-danger disabled"><i class="fa fa-trash" aria-hidden="true"></i> {{_("Delete")}}</a> {% endif %} @@ -40,7 +40,7 @@ <span>{{_("Members")}}:</span> <ul class="row"> {% for member in group.members|sort(attribute='loginname') %} - <li class="col-12 col-xs-6 col-sm-4 col-md-3 col-lg-2"><a href="{{ url_for("user.show", id=member.id) }}">{{ member.loginname }}</a></li> + <li class="col-12 col-xs-6 col-sm-4 col-md-3 col-lg-2"><a href="{{ url_for('user.show', id=member.id) }}">{{ member.loginname }}</a></li> {% endfor %} </ul> </div> diff --git a/uffd/user/templates/user/list.html b/uffd/user/templates/user/list.html index 63748d0f3a1971bb008741aafc36730bf6e4633c..e9e6669161f0ef80ee4214dbf4fc36b5442b3a49 100644 --- a/uffd/user/templates/user/list.html +++ b/uffd/user/templates/user/list.html @@ -4,7 +4,7 @@ <div class="row"> <div class="col"> <p class="text-right"> - <a class="btn btn-primary" href="{{ url_for("user.show") }}"> + <a class="btn btn-primary" href="{{ url_for('user.show') }}"> <i class="fa fa-plus" aria-hidden="true"></i> {{_("New")}} </a> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#csvimport"> @@ -27,7 +27,7 @@ {{ user.unix_uid }} </th> <td> - <a href="{{ url_for("user.show", id=user.id) }}"> + <a href="{{ url_for('user.show', id=user.id) }}"> {{ user.loginname }} </a> {% if user.is_service_user %} @@ -39,7 +39,7 @@ </td> <td> {% for role in user.roles|sort(attribute="name") %} - <a href="{{ url_for("role.show", roleid=role.id) }}">{{ role.name }}</a>{% if not loop.last %}, {% endif %} + <a href="{{ url_for('role.show', roleid=role.id) }}">{{ role.name }}</a>{% if not loop.last %}, {% endif %} {% endfor %} </td> </tr> @@ -50,7 +50,7 @@ </div> <div class="modal fade" id="csvimport" tabindex="-1" role="dialog" aria-hidden="true"> - <form action="{{ url_for("user.csvimport") }}" method="POST"> + <form action="{{ url_for('user.csvimport') }}" method="POST"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> diff --git a/uffd/user/templates/user/show.html b/uffd/user/templates/user/show.html index 16ceb1b2ac86d62705c52d24eab221f72ca1479a..a2ff525f6469519d80e2d881ea8d509751ba5042 100644 --- a/uffd/user/templates/user/show.html +++ b/uffd/user/templates/user/show.html @@ -1,13 +1,13 @@ {% extends 'base.html' %} {% block body %} -<form action="{{ url_for("user.update", id=user.id) }}" method="POST"> +<form action="{{ url_for('user.update', id=user.id) }}" method="POST"> <div class="align-self-center"> <div class="float-sm-right pb-2"> <button type="submit" class="btn btn-primary"><i class="fa fa-save" aria-hidden="true"></i> {{_("Save")}}</button> - <a href="{{ url_for("user.index") }}" class="btn btn-secondary">{{_("Cancel")}}</a> + <a href="{{ url_for('user.index') }}" class="btn btn-secondary">{{_("Cancel")}}</a> {% if user.id %} - <a href="{{ url_for("user.delete", id=user.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-danger"><i class="fa fa-trash" aria-hidden="true"></i> {{_("Delete")}}</a> + <a href="{{ url_for('user.delete', id=user.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-danger"><i class="fa fa-trash" aria-hidden="true"></i> {{_("Delete")}}</a> {% else %} <a href="#" class="btn btn-danger disabled"><i class="fa fa-trash" aria-hidden="true"></i> {{_("Delete")}}</a> {% endif %} @@ -75,9 +75,9 @@ <div class="form-group col"> <label for="user-loginname">{{_("Password")}}</label> {% if user.id %} - <input type="password" class="form-control" id="user-password" name="password" placeholder="●●●●●●●●" minlength={{ User.PASSWORD_MINLEN }} maxlength={{ User.PASSWORD_MAXLEN }} pattern="{{ User.PASSWORD_REGEX }}"> + <input type="password" class="form-control" id="user-password" name="password" placeholder="●●●●●●●●" minlength="{{ User.PASSWORD_MINLEN }}" maxlength="{{ User.PASSWORD_MAXLEN }}" pattern="{{ User.PASSWORD_REGEX }}"> {% else %} - <input type="password" class="form-control" id="user-password" name="password" placeholder="{{_("mail to set it will be sent")}}" readonly> + <input type="password" class="form-control" id="user-password" name="password" placeholder="{{_('mail to set it will be sent')}}" readonly> {% endif %} <small class="form-text text-muted"> {{ User.PASSWORD_DESCRIPTION|safe }} @@ -91,7 +91,7 @@ {{ _("Status:") }} {{ _("Enabled") if user.mfa_enabled else _("Disabled") }}<br> {{ user.mfa_recovery_codes|length }} {{ _("Recovery Codes") }}, {{ user.mfa_totp_methods|length }} {{ _("Authenticator Apps (TOTP)") }}, {{ user.mfa_webauthn_methods|length }} {{ _("U2F and FIDO2 Devices") }} </p> - <a href="{{ url_for("mfa.admin_disable", id=user.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-secondary">{{_("Reset 2FA")}}</a> + <a href="{{ url_for('mfa.admin_disable', id=user.id) }}" onClick='return confirm({{_("Are you sure?")|tojson}});' class="btn btn-secondary">{{_("Reset 2FA")}}</a> </div> {% endif %} @@ -118,7 +118,7 @@ </div> </td> <td> - <a href="{{ url_for("role.show", roleid=role.id) }}"> + <a href="{{ url_for('role.show', roleid=role.id) }}"> {{ role.name }} </a> </td> @@ -143,7 +143,7 @@ {% for group in user.groups|sort(attribute="name") %} <tr id="group-{{ group.id }}"> <td> - <a href="{{ url_for("group.show", id=group.id) }}"> + <a href="{{ url_for('group.show', id=group.id) }}"> {{ group.name }} </a> </td>