From 76a5e08e2fe5a5e4052b700efbf48f50ebc91150 2014-01-15 14:36:35
From: Rebecca Lovewell <rebecca@caktusgroup.com>
Date: 2014-01-15 14:36:35
Subject: [PATCH] Use {% load url from future %} in schedule templates

Using https://github.com/futurecolors/django-future-url

---

diff --git a/symposion/templates/schedule/_edit_grid.html b/symposion/templates/schedule/_edit_grid.html
index ff9afe7824eb2ce836fd9cac3a08a8553ee2e300..870391b5872b1926de51764cab310ab86457be30 100644
--- a/symposion/templates/schedule/_edit_grid.html
+++ b/symposion/templates/schedule/_edit_grid.html
@@ -1,3 +1,4 @@
+{% load url from future %}
 <table class="calendar table table-bordered">
     <thead>
         <tr>
@@ -15,9 +16,9 @@
                     <td class="slot slot-{{ slot.kind.label }}" colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}">
                         {% if slot.kind.label == "talk" or slot.kind.label == "tutorial" %}
                             {% if not slot.content %}
-                                <a class="btn btn-mini edit-slot" data-action="{% url schedule_slot_edit schedule.section.slug slot.pk %}" href="#">+</a>
+                                <a class="btn btn-mini edit-slot" data-action="{% url 'schedule_slot_edit' schedule.section.slug slot.pk %}" href="#">+</a>
                             {% else %}
-                                <span class="title"><a class="edit-slot" data-action="{% url schedule_slot_edit schedule.section.slug slot.pk %}" href="#">{{ slot.content.title }}</a></span>
+                                <span class="title"><a class="edit-slot" data-action="{% url 'schedule_slot_edit' schedule.section.slug slot.pk %}" href="#">{{ slot.content.title }}</a></span>
                                 <span class="speaker">{{ slot.content.speaker }}</span>
                             {% endif %}
                         {% else %}
@@ -26,7 +27,7 @@
                             {% else %}
                                 {{ slot.kind.label }}
                             {% endif %}
-                            &mdash; <a class="edit-slot" data-action="{% url schedule_slot_edit schedule.section.slug slot.pk %}" href="#">edit</a>
+                            &mdash; <a class="edit-slot" data-action="{% url 'schedule_slot_edit' schedule.section.slug slot.pk %}" href="#">edit</a>
                         {% endif %}
                     </td>
                 {% endfor %}
diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
index be62d912629d8be27c9a5eb149363f29eff7de0c..71f984483dfb8b0eb1e4bce5ab8cd57a3cd7c5b1 100644
--- a/symposion/templates/schedule/_grid.html
+++ b/symposion/templates/schedule/_grid.html
@@ -1,3 +1,4 @@
+{% load url from future %}
 <table class="calendar table table-bordered">
     <thead>
         <tr>
@@ -17,7 +18,7 @@
                             {% if not slot.content %}
                             {% else %}
                                 <span class="title">
-                                    <a href="{% url schedule_presentation_detail slot.content.pk %}">{{ slot.content.title }}</a>
+                                    <a href="{% url 'schedule_presentation_detail' slot.content.pk %}">{{ slot.content.title }}</a>
                                 </span>
                                 <span class="speaker">
                                     {{ slot.content.speakers|join:", " }}
diff --git a/symposion/templates/schedule/_slot_edit.html b/symposion/templates/schedule/_slot_edit.html
index d8b5ae9ea509bea85bf87b8a1d0b24dc6213c63b..385ff89f98cf20c42914ea3437d0c5f4d7f3793e 100644
--- a/symposion/templates/schedule/_slot_edit.html
+++ b/symposion/templates/schedule/_slot_edit.html
@@ -1,5 +1,6 @@
+{% load url from future %}
 {% load i18n bootstrap_tags %}
-<form id="slotEditForm" class="modal-form" method="POST" action="{% url schedule_slot_edit slug slot.pk %}">
+<form id="slotEditForm" class="modal-form" method="POST" action="{% url 'schedule_slot_edit' slug slot.pk %}">
     <div class="modal-header">
         <a class="close" data-dismiss="modal">&times;</a>
         <h3>{% trans "Edit Slot" %}</h3>
diff --git a/symposion/templates/schedule/presentation_detail.html b/symposion/templates/schedule/presentation_detail.html
index d9dbe880623781a07cd04522dd16b1dbc59f720d..26176fbc88d902b80f6c035e932972cfd2ae4d53 100644
--- a/symposion/templates/schedule/presentation_detail.html
+++ b/symposion/templates/schedule/presentation_detail.html
@@ -1,5 +1,8 @@
 {% extends "site_base.html" %}
 
+{% load url from future %}
+
+
 {% load sitetree %}
 
 {% block head_title %}Presentation: {{ presentation.title }}{% endblock %}
@@ -17,7 +20,7 @@
 
     <h4>
         {% for speaker in presentation.speakers %}
-            <a href="{% url speaker_profile speaker.pk %}">{{ speaker }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
+            <a href="{% url 'speaker_profile' speaker.pk %}">{{ speaker }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
     </h4>
 
     <dl class="dl-horizontal">
diff --git a/symposion/templates/schedule/schedule_list.html b/symposion/templates/schedule/schedule_list.html
index 6992263184b00ed305ccc934b9e454e7667dc770..2e53511979bc8cec91ff54d3c5c89504ba734387 100644
--- a/symposion/templates/schedule/schedule_list.html
+++ b/symposion/templates/schedule/schedule_list.html
@@ -1,5 +1,8 @@
 {% extends "site_base.html" %}
 
+{% load url from future %}
+
+
 {% load i18n %}
 {% load cache %}
 {% load sitetree %}
@@ -33,7 +36,7 @@
         {% for presentation in presentations %}
             <div class="row">
                 <div class="span8 presentation well">
-                    <h3><a href="{% url schedule_presentation_detail presentation.pk %}">{{ presentation.title }}</a></h3>
+                    <h3><a href="{% url 'schedule_presentation_detail' presentation.pk %}">{{ presentation.title }}</a></h3>
                     <h4>{{ presentation.speakers|join:", " }}</h4>
                     {{ presentation.description }}
                     {% if presentation.slot %}