Permalink
Browse files

Show event's DJs, and DJ's events.

  • Loading branch information...
1 parent 5ee27c5 commit 0effd08da77bc31a720e17e2c3d4005b10893678 @gldnspud committed Apr 22, 2012
Showing with 11 additions and 12 deletions.
  1. +3 −11 templates/dj.html
  2. +8 −1 templates/event.html
View
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% from "macros.html" import recording_table %}
+{% from "macros.html" import event_table, genre_table, recording_table %}
{% block title %}{{ obj.name }} - DJs{% endblock %}
@@ -56,22 +56,14 @@
{% if obj.genres %}
<dt>Genres</dt>
<dd>
- <ul>
- {% for slug in obj.genres %}
- <li><a href="{{ root }}genre/{{ slug }}.html">{{ slug|slugname('genre') }}</a></li>
- {% endfor %}
- </ul>
+ {{ genre_table(obj.genres|slugobjects('genre')) }}
</dd>
{% endif %}
{% if obj.events %}
<dt>Events</dt>
<dd>
- <ul>
- {% for slug in obj.events %}
- <li><a href="{{ root }}event/{{ slug }}.html">{{ slug|slugname('event') }}</a></li>
- {% endfor %}
- </ul>
+ {{ event_table(obj.events|slugobjects('event')) }}
</dd>
{% endif %}
View
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% from "macros.html" import recording_table %}
+{% from "macros.html" import dj_table, recording_table %}
{% block title %}{{ obj.name }} - Events{% endblock %}
@@ -32,6 +32,13 @@
<dd><a href="{{ root }}city/{{ obj.city }}.html">{{ obj.city|slugname('city') }}</a></dd>
{% endif %}
+ {% if obj.djs %}
+ <dt>DJs</dt>
+ <dd>
+ {{ dj_table(obj.djs|slugobjects('dj')) }}
+ </dd>
+ {% endif %}
+
{% if obj.recordings %}
<dt>Recordings</dt>
<dd>

0 comments on commit 0effd08

Please sign in to comment.