From 779be914093fac16eb57f295a0d63b2617f294d2 Mon Sep 17 00:00:00 2001 From: Michael Hall Date: Sun, 15 Jul 2018 15:18:20 -0400 Subject: [PATCH] Redesign login page based on design contribution. Fixes #97 --- .../templates/get_together/users/login.html | 108 +++++++++--------- 1 file changed, 53 insertions(+), 55 deletions(-) diff --git a/get_together/templates/get_together/users/login.html b/get_together/templates/get_together/users/login.html index fdae9cf..5ea0672 100644 --- a/get_together/templates/get_together/users/login.html +++ b/get_together/templates/get_together/users/login.html @@ -1,59 +1,57 @@ {% extends "get_together/base.html" %} +{% load static %} -{% block content %} -
-
-
-
-
-

Login using one of these providers:

- {% if settings.SOCIAL_AUTH_GOOGLE_OAUTH2_KEY %} Google{% endif %} - {% if settings.SOCIAL_AUTH_FACEBOOK_KEY %} Faceboook{% endif %} - {% if settings.SOCIAL_AUTH_TWITTER_KEY %} Twitter{% endif %} - {% comment %}{% if settings.SOCIAL_AUTH_LINKEDIN_KEY %} LinkedIn{% endif %}{% endcomment %} - {% if settings.SOCIAL_AUTH_GITHUB_KEY %} GitHub{% endif %} -
Note: The only information GetTogether recieves from these providers is your username and (optionally) your email address. GetTogether will not have access to read any other information from these accounts, not even your password, and will not have access to post information to them.
-
-
-
-
-
-
-
-
-
-

Or, use a local GetTogether account:

- -
-
-
- {% csrf_token %} - - {{ login_form }} -
- -
-
-
-
- {% csrf_token %} - - {{ signup_form }} -
- -
-
-
-
-
-
-
+{% block styles %} + +{% endblock %} + +{% block content %} +
+

Login to your account

+
+
+
+
+ {% if settings.SOCIAL_AUTH_GOOGLE_OAUTH2_KEY %} Google
{% endif %} + {% if settings.SOCIAL_AUTH_FACEBOOK_KEY %} Faceboook
{% endif %} + {% if settings.SOCIAL_AUTH_TWITTER_KEY %} Twitter
{% endif %} + {% comment %}{% if settings.SOCIAL_AUTH_LINKEDIN_KEY %} LinkedIn
{% endif %}{% endcomment %} + {% if settings.SOCIAL_AUTH_GITHUB_KEY %} GitHub
{% endif %} +

OR

+
+ +
+
+
+ {% csrf_token %} + + {{ login_form }} +
+ +
+
+
+
+ {% csrf_token %} + + {{ signup_form }} +
+ +
+
+
+
+
+
+
+
+
{% endblock %}