home as login page

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index ff4272404e36a8645fd97bb86d53330a6021ba9c..7da23852ad5a020cd02530edc1ee6ca6a874af60 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -367,12 +367,16 @@ label.disabled { color: #d7d7d7 }
 }
 
 form.login {
-    font-size: 0.8em;
+    font-size: 0.9em;
     float: left;
     margin-top: 2em;
     margin-bottom: 4em;
-    padding: .5em;
-    border: 1px dotted #888;
+    border: 0px dotted #888;
+    padding: 1em;
+    background-color: #FFF;
+    -moz-border-radius: 8px 0px 8px 8px;
+    -webkit-border-radius: 8px 0px 8px 8px;
+    border-radius: 8px 0px 8px 8px;
 }
 
 .login-error {
@@ -390,7 +394,8 @@ form.login label {
 
 form.login .submit {
     float: right;
-    margin-top: 1em;
+    margin-top: 0em;
+    padding: 0.3em;
 }
 
 /* Search form */

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 14b44e602be1e67235be5d1c282b55b62e089beb..391b5a4398f1a9c5a74e9f1e7591c296fd774cd0 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -68,8 +68,7 @@ alt="logo" />
  <li><a href="{% url teleforma-desk %}" class="violet">{% trans "Desk" %}</a>
  </li>
  {% else %}
-  <li><a href="{% url telemeta-home %}" class="violet">{% trans "Home" %}</a></li>
-  <li><a href="{% url telemeta-login %}" class="blue">{% trans "Sign in" %}</a></li>
+  <li><a href="{% url teleforma-login %}" class="violet">{% trans "Home" %}</a></li>
  {% endif %}
 
  {% if user.is_authenticated %}

diff --git a/teleforma/templates/telemeta/login.html b/teleforma/templates/telemeta/login.html
new file mode 100644 (file)
index 0000000..9115298
--- /dev/null
+++ b/teleforma/templates/telemeta/login.html
@@ -0,0 +1,22 @@
+{% extends "telemeta/base.html" %}
+{% load i18n %}
+
+{% block title %}
+{% endblock %}
+
+{% block content %}
+{% if form.errors %}
+<p class="login-error">{% trans "Your username and password didn't match. Please try again." %}</p>
+{% endif %}
+<form class="login" id="_loginForm" method="post" action="{% url telemeta-login %}">{% csrf_token %}
+<p>
+{{ form.username.label_tag }}
+{{ form.username }}<br />
+{{ form.password.label_tag }}
+{{ form.password }}
+</p>
+<span style="align: right; font-weight: bold;"><a href="{% url telemeta-password-reset %}">{% trans "Password forgotten" %} ?</a></span>
+<input class="submit" type="submit" value="{% trans "Sign in" %}" />
+<input type="hidden" name="next" value="{{ next }}" />
+</form>
+{% endblock %}

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 0a39d6e303be99b62009f5629f8b5ed711b3b420..b44865eef02a30b69329b1c7be1e6086872bc871 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -46,6 +46,8 @@ user_export = UsersXLSExport()
 profile_view = ProfileView()
 
 urlpatterns = patterns('',
+    url(r'^$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
+        name="teleforma-login"),
 
     # Telemeta
     url(r'^', include('telemeta.urls')),