From a6cf86f826542baeb9bfa948916776ef8a517a62 2017-08-18 15:46:51
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: 2017-08-18 15:46:51
Subject: [PATCH] Adds new combined login & signup view
---

diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 1ee7dde2594326e88d5e76a802977ec037fd670e..8501577c02716bc40ef9ad62ecd7da7339070fcc 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -261,6 +261,8 @@ EMAIL_HOST_PASSWORD = os.environ.get("DJANGO_EMAIL_HOST_PASSWORD", "")
 EMAIL_USE_TLS = bool(int(os.environ.get("DJANGO_EMAIL_USE_TLS", "0")))
 EMAIL_USE_SSL = bool(int(os.environ.get("DJANGO_EMAIL_USE_SSL", "0")))
 
+ACCOUNT_LOGIN_URL = "nbpy_login"
+LOGIN_URL = "nbpy_login"
 
 # We need to explicitly switch on signups.
 ACCOUNT_OPEN_SIGNUP = bool(int(os.environ.get("DJANGO_ACCOUNT_OPEN_SIGNUP", "0")))
diff --git a/pinaxcon/templates/account_login.html b/pinaxcon/templates/account_login.html
new file mode 100644
index 0000000000000000000000000000000000000000..59f0bbc7474fd6ac11ab2baf90f46d2b6b76c3e8
--- /dev/null
+++ b/pinaxcon/templates/account_login.html
@@ -0,0 +1,59 @@
+{% extends "page_with_title_and_lede.html" %}
+
+{% load bootstrap %}
+{% load i18n %}
+
+{% block head_title %}Log In{% endblock %}
+
+{% block heading %}Log In or Sign Up{% endblock %}
+
+{% block body_class %}login{% endblock %}
+
+{% block content %}
+
+  <div class="container">
+    <div class="row">
+      <div class="col-md-4">
+
+        <form action="{% url 'account_login' %}" method="POST">
+          <div class="panel panel-primary">
+            <div class="panel-heading">
+              <h3 class="panel-title">
+                Log into an existing account
+              </h3>
+            </div>
+            <div class="panel-body">
+              {% csrf_token %}
+              {{ login_form| bootstrap }}
+            </div>
+            <div class="panel-footer">
+              <button role="submit" class="btn btn-primary">Log In</button>
+            </div>
+          </div>
+        </form>
+
+      </div>
+      {% if signup_open %}
+        <div class="col-md-4">
+          <form action="{% url 'account_signup' %}" method="POST">
+            <div class="panel panel-default">
+              <div class="panel-heading">
+                <h3 class="panel-title">
+                  Sign up for a new account
+                </h3>
+              </div>
+              <div class="panel-body">
+                {% csrf_token %}
+                {{ signup_form|bootstrap }}
+              </div>
+              <div class="panel-footer">
+                <button role="submit" class="btn btn-primary">Sign Up</button>
+              </div>
+            </div>
+          </form>
+        </div>
+      {% endif %}
+    </div>
+  </div>
+
+{% endblock %}
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 6f454a87254105804a59d8d28cdc7a81bdad52e5..534792f33e3d8f340b6ce00a92ad225d808a28bc 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -52,6 +52,7 @@ urlpatterns = [
 
     url(r"^admin/", include(admin.site.urls)),
 
+    url(r"^login$", views.account_login, name="nbpy_login"),
     url(r"^account/", include("account.urls")),
 
     url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
diff --git a/pinaxcon/views.py b/pinaxcon/views.py
index 433e3684b49a6d76a2d4f230a143b6b873bed7ea..734508a20976ef00abe097a48dcbcf3d5f4f868e 100644
--- a/pinaxcon/views.py
+++ b/pinaxcon/views.py
@@ -1,9 +1,27 @@
+from django.conf import settings
 from django.http import HttpResponseServerError
+from django.shortcuts import render
 from django.template import RequestContext
 from django.template import Template
 from django.template.loader import get_template
 from django.views import defaults
 
+from account.forms import LoginEmailForm, LoginUsernameForm, SignupForm
+
 def server_error(request, template_name=defaults.ERROR_500_TEMPLATE_NAME):
     t = Template("{%% include '%s' %%}" % template_name)
     return HttpResponseServerError(t.render(RequestContext(request)))
+
+
+def account_login(request):
+
+    d = {
+        "login_form": LoginEmailForm(),
+        "signup_form": SignupForm(),
+        "signup_open": getattr(settings, "ACCOUNT_OPEN_SIGNUP", True),
+    }
+
+    print d["signup_open"], settings.ACCOUNT_OPEN_SIGNUP
+    return render(request, "account_login.html", d)
+
+