Merge lp:~cjohnston/loco-team-portal/openid into lp:loco-team-portal

[Chris Johnston]

Updates LTP to work with new django-openid-auth

[lp:~cjohnston/loco-team-portal/openid]

486. By Alan Bell on 2011-10-05

[r=chrisjohnston] fixed bug in requirements of python-feedreader
added more useful back button to event and meeting
fixing extra cell in attendee table header

487. By Chris Johnston on 2011-10-05

[r=nigelbabu] Changes LoCo Directory to LoCo Team Portal

488. By Michael Hall on 2011-10-07

[r=chrisjohnston] Adds a wsgi file so we can stop using mod_python

489. By Chris Johnston on 2011-10-10

[r=chrisjohnston] Adds missing translation string.

[Michael Hall (mhall119)]

Needs the new login failure page from my branch

review: Needs Fixing

[Michael Hall (mhall119)]

Looks good

review: Approve

[lp:~cjohnston/loco-team-portal/openid]

490. By Michael Hall on 2011-10-10

[r=mhall119] Updates LTP to work with new django-openid-auth

=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py	2011-06-01 22:19:20 +0000
+++ loco_directory/common/views.py	2011-10-10 20:54:23 +0000
@@ -1,11 +1,22 @@
 # -*- coding: utf-8 -*-
-from django.http import HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.template import RequestContext
+from django.template.loader import render_to_string
 from django.contrib.auth import logout
 from django.utils.translation import check_for_language
 from django.conf import settings
 
+try:
+    from django_openid_auth.exceptions import (
+        MissingPhysicalMultiFactor,
+        MissingUsernameViolation,
+    )
+except ImportError:
+    MissingPhysicalMultiFactor = None
+    MissingUsernameViolation = None
+
+
 def index(request):
     from events.models import GlobalEvent, TeamEvent
     from meetings.models import TeamMeeting
@@ -132,5 +143,20 @@
     meeting_list = meeting_list.filter(Q(name__icontains=q) | Q(teams__name__icontains=q) | Q(agenda__title__icontains=q)).distinct()
     return meeting_list
     
-    
+def login_failure(request, message, status=403,
+           template_name='login_failure.html',
+           exception=None):
+    """Render an error page to the user."""
+    context = {
+        'message': message,
+        'exception': exception,
+    }
+    if isinstance(exception, MissingPhysicalMultiFactor):
+        context['solution'] = 'Try logging in again using your Yubikey'
+    elif isinstance(exception, MissingUsernameViolation):
+        context['solution'] = 'You will need to create a <a href="https://launchpad.net/people/+me">Launchpad profile</a> to use the LoCo Teams Directory'
+
+    data = render_to_string(template_name, context,
+        context_instance=RequestContext(request))
+    return HttpResponse(data, status=status)
 
 
=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2011-10-10 14:16:42 +0000
+++ loco_directory/locale/loco-directory.pot	2011-10-10 20:54:23 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-10 14:16+0000\n"
+"POT-Creation-Date: 2011-10-05 00:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -184,7 +184,7 @@
 msgstr ""
 
 #: events/models.py:229
-#: templates/events/team_event_detail_attendees.inc.html:37
+#: templates/events/team_event_detail_attendees.inc.html:35
 msgid "Additional Guests"
 msgstr ""
 
@@ -942,10 +942,6 @@
 msgid "Click on your continent to find teams near you."
 msgstr ""
 
-#: templates/index.html:60
-msgid "Latest blog articles"
-msgstr ""
-
 #: templates/index.html:79
 msgid "Read More"
 msgstr ""
@@ -1140,6 +1136,7 @@
 
 #: templates/events/event_history_list.html:7
 #: templates/events/global_event_detail.html:24
+#: templates/events/team_event_detail.html:7
 msgid "Back to Events List"
 msgstr ""
 
@@ -1256,14 +1253,14 @@
 msgstr ""
 
 #: templates/events/global_event_detail.html:27
-#: templates/events/team_event_detail.html:12
+#: templates/events/team_event_detail.html:11
 #: templates/meetings/team_meeting_detail.html:10
 #: templates/teams/team_detail.html:9
 msgid "Edit Details"
 msgstr ""
 
 #: templates/events/global_event_detail.html:28
-#: templates/events/team_event_detail.html:13
+#: templates/events/team_event_detail.html:12
 msgid "Delete Event"
 msgstr ""
 
@@ -1391,16 +1388,16 @@
 msgid "Delete"
 msgstr ""
 
