From 5cc69cbb413ac1adbc615f324cfed28f27ea5f31 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Sun, 29 May 2016 23:03:41 +0100
Subject: [PATCH] Stopped things opening in a new window, because it's really
 annoying. If you want to do this, use the appropriate keyboard shortcut or
 mouse button

---
 RIGS/templates/RIGS/event_invoice.html | 4 ++--
 RIGS/templates/RIGS/invoice_list.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 79098853..0e56158f 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -50,7 +50,7 @@
                             danger
                         {% endif %}
                         ">
-                    <td class="hidden-xs"><a href="{% url 'event_detail' object.pk %}" target="_blank">N{{ object.pk|stringformat:"05d" }}</a><br>
+                    <td class="hidden-xs"><a href="{% url 'event_detail' object.pk %}">N{{ object.pk|stringformat:"05d" }}</a><br>
                         <span class="text-muted">{{ object.get_status_display }}</span></td>
                     <td>{{ object.start_date }}</td>
                     <td>{{ object.name }}</td>
@@ -76,7 +76,7 @@
                         {% endif %}
                     </td>
                     <td class="text-right">
-                        <a href="{% url 'invoice_event' object.pk %}" target="_blank" class="btn btn-default" data-toggle="tooltip" title="'Invoice' this event - click this when paperwork has been sent to treasury">
+                        <a href="{% url 'invoice_event' object.pk %}" class="btn btn-default" data-toggle="tooltip" title="'Invoice' this event - click this when paperwork has been sent to treasury">
                             <span class="glyphicon glyphicon-gbp"></span>
                         </a>
                     </td>
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index f7d23fcf..f833b89a 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -28,7 +28,7 @@
             {% for object in object_list %}
                 <tr class="{% if object.void %}danger{% elif object.balance == 0 %}success{% endif %}">
                     <td>{{ object.pk }}</td>
-                    <td><a href="{% url 'event_detail' object.event.pk %}" target="_blank">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }} <br>
+                    <td><a href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }} <br>
                         <span class="text-muted">{{ object.event.get_status_display }}</span></td>
                     </td>
                     <td>{% if object.organisation %}