Merge branch 'master' into training

# Conflicts:
#	templates/base.html

RIGS/templates/partials/client_eventdetails.html

@@ -46,15 +46,12 @@
         <div class="card-header">Event Info</div>
         <div class="card-body">
             <dl class="row">
+                {% if event.venue %}
                 <dt class="col-sm-5">Event Venue</dt>
                 <dd class="col-sm-7">
-                    {% if object.venue %}
-                        <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
-                            {{ object.venue }}
-                        </a>
-                    {% endif %}
+                {{ event.venue }}
                 </dd>
-
+                {% endif %}
                 <dt class="col-sm-5">Status</dt>
                 <dd class="col-sm-7">{{ event.get_status_display }}</dd>
 

RIGS/templates/partials/item_row.html

@@ -0,0 +1,30 @@
+<tr id="item-{{item.pk}}" data-pk="{{item.pk}}" class="item_row">
+	<th scope="row">
+		<span class="name">{{ item.name }}</span>
+        <div class="item-description">
+            <em class="description">{{item.description|linebreaksbr}}</em>
+        </div>
+	</th>
+    {% if perms.RIGS.view_event %}
+	<td>£<span class="cost">{{item.cost|floatformat:2}}</span></td>
+    {% endif %}
+	<td class="quantity">{{item.quantity}}</td>
+    {% if perms.RIGS.view_event %}
+	<td>£<span class="sub-total" data-subtotal="{{item.total_cost}}">{{item.total_cost|floatformat:2}}</span></td>
+    {% endif %}
+	{% if edit %}
+    <td class="vert-align text-right">
+        <div class="btn-group" role="group" aria-label="Action buttons">
+	        <button type="button" class="item-edit btn btn-sm btn-warning"
+			        data-pk="{{item.pk}}"
+			        data-toggle="modal" data-target="#itemModal">
+		        <span class="fas fa-edit"></span>
+	        </button>
+	        <button type="button" class="item-delete btn btn-sm btn-danger"
+			        data-pk="{{item.pk}}">
+		        <span class="fas fa-times-circle"></span>
+	        </button>
+        </div>
+    </td>
+	{% endif %}
+</tr>

RIGS/templates/partials/item_table.html

@@ -23,7 +23,7 @@
 		</thead>
 		<tbody id="item-table-body">
 			{% for item in object.items.all %}
-				{% include 'item_row.html' %}
+				{% include 'partials/item_row.html' %}
 			{% endfor %}
 		</tbody>
         {% if auth or perms.RIGS.view_event %}