From adfebfd5e756c757017ef5a12948c6a8d77da315 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 19 Nov 2020 15:37:50 +0000 Subject: [PATCH] people: Update design of login page Signed-off-by: Michael Tremer --- src/scss/_variables.scss | 4 +- src/templates/auth/login.html | 81 ++++---- src/templates/base.html | 342 +++++++++++++++++----------------- src/web/__init__.py | 2 +- 4 files changed, 215 insertions(+), 214 deletions(-) diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index bf5fd31a..8c4f3724 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -81,10 +81,10 @@ $navbar-height: 5.625rem; $navbar-nav-link-padding-x: 1.875rem; -$navbar-light-color: $dark; +/*$navbar-light-color: $dark; $navbar-light-hover-color: $black; $navbar-light-active-color: $black; -$navbar-light-disabled-color: $light; +$navbar-light-disabled-color: $light; */ // Buttons $btn-box-shadow: 0px 4px 4px rgba(255, 46, 83, 0.17); diff --git a/src/templates/auth/login.html b/src/templates/auth/login.html index d359dd43..c7ae6c0d 100644 --- a/src/templates/auth/login.html +++ b/src/templates/auth/login.html @@ -2,51 +2,50 @@ {% block title %}{{ _("Log In") }}{% end block %} -{% block content %} +{% block container_large %}
-
-
-
-
{{ _("Log In") }}
- - {% if incorrect %} -
- {{ _("You entered an invalid username or password") }} -
- {% end %} - -
- {% raw xsrf_form_html() %} - - {% if next %}{% end %} - -
- -
- -
- -
- - -
- -

- - {{ _("Did you forget your password?") }} - -

+
+

+ IPFire_People +

+
{{ _("Log In") }}
+ + {% if incorrect %} +

+ {{ _("You entered an invalid username or password") }} + + {% end %} + +

+ {% raw xsrf_form_html() %} + + {% if next %}{% end %} + +
+
-
-
{{ _("New to IPFire?") }}
+
+ +
+ + + +

+ + {{ _("Did you forget your password?") }} + +

+ + +
{{ _("New to IPFire?") }}
- + {{ _("Register") }}
diff --git a/src/templates/base.html b/src/templates/base.html index 0101b365..ddfddf47 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -20,199 +20,201 @@ {% block head %}{% end block %} - - + + {% block container %} +
+ {% block content %}{% end block %} +
+ {% end block %} {% end block %} {% block footer %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 255d5e68..5bf19dd1 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -274,7 +274,7 @@ class Application(tornado.web.Application): ]) # people.ipfire.org - self.add_handlers(r"people\.ipfire\.org", [ + self.add_handlers(r"people\.ipfire\.(org|rocks)", [ (r"/", people.IndexHandler), (r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler), (r"/conferences", people.ConferencesHandler), -- 2.47.3