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

Merge branch 'master' into web_calendar

Browse Source
This commit is contained in:
David Taylor
2016-03-16 12:30:22 +00:00
parent 1681ab8fee ed552b402a
commit 0721d61bef
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,7 @@
<a href="{% url 'event_detail' pk=object.based_on.pk %}"> <a href="{% url 'event_detail' pk=object.based_on.pk %}">
{% if object.based_on.is_rig %}N{{ object.based_on.pk|stringformat:"05d" }}{% else %} {% if object.based_on.is_rig %}N{{ object.based_on.pk|stringformat:"05d" }}{% else %}
{{ object.based_on.pk }}{% endif %} {{ object.based_on.pk }}{% endif %}
{{ object.base_on.name }} by {{ object.based_on.mic.name }} {{ object.base_on.name }} {% if object.based_on.mic %}by {{ object.based_on.mic.name }}{% endif %}
</a> </a>
{% endif %} {% endif %}
</dd> </dd>

4
templates/base.html
View File

@@ -144,10 +144,6 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
<div class="col-sm-12 text-center">
Reminder: Please consider carefully before booking rigs at this moment
</div>
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>