Merge lp:~elachuni/ubuntu-webcatalog/admin-openid into lp:ubuntu-webcatalog

[Anthony Lenton]

Plug django-openid-auth in so that it's used when authenticating into the admin area

This branch plugs django-openid-auth in so that it's used when authenticating into the admin area

[Ricardo Kirkner (ricardokirkner)]

Nothing unexpected. Move along people!

review: Approve

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2011-07-19 15:44:09 +0000
+++ django_project/config/main.cfg	2011-08-10 19:03:14 +0000
@@ -11,7 +11,7 @@
 debug = true
 media_root = django_project/media_root_dev/
 
-installed_apps = django.contrib.auth
+installed_apps = webcatalog
                  django.contrib.contenttypes
                  django.contrib.sessions
                  django.contrib.sites
@@ -21,7 +21,7 @@
                  django.contrib.admin
                  django_openid_auth
                  django_configglue
-                 webcatalog
+                 django.contrib.auth
                  south
                  preflight
                  pgtools
@@ -50,7 +50,6 @@
                               webcatalog.context_processors.google_analytics_id
                               webcatalog.context_processors.user_agent
 
-template_dirs = django_project/templates/
 static_root = ./django_project/static/
 static_url = /assets/
 admin_media_prefix = /assets/admin/

=== modified file 'django_project/urls.py'
--- django_project/urls.py	2011-07-05 16:09:31 +0000
+++ django_project/urls.py	2011-08-10 19:03:14 +0000
@@ -19,6 +19,7 @@
 from django.conf.urls.defaults import patterns, include, url
 from django.conf import settings
 from django.contrib import admin
+from django.contrib.auth.views import logout
 from django.views.generic.simple import redirect_to
 
 admin.autodiscover()
@@ -30,6 +31,9 @@
     (r'^preflight/$', include('preflight.urls')),
     url(r'^$', redirect_to, {'url': '/cat/'}),
 
+    # OpenID views
+    (r'^openid/', include('django_openid_auth.urls')),
+    (r'^logout/$', logout, {'next_page': '/cat/'}),
 )
 
 if settings.SERVE_SITE_MEDIA:

=== added directory 'src/webcatalog/templates/admin'
=== added file 'src/webcatalog/templates/admin/login.html'
--- src/webcatalog/templates/admin/login.html	1970-01-01 00:00:00 +0000
+++ src/webcatalog/templates/admin/login.html	2011-08-10 19:03:14 +0000
@@ -0,0 +1,28 @@
+{% extends "admin/base_site.html" %}
+{% load i18n %}
+
+{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/login.css" />{% endblock %}
+
+{% block bodyclass %}login{% endblock %}
+
+{% block content_title %}{% endblock %}
+
+{% block breadcrumbs %}{% endblock %}
+
+{% block content %}
+{% if error_message %}
+<p class="errornote">{{ error_message }}</p>
+{% endif %}
+<div id="content-main">
+  <form name="fopenid" action="/openid/login/" method="post" id="login-form" >
+      {% csrf_token %}
+    <input type="hidden" name="next" value="{{ app_path }}" />
+    <div class="form-row">
+      {{ form.openid_identifier }}
+    </div>
+    <div class="submit-row ">
+        <input name="bsignin" type="submit" value="{% trans "Sign in" %}">
+    </div>
+  </form>
+</div>
+{% endblock %}