diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 1ee7dde..8501577 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 0000000..59f0bbc
--- /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 %}
+
+
+
+
+ {% if signup_open %}
+
+ {% endif %}
+
+
+
+{% endblock %}
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 6f454a8..534792f 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 433e368..734508a 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)
+
+