From fd85d506795162a02b54179e52ba4472c01b2258 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Mon, 12 Oct 2020 22:16:09 +0100
Subject: [PATCH] Remove flash of content when loading new rig page

---
 RIGS/templates/event_form.html                | 38 +++++++++++--------
 .../partials/contact_details_form.html        |  4 +-
 .../partials/event_details_form.html          |  2 +-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
index e9a6528a..b31b3d4f 100644
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -45,7 +45,6 @@
             }
             $('#'+id_end_time).val('02:00');
         }
-
         $(document).ready(function () {
             {% if not object.pk and not form.errors %}
                 $('.form-hws').slideUp(function () {
@@ -56,9 +55,9 @@
                     $('.form-is_rig').hide();
                 }
             {% endif %}
-
             {% if not object.pk %}
                 $('#is_rig-selector button').on('click', function () {
+                    $('.form-hws').removeAttr('style');
                     $('.form-non_rig').slideDown();
                     if ($(this).data('is_rig') == 1) {
                         $('#{{form.is_rig.auto_id}}').prop('checked', true);
@@ -82,6 +81,13 @@
           $('[data-toggle="tooltip"]').tooltip();
         })
     </script>
+    <noscript>
+        <style>
+        .form-hws {
+            display: inherit !important;
+        }
+        </style>
+    </noscript>
 {% endblock %}
 
 {% block content %}
@@ -98,20 +104,20 @@
 
         {# New rig buttons #}
         {% if not object.pk %}
-            <div class="col-sm-12">
-                <div class="card text-center" id="is_rig-selector">
-                    <div class="card-body">
-			            <span data-toggle="tooltip"
-                              title="Anything that involves TEC kit, crew, or otherwise us providing a service to anyone.">
-				            <button type="button" class="btn btn-primary w-25" data-is_rig="1">Rig</button>
-			            </span>
-			            <span data-toggle="tooltip"
-                              title="Things that aren't service-based, like training, meetings and site visits.">
-				            <button type="button" class="btn btn-info w-25" data-is_rig="0">Non-Rig</button>
-			            </span>
-                    </div>
+        <div class="col-sm-12">
+            <div class="card text-center" id="is_rig-selector">
+                <div class="card-body">
+		            <span data-toggle="tooltip"
+                          title="Anything that involves TEC kit, crew, or otherwise us providing a service to anyone.">
+			            <button type="button" class="btn btn-primary w-25" data-is_rig="1">Rig</button>
+		            </span>
+		            <span data-toggle="tooltip"
+                          title="Things that aren't service-based, like training, meetings and site visits.">
+			            <button type="button" class="btn btn-info w-25" data-is_rig="0">Non-Rig</button>
+		            </span>
                 </div>
             </div>
+        </div>
         {% endif %}
 
         {# Contact details #}
@@ -122,7 +128,7 @@
 
         {# Notes and item shit #}
         <div class="col-sm-12">
-            <div class="card card-default form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %}">
+            <div class="card card-default form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %}" style="display: none;">
                 <div class="card-body">
                     <div class="col-sm-12">
                         <div class="form-group" data-toggle="tooltip" title="Notes on the event. This is only visible to keyholders, and is not displayed on the paperwork">
@@ -134,7 +140,7 @@
                 </div>
             </div>
         </div>
-        <div class="col-sm-12 text-right form-hws form-non_rig my-3">
+        <div class="col-sm-12 text-right form-hws form-non_rig my-3" style="display: none;">
             {% button 'submit' %}
         </div>
     </div>
diff --git a/RIGS/templates/partials/contact_details_form.html b/RIGS/templates/partials/contact_details_form.html
index d70ccb3d..e983cb78 100644
--- a/RIGS/templates/partials/contact_details_form.html
+++ b/RIGS/templates/partials/contact_details_form.html
@@ -1,6 +1,6 @@
 {% load widget_tweaks %}
 <div class="col-md-6 mt-3">
-    <div class="card form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %} mb-3">
+    <div class="card form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %} mb-3" style="display: none;">
         <div class="card-header">Contact Details</div>
         <div class="card-body">
             <div class="form-group" data-toggle="tooltip" title="The main contact for the event, can be left blank if purely an organisation">
@@ -58,7 +58,7 @@
             </div>
         </div>
     </div>
-    <div class="card form-hws form-non_rig mb-3">
+    <div class="card form-hws form-non_rig mb-3" style="display: none;">
         <div class="card-header">Event Description</div>
         <div class="card-body">
             <div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork">
diff --git a/RIGS/templates/partials/event_details_form.html b/RIGS/templates/partials/event_details_form.html
index bd8c74bd..31a40782 100644
--- a/RIGS/templates/partials/event_details_form.html
+++ b/RIGS/templates/partials/event_details_form.html
@@ -2,7 +2,7 @@
 {% load l10n %}
 
 <div class="col-md-6 my-3">
-    <div class="card card-default form-hws form-non_rig">
+    <div class="card card-default form-hws form-non_rig" style="display: none;">
         <div class="card-header">Event Details</div>
         <div class="card-body">
             <div id="form-hws">