diff --git a/colab/accounts/urls.py b/colab/accounts/urls.py index 996175e..8e13120 100644 --- a/colab/accounts/urls.py +++ b/colab/accounts/urls.py @@ -12,6 +12,9 @@ urlpatterns = patterns('', ChangeXMPPPasswordView.as_view(), name='change_password'), url(r'^login/?$', LoginView.as_view(), name='login'), +# url(r'^login/?$', 'django.contrib.auth.views.login', name='login'), + +# url(r'^logout/?$', 'accounts.views.logoutColab', name='logout'), url(r'^(?P[\w@+.-]+)/?$', UserProfileDetailView.as_view(), name='user_profile'), diff --git a/colab/static/css/screen.css b/colab/static/css/screen.css index dc9cf89..8b58cc5 100644 --- a/colab/static/css/screen.css +++ b/colab/static/css/screen.css @@ -117,7 +117,7 @@ form.signup .form-group { div.submit { margin: auto; - margin-bottom: 5em; + margin-bottom: 2em; width: 200px; } diff --git a/src/accounts/templates/registration/login.html b/src/accounts/templates/registration/login.html new file mode 100644 index 0000000..0abc3a2 --- /dev/null +++ b/src/accounts/templates/registration/login.html @@ -0,0 +1,50 @@ + +{% extends "base.html" %} +{% load i18n %} +{% block main-content %} + + +
+ {% if form.errors %} +
+ {% trans "Please correct the errors below and try again" %} +
+ {% endif %} +
+ +
+
+ {% csrf_token %} + +
+
+
+

{% trans 'Login' %}

+ +
+
+ {{ form.username.label_tag }} + + {{ form.username.errors }} +
+
+ {{ form.password.label_tag }} + + {{ form.password.errors }} +
+
+
+
+
+ + + +
+ +{% endblock %} + -- libgit2 0.21.2