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

Merge from master

Browse Source
This commit is contained in:
Tom Price
2015-04-21 18:13:07 +01:00
parent 1213971f1f 78dbe38aac
commit f03ff47062
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@
<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>
{% if event.is_rig %} {% if event.is_rig %}
<a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
class="glyphicon glyphicon-print"></span></a> class="glyphicon glyphicon-print"></span></a>
{% endif %} {% 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
@@ -169,7 +169,7 @@
<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>
{% if event.is_rig %} {% if event.is_rig %}
<a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
class="glyphicon glyphicon-print"></span></a> class="glyphicon glyphicon-print"></span></a>
{% endif %} {% 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
@@ -201,10 +201,15 @@
<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>
<<<<<<< HEAD
{% if event.is_rig %} {% if event.is_rig %}
<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>
{% endif %} {% endif %}
=======
<a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
class="glyphicon glyphicon-print"></span></a>
>>>>>>> master
<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 event.is_rig %} {% if event.is_rig %}

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

@@ -53,8 +53,8 @@
<img src="{{ object.mic.profile_picture }}" class="event-mic-photo"/> <img src="{{ object.mic.profile_picture }}" class="event-mic-photo"/>
</td> </td>
<td class="text-right"> <td class="text-right">
<a href="{% url 'invoice_event' object.pk %}" class="btn btn-default"> <a href="{% url 'invoice_event' object.pk %}" target="_blank" class="btn btn-default">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-gbp"></span>
</a> </a>
</td> </td>
</tr> </tr>

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

@@ -25,7 +25,7 @@
<tfoot> <tfoot>
<tr> <tr>
<td rowspan="3" colspan="2"></td> <td rowspan="3" colspan="2"></td>
<td>Sum Total</td> <td>Total (ex. VAT)</td>
<td colspan="2">£ <span id="sumtotal">{{object.sum_total|default:0|floatformat:2}}</span></td> <td colspan="2">£ <span id="sumtotal">{{object.sum_total|default:0|floatformat:2}}</span></td>
</tr> </tr>
<tr> <tr>