Asset list table improvements

RIGS/templates/calendar.html

@@ -214,7 +214,7 @@
     </div>
     <div class="row">
         <div class="col-sm-12">
-            <div id='calendar'>
+            <div id='calendar'></div>
         </div>
     </div>
 {% endblock %}

RIGS/templates/event_detail.html

@@ -88,12 +88,9 @@
                 <div class="card-header">Event Details</div>
                 <div class="card-body">
                     {% if perms.RIGS.view_event %}
-                    <div class="card bg-secondary">
-                        <div class="card-header">Notes</div>
-                        <div class="card-body">
-                            <p class="dont-break-out">{{ event.notes|linebreaksbr }}</p>
-                        </div>
-                    </div>
+                    <h4>Notes</h4>
+                    <hr>
+                    <p class="dont-break-out">{{ event.notes|linebreaksbr }}</p>
                     {% endif %}
                     <br>
                     {% include 'item_table.html' %}

RIGS/templates/event_print.xml

@@ -33,12 +33,12 @@
 
         <blockTableStyle id="eventSpecifics">
             <blockValign value="top"/>
-             <lineStyle kind="LINEAFTER" colorName="LightGrey" start="0,0" stop="1,0" thickness="1"/> 
+             <lineStyle kind="LINEAFTER" colorName="LightGrey" start="0,0" stop="1,0" thickness="1"/>
         </blockTableStyle>
 
         <blockTableStyle id="headLayout">
             <blockValign value="top"/>
-             
+
         </blockTableStyle>
 
         <blockTableStyle id="eventDetails">
