Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use {% load url from future %} in speakers templates

Browse source 
Using https://github.com/futurecolors/django-future-url
This commit is contained in:
Rebecca Lovewell 2014-01-15 08:59:06 -05:00
parent 76a5e08e2f
commit 9e2ceec7c4
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
symposion/templates/speakers/speaker_create.html
View file

@ -1,5 +1,8 @@
{% extends "speakers/base.html" %} {% extends "speakers/base.html" %}
{% load url from future %}
{% load bootstrap_tags %} {% load bootstrap_tags %}
{% load i18n %} {% load i18n %}
{% load boxes_tags %} {% load boxes_tags %}
@ -17,7 +20,7 @@
</fieldset> </fieldset>
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="submit" value="Save" /> <input class="btn btn-primary" type="submit" value="Save" />
<a class="btn" href="{% url dashboard %}">Cancel</a> <a class="btn" href="{% url 'dashboard' %}">Cancel</a>
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

5
symposion/templates/speakers/speaker_edit.html
View file

@ -1,5 +1,8 @@
{% extends "speakers/base.html" %} {% extends "speakers/base.html" %}
{% load url from future %}
{% load bootstrap_tags %} {% load bootstrap_tags %}
{% load i18n %} {% load i18n %}
{% load boxes_tags %} {% load boxes_tags %}
@ -17,7 +20,7 @@
</fieldset> </fieldset>
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="submit" value="Save" /> <input class="btn btn-primary" type="submit" value="Save" />
<a class="btn" href="{% url dashboard %}">Cancel</a> <a class="btn" href="{% url 'dashboard' %}">Cancel</a>
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

7
symposion/templates/speakers/speaker_profile.html
View file

@ -1,5 +1,8 @@
{% extends "site_base.html" %} {% extends "site_base.html" %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% load thumbnail %} {% load thumbnail %}
@ -17,14 +20,14 @@
</div> </div>
<div class="span6"> <div class="span6">
{% if speaker.user == request.user or request.user.is_staff %} {% if speaker.user == request.user or request.user.is_staff %}
<a class="btn pull-right" href="{% url speaker_edit speaker.pk %}">Edit</a> <a class="btn pull-right" href="{% url 'speaker_edit' speaker.pk %}">Edit</a>
{% endif %} {% endif %}
<h1>{{ speaker.name }}</h1> <h1>{{ speaker.name }}</h1>
<div class="bio">{{ speaker.biography|safe }}</div> <div class="bio">{{ speaker.biography|safe }}</div>
<h2>Presentations</h2> <h2>Presentations</h2>
{% for presentation in presentations %} {% for presentation in presentations %}
<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>
{% if presentation.slot %} {% if presentation.slot %}
<p> <p>
{{ presentation.slot.day.date|date:"l" }} {{ presentation.slot.day.date|date:"l" }}