-#: templates/events/team_event_detail.html:9
+#: templates/events/team_event_detail.html:8
 #: templates/events/team_event_detail_comments.inc.html:6
 msgid "Add Comment"
 msgstr ""
 
-#: templates/events/team_event_detail.html:14
+#: templates/events/team_event_detail.html:13
 msgid "Copy Event"
 msgstr ""
 
-#: templates/events/team_event_detail.html:17
+#: templates/events/team_event_detail.html:16
 #: templates/meetings/team_meeting_detail.html:15
 #: templates/teams/team_detail.html:160
 msgid "iCal Feed"
@@ -1417,7 +1414,7 @@
 msgstr ""
 
 #: templates/events/team_event_detail.inc.html:25
-#: templates/events/team_event_detail_attendees.inc.html:35
+#: templates/events/team_event_detail_attendees.inc.html:33
 msgid "Attendees"
 msgstr ""
 
@@ -1438,7 +1435,7 @@
 msgid "Maybe attending:"
 msgstr ""
 
-#: templates/events/team_event_detail_attendees.inc.html:36
+#: templates/events/team_event_detail_attendees.inc.html:34
 msgid "Registration Status"
 msgstr ""
 
@@ -1605,6 +1602,7 @@
 msgstr ""
 
 #: templates/meetings/meeting_history_list.html:7
+#: templates/meetings/team_meeting_detail.html:7
 msgid "Back to Meetings List"
 msgstr ""
 
 
=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2011-10-05 00:50:53 +0000
+++ loco_directory/settings.py	2011-10-10 20:54:23 +0000
@@ -32,6 +32,9 @@
 TEMPLATE_DEBUG = DEBUG
 STATIC_SERVE = True
 
+OPENID_STRICT_USERNAMES=True
+OPENID_FOLLOW_RENAMES=True
+
 from common import utils
 VERSION_STRING = utils.get_locodirectory_version(
 			os.path.join(PROJECT_PATH, "version"),
 
=== added file 'loco_directory/templates/login_failure.html'
--- loco_directory/templates/login_failure.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/login_failure.html	2011-10-10 20:54:23 +0000
@@ -0,0 +1,40 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %} {% trans "Login Failure" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
+
+{% block defaulthead %}
+{% with '/ubuntu-website/media/' as ubuntu_website_media %}
+{{ block.super }}
+{% endwith %}
+{% endblock %}
+
+{% block extrahead %}
+{% with '/media/' as MEDIA_URL %}
+{{ block.super }}
+{% endwith %}
+{% endblock %}
+{% block main_nav_links %}{% endblock %}
+
+{% block sub_nav %}{% endblock %}
+
+{% block content %}
+
+<article class="main-content">
+    <h2>{{message|safe}}</h2>
+
+    {% if exception %}
+    <p>{{exception.message|safe}}</p>
+    {% endif %}
+
+    {% if solution %}
+    <p>{{solution|safe}}</p>
+    {% endif %}
+
+    <p>{% trans "If you continue to experience problems with LoCo Team Directory, please " %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a>
+    </p>
+</article>
+
+{% endblock %}
+
+
 
=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2011-03-15 13:08:01 +0000
+++ loco_directory/urls.py	2011-10-10 20:54:23 +0000
@@ -3,6 +3,8 @@
 from django.contrib import admin
 import ubuntu_website
 
+from common.views import login_failure
+
 admin.autodiscover()
 
 urlpatterns = patterns('',
@@ -12,7 +14,6 @@
     url(r'^irc/$', 'common.views.irc_chat', name='irc_chat'),
     url(r'^about-loco/$', 'common.views.about_loco', name='about_loco'),
     url(r'^using-locodir/$', 'common.views.using_locodir', name='using_locodir'),
-    url(r'^openid/', include('django_openid_auth.urls')),
     url(r'^admin/(.*)', admin.site.root),
     url(r'^data/xml', 'teams.views.xml_team_data', name='xml_team_data'),
     url(r'^teams/', include('teams.urls')),
@@ -27,6 +28,14 @@
     url(r'^search/', 'common.views.site_search', name='site_search'),
 )
 
+urlpatterns += patterns('django_openid_auth.views',
+    url(r'^openid/login/$', 'login_begin', name='openid-login',
+        kwargs={'render_failure': login_failure}),
+    url(r'^openid/complete/$', 'login_complete', name='openid-complete',
+        kwargs={'render_failure': login_failure}),
+    url(r'^openid/logo.gif$', 'logo', name='openid-logo'),
+)
+
 if settings.STATIC_SERVE:
     urlpatterns += patterns('',
         (r'^media/(?P<path>.*)$', 'django.views.static.serve',