arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-26 09:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes

Browse Source
This commit is contained in:
Tom Price
2015-05-29 01:17:30 +01:00
parent fff913fffe 3b6e905881
commit d556ebabc4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
RIGS/templates/RIGS/event_detail.html
View File

@@ -119,18 +119,18 @@
{% if event.is_rig %} {% if event.is_rig %}
<dt>Crew Meet</dt> <dt>Crew Meet</dt>
<dd>{{ event.meet_at|date:"d M Y H:i"|default:"" }}</dd> <dd>{{ event.meet_at|date:"D d M Y H:i"|default:"" }}</dd>
<dd>{{ event.meet_info|default:"" }}</dd> <dd>{{ event.meet_info|default:"" }}</dd>
<dt>Access From</dt> <dt>Access From</dt>
<dd>{{ event.access_at|date:"d M Y H:i"|default:"" }}</dd> <dd>{{ event.access_at|date:"D d M Y H:i"|default:"" }}</dd>
{% endif %} {% endif %}
<dt>Event Starts</dt> <dt>Event Starts</dt>
<dd>{{ event.start_date|date:"d M Y" }} {{ event.start_time|date:"H:i" }}</dd> <dd>{{ event.start_date|date:"D d M Y" }} {{ event.start_time|date:"H:i" }}</dd>
<dt>Event Ends</dt> <dt>Event Ends</dt>
<dd>{{ event.end_date|date:"d M Y" }} {{ event.end_time|date:"H:i" }}</dd> <dd>{{ event.end_date|date:"D d M Y" }} {{ event.end_time|date:"H:i" }}</dd>
<dd>&nbsp;</dd> <dd>&nbsp;</dd>

4
RIGS/templates/RIGS/event_table.html
View File

@@ -25,9 +25,9 @@
"> ">
<td class="hidden-xs">{{ event.pk }}</td> <td class="hidden-xs">{{ event.pk }}</td>
<td> <td>
<div><strong>{{ event.start_date|date:"SHORT_DATE_FORMAT" }}</strong></div> <div><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></div>
{% if event.end_date and event.end_date != event.start_date %} {% if event.end_date and event.end_date != event.start_date %}
<div><strong>{{ event.end_date|date:"SHORT_DATE_FORMAT" }}</strong></div> <div><strong>{{ event.end_date|date:"D d/m/Y" }}</strong></div>
{% endif %} {% endif %}
<span class="text-muted">{{ event.get_status_display }}</span> <span class="text-muted">{{ event.get_status_display }}</span>
</td> </td>