From c715f87526dc7fef18d3faf4cc2b129c970dc68f Mon Sep 17 00:00:00 2001 From: Son NK <> Date: Tue, 6 Apr 2021 12:06:46 +0200 Subject: [PATCH] improve SIWSL UI --- app/oauth/templates/oauth/authorize.html | 13 +++---- .../oauth/authorize_nonlogin_user.html | 17 ++++------ static/siwsl.svg | 34 +++++++++++++++++++ templates/sign_in_with_sl_base.html | 20 +++++++++++ 4 files changed, 65 insertions(+), 19 deletions(-) create mode 100644 static/siwsl.svg create mode 100644 templates/sign_in_with_sl_base.html diff --git a/app/oauth/templates/oauth/authorize.html b/app/oauth/templates/oauth/authorize.html index c1c5c4f1..8de0870a 100644 --- a/app/oauth/templates/oauth/authorize.html +++ b/app/oauth/templates/oauth/authorize.html @@ -1,7 +1,7 @@ -{% extends 'default.html' %} +{% extends "sign_in_with_sl_base.html" %} {% block title %} - Authorization + Authorize {{ client.name }} - Sign in with SimpleLogin {% endblock %} {% block head %} @@ -31,9 +31,9 @@ {% endblock %} -{% block default_content %} +{% block single_content %} -
+ {% if not client.approved %}
{{ client.name }} is in Dev Mode and isn't approved (yet) by SimpleLogin. @@ -75,11 +75,8 @@
{% endif %} -
+
{{ client.name }} will receive the following info -
- You can customize the info sent to this app. -
diff --git a/app/oauth/templates/oauth/authorize_nonlogin_user.html b/app/oauth/templates/oauth/authorize_nonlogin_user.html index 8629e6e4..ab7da8f0 100644 --- a/app/oauth/templates/oauth/authorize_nonlogin_user.html +++ b/app/oauth/templates/oauth/authorize_nonlogin_user.html @@ -1,15 +1,10 @@ -{% extends "base.html" %} +{% extends "sign_in_with_sl_base.html" %} + +{% block single_content %} +
-{% block content %} -
-
- - - -
- -
+
{{ client.name }} would like to have access to your following data:
@@ -28,7 +23,7 @@
- In order to accept the request, you need to sign in. + Sign in to accept sharing data with {{ client.name }}
diff --git a/static/siwsl.svg b/static/siwsl.svg new file mode 100644 index 00000000..c166ca87 --- /dev/null +++ b/static/siwsl.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Sign in with + + + Simple + Login + + + + + diff --git a/templates/sign_in_with_sl_base.html b/templates/sign_in_with_sl_base.html new file mode 100644 index 00000000..0b25e6da --- /dev/null +++ b/templates/sign_in_with_sl_base.html @@ -0,0 +1,20 @@ +{% extends "base.html" %} + +{% block content %} +
+
+
+
+
+ + + +
+ + {% block single_content %} + {% endblock %} +
+
+
+
+{% endblock %} \ No newline at end of file