Merge branch 'master' into revision-view

This commit is contained in:
David Taylor
2015-05-21 17:01:59 +01:00
14 changed files with 81 additions and 17613 deletions

View File

@@ -1,13 +1,15 @@
{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
{% block title %}Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}
{% endif %}{% endblock %}
{% block title %}{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} | {{object.name}}{% endblock %}
{% block content %}
<div class="row">
{% if not request.is_ajax %}
<div class="col-sm-12">
<div class="col-sm-8">
<h1>Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}</h1>
<h1>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
| {{ object.name }}
</h1>
</div>
</div>
<div class="col-sm-12 text-right">
@@ -53,7 +55,7 @@
<dt>Email</dt>
<dd>
<a href="mailto:{{object.person.email}}" target="_blank">
{{ object.person.email }}
<span class="overflow-ellipsis">{{ object.person.email }}</span>
</a>
</dd>
@@ -93,7 +95,7 @@
{% endif %}
<div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
<div class="panel panel-info">
<div class="panel-heading">{{ object.name }}</div>
<div class="panel-heading">Event Info</div>
<div class="panel-body">
<dl class="dl-horizontal">
<dt>Event Venue</dt>