Merge branch 'master' into revision-view

This commit is contained in:
Tom Price
2015-05-25 22:13:33 +01:00
3 changed files with 26 additions and 14 deletions

View File

@@ -80,12 +80,12 @@
{% endif %}
</td>
<td class="text-right">
{% if event.mic or not event.is_rig %}
{% if event.mic %}
{{ event.mic.initials }}
<div>
<img src="{{ event.mic.profile_picture }}" class="event-mic-photo"/>
</div>
{% else %}
{% elif event.is_rig %}
<span class="glyphicon glyphicon-exclamation-sign"></span>
{% endif %}
</td>