Skip to content
Browse files

Merge branch 'release-1.1.4'

  • Loading branch information...
2 parents 6d47050 + 4831b69 commit a061555f2af09812ec78e8a9f7234d7abbe6566e @brosner brosner committed Jan 28, 2011
View
3 pycon_project/apps/schedule/urls.py
@@ -7,8 +7,11 @@
# url(r"^sessions/(\d+)/", "schedule_session", name="schedule_session"),
url(r"^$", direct_to_template, {"template": "schedule/index.html"}, name="schedule_index"),
+
url(r"^lists/talks/", "schedule_list_talks", name="schedule_list_talks"),
url(r"^lists/tutorials/", "schedule_list_tutorials", name="schedule_list_tutorials"),
+ url(r"^lists/posters/", "schedule_list_posters", name="schedule_list_posters"),
+
url(r"^tutorials/", "schedule_tutorials", name="schedule_tutorials"),
url(r"^sessions/(\d+)/", "schedule_session", name="schedule_session"),
)
View
12 pycon_project/apps/schedule/views.py
@@ -57,6 +57,18 @@ def schedule_list_tutorials(request):
}), context_instance=RequestContext(request))
+def schedule_list_posters(request):
+
+ posters = Session.objects.filter(
+ session_type=Session.SESSION_TYPE_POSTER
+ )
+ posters = posters.order_by("pk")
+
+ return render_to_response("schedule/list_posters.html", dict({
+ "posters": posters,
+ }), context_instance=RequestContext(request))
+
+
def schedule_tutorials(request):
tutorials = {
View
1 pycon_project/templates/schedule/index.html
@@ -12,5 +12,6 @@
<ul>
<li><a href="{% url schedule_tutorials %}">Tutorial Schedule</a></li>
<li><a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a></li>
+ <li><a href="{% url schedule_list_posters %}">List of Accepted Posters</a></li>
</ul>
{% endblock %}
View
50 pycon_project/templates/schedule/list_posters.html
@@ -0,0 +1,50 @@
+{% extends "schedule/base.html" %}
+
+{% load boxes_tags %}
+
+{% block extra_head %}
+ <style>
+ .session {
+ margin-top: 10px;
+ }
+ .title {
+ font-size: 14pt;
+ font-weight: bold;
+ }
+ </style>
+{% endblock %}
+
+{% block subnav %}
+ <a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a>
+ |
+ <a href="{% url schedule_tutorials %}">Tutorial Schedule</a>
+{% endblock %}
+
+{% block body %}
+ <h1>Accepted Posters</h1>
+
+ <div>
+ {% box "posters-intro" %}
+ </div>
+
+ {% for poster in posters %}
+ <div class="session">
+ <div class="title">
+ <a href="{% url schedule_session poster.pk %}">{{ poster.title }}</a>
+ </div>
+ <div class="metadata">
+ {{ poster.get_audience_level_display }}
+ {{ poster.get_session_type_display }}
+ by
+ {{ poster.speaker }}
+ {% if poster.additional_speakers.all %}
+ with
+ {{ poster.additional_speakers.all|join:", " }}
+ {% endif %}
+ </div>
+ </div>
+ {% empty %}
+ <p>No accepted posters yet.</p>
+ {% endfor %}
+
+{% endblock %}
View
2 pycon_project/templates/schedule/list_talks.html
@@ -16,6 +16,8 @@
<a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a>
|
<a href="{% url schedule_tutorials %}">Tutorial Schedule</a>
+ |
+ <a href="{% url schedule_list_posters %}">List of Accepted Posters</a>
{% endblock %}
{% block body %}
View
2 pycon_project/templates/schedule/list_tutorials.html
@@ -16,6 +16,8 @@
<a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a>
|
<a href="{% url schedule_tutorials %}">Tutorial Schedule</a>
+ |
+ <a href="{% url schedule_list_posters %}">List of Accepted Posters</a>
{% endblock %}
{% block body %}
View
2 pycon_project/templates/schedule/tutorials.html
@@ -14,6 +14,8 @@
{% block subnav %}
<a href="{% url schedule_list_talks %}">List of Accepted Talks and Panels</a>
+ |
+ <a href="{% url schedule_list_posters %}">List of Accepted Posters</a>
{% endblock %}
{% block body %}

0 comments on commit a061555

Please sign in to comment.
Something went wrong with that request. Please try again.