Adding a login form and REGISTER_URL

mdn · May 26, 2010 · 26e2d76 · 26e2d76
1 parent 66c2c5c
commit 26e2d76
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 14 deletions.
diff --git a/apps/sumo/context_processors.py b/apps/sumo/context_processors.py
@@ -1,11 +1,6 @@
 from django.conf import settings
 
 
-def title(request):
-    """Adds site title to the context."""
-    return {'SITE_TITLE': settings.SITE_TITLE}
-
-
-def auth(request):
-    """Adds auth-related urls to the context."""
-    return {'LOGIN_URL': settings.LOGIN_URL, 'LOGOUT_URL': settings.LOGOUT_URL}
+def global_settings(request):
+    """Adds settings to the context."""
+    return {'settings': settings}
diff --git a/apps/sumo/templates/handlers/403.html b/apps/sumo/templates/handlers/403.html
@@ -9,7 +9,7 @@ <h2>{{ title }}</h2>
 <p>{{ _('You do not have permission to access this page.') }}</p>
 
 {% if not user.is_authenticated() %}
-  <p><a href="{{ LOGIN_URL }}">{{ _('Click here to log in') }}</a></p>
+  {% include "layout/login.html" %}
 {% endif %}
 
 {% endblock %}
diff --git a/media/css/main.css b/media/css/main.css
@@ -421,6 +421,28 @@ h2 {
 }
 /* end orange buttons */
 
+/* Login form */
+#login-form {
+    margin: 1em 0;
+}
+
+#login-form h3 {
+    color: #afaba3;
+    font-size: 150%;
+    margin-bottom: .5em;
+}
+
+#login-form label {
+    color: #807970;
+    display: block;
+    margin: .3em 0;
+}
+
+#login-form input {
+    margin: .3em 0;
+}
+/* End login form */
+
 /* Paginators */
 ol.pagination {
     margin: 0 auto 1em;

diff --git a/settings.py b/settings.py
@@ -117,8 +117,8 @@
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'django.contrib.messages.context_processors.messages',
-    'sumo.context_processors.title',
-    'sumo.context_processors.auth',
+
+    'sumo.context_processors.global_settings',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -293,3 +293,4 @@ def JINJA_CONFIG():
 # TODO: Once we can log in through Kitsune, change this.
 LOGIN_URL = '/tiki-login.php'
 LOGOUT_URL = '/tiki-logout.php'
+REGISTER_URL = '/tiki-register.php'
diff --git a/templates/layout/base.html b/templates/layout/base.html
@@ -3,7 +3,7 @@
 <html lang="{{ request.locale }}" dir="{{ dir }}">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>{{ title }} | {{ SITE_TITLE }}</title>
+<title>{{ title }} | {{ settings.SITE_TITLE }}</title>
 
 <link rel="shortcut icon" type="image/x-icon" href="{{ MEDIA_URL }}img/favicon.ico"/>
 <link rel="search" type="application/opensearchdescription+xml" title="Firefox Support" href="/search.xml"/>

diff --git a/templates/layout/login.html b/templates/layout/login.html
@@ -0,0 +1,33 @@
+{# vim: set ts=2 et sts=2 sw=2: #}
+{% block login %}
+
+<div id="login-form">
+  <h3>{{ _('Log in') }}</h3>
+
+  {# TODO: Use reverse for the login url once it's off TikiWiki #}
+  <form action="https://{{ request.META['HTTP_HOST'] }}{{ settings.LOGIN_URL }}" method="POST">
+    <label for="id_username">{{ _('Username:') }}</label>
+    <input type="text" id="id_username" name="user"/>
+
+    <label for="id_password">{{ _('Password:') }}</label>
+    <input type="password" id="id_password" name="pass"/>
+
+    <label for="id_remember">
+      <input type="checkbox" value="on" id="id_remember" name="rme">
+      {{ _('Remember me') }}
+    </label>
+
+    <div>
+      <input type="submit" name="login" value="{{ _('Log in') }}"/>
+    </div>
+
+    [ <a title="{{ _('Click here to register') }}" href="{{ settings.REGISTER_URL }}">
+        {{ _('Register') }}
+      </a>
+    | <a title="{{ _("Click here if you've forgotten your password") }}" href="/tiki-remind_password.php">{{ _('I forgot my password') }}</a> ]
+
+    <input type="hidden" value="y" name="stay_in_ssl_mode"/>
+  </form>
+</div>{# /login-form #}
+
+{% endblock %}
diff --git a/templates/layout/sidebar.html b/templates/layout/sidebar.html
@@ -9,9 +9,9 @@
   <li><a href="/kb/How+to+contribute">{{ _('How to Contribute') }}</a></li>
   {% if user.is_authenticated() %}
     <li><a href="/tiki-user_preferences.php">{{ _('My Account') }}</a></li>
-    <li><a href="{{ LOGOUT_URL }}">{{ _('Log Out') }}</a></li>
+    <li><a href="{{ settings.LOGOUT_URL }}">{{ _('Log Out') }}</a></li>
   {% else %}
-    <li><a href="{{ LOGIN_URL }}">{{ _('Log In') }}</a></li>
+    <li><a href="{{ settings.LOGIN_URL }}">{{ _('Log In') }}</a></li>
   {% endif %}
 </ul>
 {% endblock %}