Fix mouseover text. Tidy up non rig detail

This commit is contained in:
tomtom5152
2015-03-28 17:32:47 +00:00
parent cc85b44ba3
commit 188f06afc2

View File

@@ -11,13 +11,17 @@
<div class="btn-group btn-page"> <div class="btn-group btn-page">
<a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-edit"></span></a> class="glyphicon glyphicon-edit"></span></a>
<a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span {% if event.is_rig %}
class="glyphicon glyphicon-print"></span></a> <a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-print"></span></a>
{% endif %}
<a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
class="glyphicon glyphicon-duplicate"></span></a> class="glyphicon glyphicon-duplicate"></span></a>
{% if perms.RIGS.add_invoice %} {% if event.is_rig %}
<a href="{% url 'invoice_event' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span {% if perms.RIGS.add_invoice %}
class="glyphicon glyphicon-gbp"></span></a> <a href="{% url 'invoice_event' event.pk %}" class="btn btn-default" title="Invoice Rig"><span
class="glyphicon glyphicon-gbp"></span></a>
{% endif %}
{% endif %} {% endif %}
</div> </div>
</div> </div>
@@ -68,8 +72,10 @@
<dt>Event Venue</dt> <dt>Event Venue</dt>
<dd>{{ object.venue }}</dd> <dd>{{ object.venue }}</dd>
<dt>Event MIC</dt> {% if event.is_rig %}
<dd>{{ event.mic.name }}</dd> <dt>Event MIC</dt>
<dd>{{ event.mic.name }}</dd>
{% endif %}
<dt>Status</dt> <dt>Status</dt>
<dd>{{ event.get_status_display }}</dd> <dd>{{ event.get_status_display }}</dd>
@@ -114,8 +120,10 @@
<dd>{{ object.checked_in_by.name }}</dd> <dd>{{ object.checked_in_by.name }}</dd>
{% endif %} {% endif %}
<dt>Collected By</dt> {% if event.is_rig %}
<dd>{{ object.collector }}</dd> <dt>Collected By</dt>
<dd>{{ object.collector }}</dd>
{% endif %}
</dl> </dl>
</div> </div>
</div> </div>
@@ -124,45 +132,49 @@
<div class="btn-group btn-page"> <div class="btn-group btn-page">
<a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-edit"></span></a> class="glyphicon glyphicon-edit"></span></a>
<a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span {% if event.is_rig %}
class="glyphicon glyphicon-print"></span></a> <a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-print"></span></a>
{% endif %}
<a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
class="glyphicon glyphicon-duplicate"></span></a> class="glyphicon glyphicon-duplicate"></span></a>
{% if perms.RIGS.add_invoice %} {% if event.is_rig %}
<a href="{% url 'invoice_event' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span {% if perms.RIGS.add_invoice %}
class="glyphicon glyphicon-gbp"></span></a> <a href="{% url 'invoice_event' event.pk %}" class="btn btn-default" title="Invoice Rig"><span
class="glyphicon glyphicon-gbp"></span></a>
{% endif %}
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="col-sm-12"> {% if event.is_rig %}
<div class="panel panel-default"> <div class="col-sm-12">
<div class="panel-heading">Event Details</div> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-heading">Event Details</div>
<div class="well well-sm"> <div class="panel-body">
<h4>Notes</h4> <div class="well well-sm">
{{ event.notes|linebreaksbr }} <h4>Notes</h4>
</div> {{ event.notes|linebreaksbr }}
{% if event.is_rig %} </div>
{% include 'RIGS/item_table.html' %} {% include 'RIGS/item_table.html' %}
{% endif %} </div>
</div> </div>
</div> </div>
</div> <div class="col-sm-12 text-right">
<div class="col-sm-12 text-right"> <div class="btn-group btn-page">
<div class="btn-group btn-page"> <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
<a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span class="glyphicon glyphicon-edit"></span></a>
class="glyphicon glyphicon-edit"></span></a> <a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span
<a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span class="glyphicon glyphicon-print"></span></a>
class="glyphicon glyphicon-print"></span></a> <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
<a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span class="glyphicon glyphicon-duplicate"></span></a>
class="glyphicon glyphicon-duplicate"></span></a> {% if perms.RIGS.add_invoice %}
{% if perms.RIGS.add_invoice %} <a href="{% url 'invoice_event' event.pk %}" class="btn btn-default" title="Invoice Rig"><span
<a href="{% url 'invoice_event' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span class="glyphicon glyphicon-gbp"></span></a>
class="glyphicon glyphicon-gbp"></span></a> {% endif %}
{% endif %} </div>
<div>Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }}
by {{ object.last_edited_by.name }}.
</div>
</div> </div>
<div>Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }} {% endif %}
by {{ object.last_edited_by.name }}.
</div>
</div>
{% endblock %} {% endblock %}