@@ -87,7 +87,7 @@
 
                     {# logo positioned 42 from left, 33 from top #}
                     <image file="RIGS/static/imgs/paperwork/tec-logo.jpg" x="42" y="719" height="90" width="84"/>
-                    
+
                     <setFont name="OpenSans-Bold" size="22.5" leading="10"/>
                     <drawString x="137" y="780">TEC PA &amp; Lighting</drawString>
 
@@ -97,7 +97,7 @@
                     <drawString x="265" y="746">info@nottinghamtec.co.uk</drawString>
                     <drawString x="137" y="732">Phone: (0115) 846 8720</drawString>
 
-                    
+
 
                     <setFont name="OpenSans" size="10" />
                     <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
@@ -106,7 +106,7 @@
                         [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
                     </drawCenteredString>
                 </pageGraphics>
-                
+
                 <frame id="main" x1="50" y1="65" width="495" height="645"/>
             </pageTemplate>
 
@@ -114,7 +114,7 @@
                 <pageGraphics>
                     <image file="RIGS/static/imgs/paperwork/corner-tr.jpg" x="395" y="642" height="200" width="200"/>
                     <image file="RIGS/static/imgs/paperwork/corner-bl.jpg" x="0" y="0" height="200" width="200"/>
-                    
+
                     <setFont name="OpenSans" size="10"/>
                     <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
                     <setFont name="OpenSans" size="7" />
@@ -127,7 +127,7 @@
     </template>
 
     <story firstPageTemplate="Headed">
-            {% include 'event_print_page.xml" %}
+            {% include "event_print_page.xml" %}
     </story>
 
 </document>

RIGS/templates/person_detail.html

@@ -4,75 +4,75 @@
 {% block title %}Person | {{ object.name }}{% endblock %}
 
 {% block content %}
-    <div class="row my-3">
-        {% if not request.is_ajax %}
-            <div class="col-sm-12">
-                <h1>Person | {{ object.name }}</h1>
-            </div>
-
-            <div class="col-sm-12 text-right">
-                <div class="btn-group btn-page">
-                    <a href="{% url 'person_update' object.pk %}" class="btn btn-light"><span
-                        class="fas fa-edit"></span> Edit</a>
-                </div>
-            </div>
-        {% endif %}
-        <div class="col-sm">
-            <div class="card border-info">
-                <div class="card-header bg-info">Person Details</div>
-                <div class="card-body">
-                    <dl class="row">
-                        <dt class="col-6">Name</dt>
-                        <dd>{{ object.name }}</dd>
-
-                        <dt class="col-6">Phone</dt>
-                        <dd><a href="tel:{{ object.phone }}">{{ object.phone }}</a></dd>
-
-                        <dt class="col-6">Email</dt>
-                        <dd><a href="mailto:{{ object.email }}"><span class="overflow-ellipsis">{{ object.email }}</span></a></dd>
-
-                        <dt class="col-6">Address</dt>
-                        <dd>{{ object.address|linebreaksbr }}</dd>
-
-                        <dt class="col-12">Notes</dt>
-                        <dd class="col-12">{{ object.notes|linebreaksbr }}</dd>
-                    </dl>
-                </div>
-            </div>
-        </div>
-        <div class="col-sm">
-            <div class="card">
-                <div class="card-header">Associated Organisations</div>
-                <ul class="list-group list-group-flush">
-                    {% for organisation,count in object.organisations %}
-                        <a class="list-group-item list-group-item-action" href="{% url 'organisation_detail' organisation.pk %}">{{ organisation.pk|stringformat:"05d" }} | {{ organisation.name }} <span class="badge badge-secondary" title="{{count}} events with {{object.name}} for {{organisation.name}}">{{count}}</span></a>
-                    {% endfor %}
-                </ul>
-            </div>
-        </div>
-    </div>
-
-    <div class="row my-3">
-        <div class="col-sm-12">
-            <div class="card">
-                <div class="card-header">Associated Events</div>
-                {% with object.latest_events as events %}
-                    {% include 'event_table.html' %}
-                {% endwith %}
-            </div>
-        </div>
-    </div>
+<div class="row my-3">
     {% if not request.is_ajax %}
-        <div class="row">
-            <div class="col-sm-12 text-right">
-                <div class="btn-group btn-page">
-                    <a href="{% url 'person_update' object.pk %}" class="btn btn-light"><span
-                        class="fas fa-edit"></span> Edit</a>
-                </div>
-                {% include 'partials/last_edited.html' with target="person_history" %}
+        <div class="col-sm-12">
+            <h1>Person | {{ object.name }}</h1>
+        </div>
+
+        <div class="col-sm-12 text-right">
+            <div class="btn-group btn-page">
+                <a href="{% url 'person_update' object.pk %}" class="btn btn-light"><span
+                    class="fas fa-edit"></span> Edit</a>
             </div>
         </div>
     {% endif %}
+    <div class="col-sm">
+        <div class="card border-info">
+            <div class="card-header bg-info">Person Details</div>
+            <div class="card-body">
+                <dl class="row">
+                    <dt class="col-6">Name</dt>
+                    <dd>{{ object.name }}</dd>
+
+                    <dt class="col-6">Phone</dt>
+                    <dd><a href="tel:{{ object.phone }}">{{ object.phone }}</a></dd>
+
+                    <dt class="col-6">Email</dt>
+                    <dd><a href="mailto:{{ object.email }}"><span class="overflow-ellipsis">{{ object.email }}</span></a></dd>
+
+                    <dt class="col-6">Address</dt>
+                    <dd>{{ object.address|linebreaksbr }}</dd>
+
+                    <dt class="col-12">Notes</dt>
+                    <dd class="col-12">{{ object.notes|linebreaksbr }}</dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm">
+        <div class="card">
+            <div class="card-header">Associated Organisations</div>
+            <ul class="list-group list-group-flush">
+                {% for organisation,count in object.organisations %}
+                    <a class="list-group-item list-group-item-action" href="{% url 'organisation_detail' organisation.pk %}">{{ organisation.pk|stringformat:"05d" }} | {{ organisation.name }} <span class="badge badge-secondary" title="{{count}} events with {{object.name}} for {{organisation.name}}">{{count}}</span></a>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+</div>
+
+<div class="row my-3">
+    <div class="col-sm-12">
+        <div class="card">
+            <div class="card-header">Associated Events</div>
+            {% with object.latest_events as events %}
+                {% include 'event_table.html' %}
+            {% endwith %}
+        </div>
+    </div>
+</div>
+{% if not request.is_ajax %}
+    <div class="row">
+        <div class="col-sm-12 text-right">
+            <div class="btn-group btn-page">
+                <a href="{% url 'person_update' object.pk %}" class="btn btn-light"><span
+                    class="fas fa-edit"></span> Edit</a>
+            </div>
+            {% include 'partials/last_edited.html' with target="person_history" %}
+        </div>
+    </div>
+{% endif %}
 {% endblock %}
 
 {% if request.is_ajax %}