arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-01 12:52:15 +00:00
Code Issues Projects Releases Wiki Activity

Remove flash of content when loading new rig page

Browse Source
This commit is contained in:
FreneticScribbler
2020-10-12 22:16:09 +01:00
parent 2cb5453b82
commit fd85d50679
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
RIGS/templates/event_form.html
View File

@@ -45,7 +45,6 @@
} }
$('#'+id_end_time).val('02:00'); $('#'+id_end_time).val('02:00');
} }
$(document).ready(function () { $(document).ready(function () {
{% if not object.pk and not form.errors %} {% if not object.pk and not form.errors %}
$('.form-hws').slideUp(function () { $('.form-hws').slideUp(function () {
@@ -56,9 +55,9 @@
$('.form-is_rig').hide(); $('.form-is_rig').hide();
} }
{% endif %} {% endif %}
{% if not object.pk %} {% if not object.pk %}
$('#is_rig-selector button').on('click', function () { $('#is_rig-selector button').on('click', function () {
$('.form-hws').removeAttr('style');
$('.form-non_rig').slideDown(); $('.form-non_rig').slideDown();
if ($(this).data('is_rig') == 1) { if ($(this).data('is_rig') == 1) {
$('#{{form.is_rig.auto_id}}').prop('checked', true); $('#{{form.is_rig.auto_id}}').prop('checked', true);
@@ -82,6 +81,13 @@
$('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="tooltip"]').tooltip();
}) })
</script> </script>
<noscript>
<style>
.form-hws {
display: inherit !important;
}
</style>
</noscript>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
@@ -98,20 +104,20 @@
{# New rig buttons #} {# New rig buttons #}
{% if not object.pk %} {% if not object.pk %}
<div class="col-sm-12"> <div class="col-sm-12">
<div class="card text-center" id="is_rig-selector"> <div class="card text-center" id="is_rig-selector">
<div class="card-body"> <div class="card-body">
<span data-toggle="tooltip" <span data-toggle="tooltip"
title="Anything that involves TEC kit, crew, or otherwise us providing a service to anyone."> 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> <button type="button" class="btn btn-primary w-25" data-is_rig="1">Rig</button>
</span> </span>
<span data-toggle="tooltip" <span data-toggle="tooltip"
title="Things that aren't service-based, like training, meetings and site visits."> 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> <button type="button" class="btn btn-info w-25" data-is_rig="0">Non-Rig</button>
</span> </span>
</div>
</div> </div>
</div> </div>
</div>
{% endif %} {% endif %}
{# Contact details #} {# Contact details #}
@@ -122,7 +128,7 @@
{# Notes and item shit #} {# Notes and item shit #}
<div class="col-sm-12"> <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="card-body">
<div class="col-sm-12"> <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"> <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>
</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' %} {% button 'submit' %}
</div> </div>
</div> </div>

4
RIGS/templates/partials/contact_details_form.html
View File

@@ -1,6 +1,6 @@
{% load widget_tweaks %} {% load widget_tweaks %}
<div class="col-md-6 mt-3"> <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-header">Contact Details</div>
<div class="card-body"> <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"> <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>
</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-header">Event Description</div>
<div class="card-body"> <div class="card-body">
<div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork"> <div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork">

2
RIGS/templates/partials/event_details_form.html
View File

@@ -2,7 +2,7 @@
{% load l10n %} {% load l10n %}
<div class="col-md-6 my-3"> <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-header">Event Details</div>
<div class="card-body"> <div class="card-body">
<div id="form-hws"> <div id="form-hws">