web: Convert login page to Jinja

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/login.html b/src/templates/login.html
index 4339ddbf269f6b000bd203b60f71ceeb952c0880..72ac999f9797b9bbced08154a84a6d215751730f 100644 (file)
--- a/src/templates/login.html
+++ b/src/templates/login.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ _("Sign In") }}{% end block %}
+{% block title %}{{ _("Sign In") }}{% endblock %}
 
 {% block body %}
        <section class="section">
@@ -10,13 +10,13 @@
                                        <h1 class="title is-1">{{ _("Sign In") }}</h1>
 
                                        <form method="POST" action="">
-                                               {% raw xsrf_form_html() %}
+                                               {{ xsrf_form_html() | safe }}
 
                                                <div class="field">
                                                        <p class="control has-icons-left">
-                                                               <input class="input {% if failed %}is-danger{% end %}"
+                                                               <input class="input {% if failed %}is-danger{% endif %}"
                                                                        type="text" name="username" placeholder="{{ _("Username") }}"
-                                                                       {% if username %}value="{{ username }}"{% end %}>
+                                                                       {% if username %}value="{{ username }}"{% endif %}>
                                                                <span class="icon is-small is-left">
                                                                        <i class="fas fa-user"></i>
                                                                </span>
@@ -25,7 +25,7 @@
 
                                                <div class="field">
                                                        <p class="control has-icons-left">
-                                                               <input class="input {% if failed %}is-danger{% end %}"
+                                                               <input class="input {% if failed %}is-danger{% endif %}"
                                                                        type="password" name="password" placeholder="{{ _("Password") }}"
                                                                        autocomplete="off">
                                                                <span class="icon is-small is-left">
@@ -46,4 +46,4 @@
                        </div>
                </div>
        </section>
-{% end %}
+{% endblock %}

diff --git a/src/web/auth.py b/src/web/auth.py
index b9b0d248f44c3974ffff9d658fa63596bf528f03..3612d453c485c279db0d27cbe232db24e16a431a 100644 (file)
--- a/src/web/auth.py
+++ b/src/web/auth.py
@@ -9,11 +9,11 @@ from . import base
 log = logging.getLogger("pbs.web.auth")
 
 class LoginHandler(base.KerberosAuthMixin, base.BaseHandler):
-       def get(self, username=None, failed=False):
+       async def get(self, username=None, failed=False):
                if self.current_user:
                        raise tornado.web.HTTPError(403, "Already logged in")
 
-               self.render("login.html", username=username, failed=failed)
+               await self.render("login.html", username=username, failed=failed)
 
        @base.ratelimit(requests=10, minutes=5)
        async def post(self):