Changeset - 76a5e08e2fe5
[Not reviewed]
0 5 0
Rebecca Lovewell - 10 years ago 2014-01-15 14:36:35
rebecca@caktusgroup.com
Use {% load url from future %} in schedule templates

Using https://github.com/futurecolors/django-future-url
5 files changed with 16 insertions and 7 deletions:
0 comments (0 inline, 0 general)
symposion/templates/schedule/_edit_grid.html
Show inline comments
 
{% load url from future %}
 
<table class="calendar table table-bordered">
...
 
@@ -17,5 +18,5 @@
 
                            {% 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>
...
 
@@ -28,3 +29,3 @@
 
                            {% 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 %}
symposion/templates/schedule/_grid.html
Show inline comments
 
{% load url from future %}
 
<table class="calendar table table-bordered">
...
 
@@ -19,3 +20,3 @@
 
                                <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>
symposion/templates/schedule/_slot_edit.html
Show inline comments
 
{% 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">
symposion/templates/schedule/presentation_detail.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load sitetree %}
...
 
@@ -19,3 +22,3 @@
 
        {% 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>
symposion/templates/schedule/schedule_list.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -35,3 +38,3 @@
 
                <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>
0 comments (0 inline, 0 general)