Various template changes

This commit is contained in:
2020-03-15 02:53:12 +00:00
parent 7786512dc2
commit 270b1fc5bb
15 changed files with 66 additions and 107 deletions

View File

@@ -6,8 +6,6 @@
<td>Event Date</td>
<td>Event Timings</td>
<td>Event Details</td>
<td>Status</td>
<td>Authorisation</td>
<td>MIC</td>
</tr>
</thead>
@@ -15,7 +13,7 @@
{% for event in events %}
<tr class="
{% if event.cancelled %}
active text-muted
text-muted
{% elif not event.is_rig %}
info
{% endif %}">
@@ -65,7 +63,7 @@
{% if event.dry_hire %}
<span class="badge badge-secondary">Dry Hire</span>
{% endif %}
</h4>
{% if event.is_rig and not event.cancelled %}
<h5>
@@ -80,15 +78,12 @@
{{ event.description|linebreaksbr }}
</div>
{% endif %}
</td>
<!---Status-->
<td class="bg-{% if event.confirmed %}success{%else%}warning{%endif%}">
<span>{{ event.get_status_display }}</span>
</td>
<!---Authorisation-->
<td>
<span class="badge badge-{% if event.confirmed %}success{%else%}warning{%endif%}">{{ event.get_status_display }}</span>
{% if event.is_rig and perms.RIGS.view_event and event.authorised %}
<span class="fas fa-check"></span>
<span class="badge badge-success">Authorised <i class="fas fa-check"></i></span>
{% endif %}
{% if event.is_rig and perms.RIGS.view_event and event.risk_assessment_edit_url %}
<span class="badge badge-success">RA <i class="fas fa-check"></i></span>
{% endif %}
</td>
<!---MIC-->
@@ -112,4 +107,4 @@
{% endfor %}
</tbody>
</table>
</div>
</div>