Fix more HTML

RIGS/templates/event_checklist_detail.html

@@ -235,7 +235,6 @@
     </div>
     {% endif %}
 </div>
-</div>
 <div class="col-12 text-right">
 {% button 'edit' url='ec_edit' pk=object.pk %}
 {% button 'view' url='event_detail' pk=object.pk text="Event" %}

RIGS/templates/event_checklist_form.html

@@ -32,9 +32,9 @@
     $(document).ready(function () {
         $('button[data-action=add]').on('click', function (event) {
             event.preventDefault();
-            var target = $($(this).attr('data-target'));
+            let target = $($(this).attr('data-target'));
-            var newID = Number(target.attr('data-pk'));
+            let newID = Number(target.attr('data-pk'));
-            var newRow = $($(this).attr('data-clone'))
+            let newRow = $($(this).attr('data-clone'))
                     .clone().attr('style', "")
                    .attr('id', function(i, val){
                         return val.split("_")[0] + '_' + newID;
@@ -204,7 +204,7 @@
                                             <td>
                                                 <select name="crewmember_new" class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" disabled="true"></select>
                                             </td>
-                                            <td style="min-width: 15ch"><input name="start_new" type="datetime-local" class="form-control" value="{{ i.start }}" disabled="true"/></td>
+                                            <td style="min-width: 15ch"><input name="start_new" type="datetime-local" class="form-control" value="{{ i.start }}" disabled=""/></td>
                                             <td style="min-width: 15ch"><input name="role_new" type="text" class="form-control" value="{{ i.role }}" disabled="true"/></td>
                                             <td style="min-width: 15ch"><input name="end_new" type="datetime-local" class="form-control" value="{{ i.end }}" disabled="true" /></td>
                                             <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
@@ -240,7 +240,7 @@
             <div class="row my-3" id="size-0">
                 <div class="col-12">
                     <div class="card border-success">
-                        <div class="card-header">Electrical Checks <small>for ‘Small’ TEC Events <6kVA (aprox. 26A)</small></div>
+                        <div class="card-header">Electrical Checks <small>for ‘Small’ TEC Events <6kVA (approx. 26A)</small></div>
                         <div class="card-body">
                             {% include 'partials/checklist_checkbox.html' with formitem=form.rcds %}
                             {% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %}
@@ -337,7 +337,7 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <hr>
+                            <hr/>
                             {% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %}
                             {% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %}
                             {% include 'partials/ec_power_info.html' %}

RIGS/templates/event_detail.html

@@ -38,7 +38,7 @@
                         <dt class="col-sm-6">Email</dt>
                         <dd class="col-sm-6">{{ object.person.email|linkornone:'mailto' }}</dd>
                         <dt class="col-sm-6">Phone Number</dt>
-                        <dd class="col-sm-6">{{ object.person.phone|linkornone:'tel' }}</a></dd>
+                        <dd class="col-sm-6">{{ object.person.phone|linkornone:'tel' }}</dd>
                     </dl>
                 </div>
             </div>
@@ -59,7 +59,7 @@
                             <dt class="col-sm-6">Email</dt>
                             <dd class="col-sm-6">{{ object.organisation.email|linkornone:'mailto' }}</dd>
                             <dt class="col-sm-6">Phone Number</dt>
-                            <dd class="col-sm-6">{{ object.organisation.phone|linkornone:'tel' }}</a></dd>
+                            <dd class="col-sm-6">{{ object.organisation.phone|linkornone:'tel' }}</dd>
                             <dt class="col-sm-6">Has SU Account</dt>
                             <dd class="col-sm-6">{{ event.organisation.union_account|yesno|capfirst }}</dd>
                         </dl>

RIGS/templates/event_embed.html

@@ -95,7 +95,6 @@
                     {{ object.description|linebreaksbr }}
                 </p>
             {% endif %}
-        </table>
         </div>
     </div>
 {% endblock %}

RIGS/templates/eventauthorisation_client_request.html

@@ -36,6 +36,7 @@
 
     <p>Your event will not be booked until you complete this form.</p>
 
-    <p>TEC PA &amp; Lighting<br/>
+    <p>TEC PA &amp; Lighting</p>
+    <br/>
 
 {% endblock %}

RIGS/templates/invoice_detail.html

@@ -60,10 +60,10 @@
                         <table class="table table-hover">
                             <thead>
                                 <tr>
-                                    <th scope="col">Date</td>
+                                    <th scope="col">Date</th>
-                                    <th scope="col">Amount</td>
+                                    <th scope="col">Amount</th>
-                                    <th scope="col">Method</td>
+                                    <th scope="col">Method</th>
-                                    <th scope="col"></td>
+                                    <th scope="col"></th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -73,7 +73,7 @@
                                     <td>{{ payment.amount|floatformat:2 }}</td>
                                     <td>{{ payment.get_method_display }}</td>
                                     <td>
-                                        <a href="{% url 'payment_delete' payment.pk %}" class="btn btn-small btn-danger"><span class="fas fa-times"</a>
+                                        <a href="{% url 'payment_delete' payment.pk %}" class="btn btn-small btn-danger"><span class="fas fa-times"></span></a>
                                     </td>
                                 </tr>
                             {% endfor %}

RIGS/templates/invoice_list.html

@@ -27,7 +27,7 @@
                         <span class="text-muted">{% if invoice.void %}(VOID){% elif invoice.is_closed %}(PAID){% else %}(O/S){% endif %}</span></th>
                         <td><a href="{% url 'event_detail' invoice.event.pk %}">N{{ invoice.event.pk|stringformat:"05d" }}</a>: {{ invoice.event.name }} <br>
                             <span class="text-muted">{{ invoice.event.get_status_display }}{% if not invoice.event.mic %}, No MIC{% endif %}
-                            </span></td>
+                            </span>
                         </td>
                         <td>{% if invoice.event.organisation %}
                                 {{ invoice.event.organisation.name }}

RIGS/templates/partials/ec_power_info.html

@@ -20,6 +20,7 @@
                 <tr>
                     <td>300</td>
                     <td>167</td>
+                </tr>
                 <tr>
                     <td>500</td>
                     <td>100</td>

RIGS/templates/risk_assessment_detail.html

@@ -152,7 +152,6 @@
                 </div>
             </div>
         </div>
-    </div>
         <div class="col-12 text-right">
             <a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
                     class="d-none d-sm-inline">Edit</span></a>

assets/templates/asset_audit.html

@@ -40,8 +40,8 @@
   <div class="form-group form-row">
     {% include 'partials/form_field.html' with field=form.date_acquired col="col-6" %}
     <div class="col-sm-4">
-        <btn class="btn btn-info" onclick="setAcquired(true);" tabindex="-1">Today</btn>
+        <button class="btn btn-info" onclick="setAcquired(true);" tabindex="-1">Today</button>
-        <btn class="btn btn-warning" onclick="setAcquired(false);" tabindex="-1">Unknown</btn>
+        <button class="btn btn-warning" onclick="setAcquired(false);" tabindex="-1">Unknown</button>
     </div>
   </div>
   <div class="form-group form-row">
@@ -64,16 +64,16 @@
     <div class="form-group form-row">
       {% include 'partials/form_field.html' with field=form.length append=form.length.help_text col="col-6" %}
       <div class="col-4">
-        <btn class="btn btn-danger" onclick="setFieldValue('{{ form.length.id_for_label }}','5');" tabindex="-1">5{{ form.length.help_text }}</btn>
+        <button class="btn btn-danger" onclick="setFieldValue('{{ form.length.id_for_label }}','5');" tabindex="-1">5{{ form.length.help_text }}</button>
-        <btn class="btn btn-success" onclick="setFieldValue('{{ form.length.id_for_label }}','10');" tabindex="-1">10{{ form.length.help_text }}</btn>
+        <button class="btn btn-success" onclick="setFieldValue('{{ form.length.id_for_label }}','10');" tabindex="-1">10{{ form.length.help_text }}</button>
-        <btn class="btn btn-info" onclick="setFieldValue('{{ form.length.id_for_label }}','20');" tabindex="-1">20{{ form.length.help_text }}</btn>
+        <button class="btn btn-info" onclick="setFieldValue('{{ form.length.id_for_label }}','20');" tabindex="-1">20{{ form.length.help_text }}</button>
       </div>
     </div>
     <div class="form-group form-row">
       {% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text title='CSA' col="col-6" %}
       <div class="col-4">
-        <btn class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '1.5');" tabindex="-1">1.5{{ form.csa.help_text }}</btn>
+        <button class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '1.5');" tabindex="-1">1.5{{ form.csa.help_text }}</button>
-        <btn class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '2.5');" tabindex="-1">2.5{{ form.csa.help_text }}</btn>
+        <button class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '2.5');" tabindex="-1">2.5{{ form.csa.help_text }}</button>
       </div>
     </div>
   </div>

assets/templates/asset_embed.html

@@ -8,7 +8,6 @@
                 <span class="source"> TEC Asset Database</span>
             </a>
         </div>
-
         <div class="col-sm-12">
             <h3><a href="{% url 'asset_detail' object.asset_id %}">Asset: {{ object.asset_id }} | {{ object.description }} </a></h3>
             <h4>
@@ -32,7 +31,6 @@
                     <dd class="dont-break-out">{{ object.comments|linebreaksbr }}<dd>
                 {% endif %}
             </dl>
-        </table>
         </div>
     </div>
 {% endblock %}

assets/templates/asset_form.html

@@ -33,7 +33,7 @@
                 url: '{% url 'asset_search_json' %}',
                 type: "GET",
                 data: function () {
-                    var params = {
+                    let params = {
                         {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
                     };
                     return params;

assets/templates/cable_type_form.html

@@ -11,7 +11,7 @@
     {% endif %}
 {% include 'form_errors.html' %}
 {% csrf_token %}
-<input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
+<input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden="">
 <div class="row">
     <div class="col-sm-12">
         {% if create or edit %}

templates/bootstrap.html

@@ -9,6 +9,7 @@
                     <label class="custom-control-label" for="darkSwitch">Dark Mode</label>
                 </div>
             </div>
+        </div>
     </section>
     <section class="mb-5 pt-5" id="typography">
         <div class="row bg-light py-4 mb-5">
@@ -320,7 +321,6 @@ public abstract class L2Char extends L2Object {
                     <div class="p-3 mb-2 bg-white text-dark">.bg-white</div>
                 </div>
 
-	</div>
             </div>
         </div>
     </section>

templates/index.html

@@ -5,7 +5,7 @@
 
 {% block content %}
 <div class="row">
-    <h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small class="text-muted"> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1>
+    <h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1>
     <h4 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h4>
     <div class="col-sm mb-3">
         <div class="card">

templates/registration/password_change_form.html

@@ -1,11 +1,9 @@
 {% extends "base_rigs.html" %}
 {% load widget_tweaks %}
 
-
 {% block title %}Change Password{% endblock %}
 
 {% block content %}
-
     <div class="col-sm-10 col-sm-offset-1">
         <h3>Change Password</h3>
         {% if form.errors or supplement_form.errors %}
@@ -15,7 +13,7 @@
                 {{supplement_form.errors}}
             </div>
         {% endif %}
-	<p>Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.</p>
+        <p>Please enter your old password, for security's sake, and then enter your new password twice, so we can verify you typed it in correctly.</p>
 
         <div class="col-sm-8 col-sm-offset-2">
             <form action="" method="post" class="" role="form">{% csrf_token %}
@@ -30,4 +28,5 @@
                 <p><input type="submit" value="Change Password" class="btn btn-primary pull-right"></p>
             </form>
         </div>
+    </div>
 {% endblock %}

users/templates/profile_detail.html

@@ -46,7 +46,7 @@
             <div class="col text-right">
                 <div class="btn-group">
                     <a href="{% url 'profile_update_self' %}" class="btn btn-warning">
-				Edit Profile <i class="fas fa-edit"></i>
+                        Edit Profile <span class="fas fa-edit"></span>
                     </a>
                     <a href="{% url 'password_change' %}" class="btn btn-light">
                         Change Password <span class="fas fa-lock"></span>

versioning/templates/activity_feed.html

@@ -11,7 +11,7 @@
           $('#activity_loading').slideUp(dur,function(){
               $('#activity').slideDown(dur);
           });
-          var whiteList = $.fn.tooltip.Constructor.Default.whiteList
+            const whiteList = $.fn.tooltip.Constructor.Default.whiteList;
             whiteList.ins = []
           whiteList.del = []
           $('#activity [data-toggle="popover"]').popover({whiteList: whiteList});

versioning/templates/partials/activity_table_body.html

@@ -14,7 +14,7 @@
         {% for version in object_list %}
             <tr>
                 <th scope="row">{{ version.revision.date_created }}</th>
-            <td><a href="{{ version.changes.new.get_absolute_url }}">{{ version.changes.new.display_id|default:version.changes.new.pk }} | {{version.changes.new|to_class_name}}</td>
+                <td><a href="{{ version.changes.new.get_absolute_url }}">{{ version.changes.new.display_id|default:version.changes.new.pk }} | {{version.changes.new|to_class_name}}</a></td>
                 <td>{{ version.pk }}|{{ version.revision.pk }}</td>
                 <td>{{ version.revision.user.name|default:"System" }}</td>
                 <td>

versioning/templates/partials/version_history_table.html

@@ -3,10 +3,10 @@
     <table class="table table-striped">
         <thead class="thead-dark">
         <tr>
-            <th scope="col">Date</td>
+            <th scope="col">Date</th>
-            <th scope="col">Version ID</td>
+            <th scope="col">Version ID</th>
-            <th scope="col">User</td>
+            <th scope="col">User</th>
-            <th scope="col">Changes</td>
+            <th scope="col">Changes</th>
         </tr>
         </thead>
         <tbody>

versioning/templates/partials/version_scripts.html

@@ -6,7 +6,7 @@
     $(function () {
             $('[data-toggle="tooltip"]').tooltip();
     });
-    var whiteList = $.fn.tooltip.Constructor.Default.whiteList
+    const whiteList = $.fn.tooltip.Constructor.Default.whiteList;
     whiteList.ins = []
     whiteList.del = []
     $(function() {