Merge lp:~cjohnston/summit/643050 into lp:summit

[Chris Johnston]

[Michael Hall (mhall119)]

The link to the past summit should use {% url summit.schedule.views.summit summit.name %} rather than just "/{{summit.name}}"

review: Needs Fixing

[lp:~cjohnston/summit/643050]

89. By Chris Johnston on 2011-04-27

Fixes URL, changes file name

90. By Chris Johnston on 2011-04-27

Adds new file

=== added file 'summit/schedule/templates/schedule/past_summit.html'
--- summit/schedule/templates/schedule/past_summit.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/past_summit.html	2011-04-27 20:50:58 +0000
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+{% load datetime %}
+{% load i18n %}
+
+{% block title %}{% trans 'Previous Ubuntu Developer Summits' %}{% endblock %}
+
+{% block sub_nav_links %}
+    <a class="sub-nav-item" href="{% url summit.schedule.views.summit next_summit.name %}">{% trans 'Current Summit' %}</a>
+{% endblock %}
+
+{% block content %}
+
+<article class="main-content">
+{% for summit in past_summit reversed %}
+<h1><a href="{% url summit.schedule.views.summit summit.name %} ">{{ summit.title }}</a></h1>
+<p>
+{% include "schedule/summit_info.html" %}
+</p>
+{% endfor %}
+</article>
+
+{% endblock %}

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2011-04-02 00:34:06 +0000
+++ summit/schedule/templates/schedule/summit.html	2011-04-27 20:50:58 +0000
@@ -22,6 +22,7 @@
     {% if attendee %}
     <a class="sub-nav-item" href="/{{ summit.name }}/participant/{{ attendee.user.username }}.ical">{% trans 'My Sessions (iCal)' %}</a>
     {% endif %}
+    <a class="sub-nav-item" href="{% url summit.schedule.views.past %}">{% trans 'Past Summits' %}</a>
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2011-04-19 21:50:43 +0000
+++ summit/schedule/views.py	2011-04-27 20:50:58 +0000
@@ -267,3 +267,11 @@
 
 def mobile(request):
     return render_to_response("schedule/mobile.html", {}, RequestContext(request))
+
+def past(request):
+    pastsummit = Summit.objects.filter(date_end__lte=datetime.date.today())
+    context = {
+        'past_summit': pastsummit,
+    }
+    return render_to_response("schedule/past_summit.html", context,
+                          context_instance=RequestContext(request))

=== modified file 'summit/urls.py'
--- summit/urls.py	2011-04-20 14:44:33 +0000
+++ summit/urls.py	2011-04-27 20:50:58 +0000
@@ -54,6 +54,7 @@
 
 urlpatterns += patterns('summit.schedule.views',
     (r'^today/$', 'today_view'),
+    url(r'^past/', 'past', name='past'),
     url(r'^mobile/', 'mobile', name='mobile'),
     url(r'^logout$', 'logout_view', name='logout'),
     (r'^(?P<summit_name>[\w-]+)/$', 'summit'),