From b5e80382b938af35d0bd876a2e43e01e25d39fc2 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Mon, 22 Feb 2021 01:29:17 +0000
Subject: [PATCH] Various fixes for prior

---
 RIGS/templates/event_archive.html        |  6 ++--
 RIGS/templates/event_embed.html          |  5 +--
 RIGS/templates/risk_assessment_form.html |  2 +-
 assets/templates/asset_form.html         |  8 ++++-
 assets/templates/asset_list.html         |  8 ++++-
 gulpfile.js                              |  2 --
 package-lock.json                        | 39 ------------------------
 package.json                             |  1 -
 8 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/RIGS/templates/event_archive.html b/RIGS/templates/event_archive.html
index 67bc8244..ae3c0a1c 100644
--- a/RIGS/templates/event_archive.html
+++ b/RIGS/templates/event_archive.html
@@ -5,11 +5,13 @@
 {% load static %}
 
 {% block css %}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
+    {{ block.super }}
+    <script src="{% static 'js/selects.js' %}" async></script>
 {% endblock %}
 
 {% block content %}
diff --git a/RIGS/templates/event_embed.html b/RIGS/templates/event_embed.html
index 188217d9..df2a69b2 100644
--- a/RIGS/templates/event_embed.html
+++ b/RIGS/templates/event_embed.html
@@ -1,8 +1,9 @@
 {% extends 'base_embed.html' %}
 {% load static %}
 
-{% block js %}
-<script src="{% static 'js/all.js' %}"></script>
+{% block extra-head %}
+<link href="{% static 'fontawesome_free/css/fontawesome.css' %}" rel="stylesheet" type="text/css">
+<link href="{% static 'fontawesome_free/css/solid.css' %}" rel="stylesheet" type="text/css">
 {% endblock %}
 
 {% block content %}
diff --git a/RIGS/templates/risk_assessment_form.html b/RIGS/templates/risk_assessment_form.html
index c9d24f94..2fba78af 100644
--- a/RIGS/templates/risk_assessment_form.html
+++ b/RIGS/templates/risk_assessment_form.html
@@ -11,7 +11,7 @@
 
 {% block preload_js %}
     {{ block.super }}
-    <script src="{% static 'js/selects.js' %}"></script>
+    <script src="{% static 'js/selects.js' %}" async></script>
 {% endblock %}
 
 {% block js %}
diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html
index 0070a15d..bbea3a54 100644
--- a/assets/templates/asset_form.html
+++ b/assets/templates/asset_form.html
@@ -3,11 +3,17 @@
 {% load static %}
 
 {% block css %}
+    {{ block.super }}
     <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
+{% block preload_js %}
+    {{ block.super }}
+    <script src="{% static 'js/selects.js' %}" async></script>
+{% endblock %}
+
 {% block js %}
-    <script src="{% static 'js/selects.js' %}"></script>
+    {{ block.super }}
     <script>
         const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
         dur = matches ? 0 : 500;
diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 6b35b27c..0f4d6366 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -5,11 +5,17 @@
 {% load static %}
 
 {% block css %}
+    {{ block.super }}
     <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
+{% block preload_js %}
+    {{ block.super }}
+    <script src="{% static 'js/selects.js' %}" async></script>
+{% endblock %}
+
 {% block js %}
-    <script src="{% static 'js/selects.js' %}"></script>
+    {{ block.super }}
     <script>
         //Get querystring value
         function getParameterByName(name) {
diff --git a/gulpfile.js b/gulpfile.js
index a78a88a3..164b9705 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,7 +14,6 @@ const spawn = require('child_process').spawn;
 const cssnano = require('cssnano');
 const con = require('gulp-concat');
 const gulpif = require('gulp-if');
-const ignore = require('gulp-ignore');
 
 sass.compiler = require('node-sass');
 
@@ -61,7 +60,6 @@ function scripts() {
                     'pipeline/source_assets/js/**/*.js',])
     .pipe(gulpif(function(file) { return base_scripts.includes(file.relative);}, con('base.js')))
     .pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.js')))
-    .pipe(ignore.exclude(function(file) { return base_scripts.includes(file.relative);}))
     .pipe(flatten())
     .pipe(terser())
     .pipe(gulp.dest(dest))
diff --git a/package-lock.json b/package-lock.json
index a1582626..c240da85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,6 @@
         "gulp-concat": "^2.6.1",
         "gulp-flatten": "^0.4.0",
         "gulp-if": "^3.0.0",
-        "gulp-ignore": "^3.0.0",
         "gulp-postcss": "^8.0.0",
         "gulp-sass": "^4.1.0",
         "gulp-sourcemaps": "^2.6.5",
@@ -3595,24 +3594,6 @@
         "readable-stream": "2 || 3"
       }
     },
-    "node_modules/gulp-ignore": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-ignore/-/gulp-ignore-3.0.0.tgz",
-      "integrity": "sha512-hRQDJipaU5A84J7QacNGG+bnFU3QLESdjuJCRTAZ5VuKsz4LmvOrECFJeeCtqxP3RV0Pn6mawU0Q3CFZGpirSg==",
-      "dependencies": {
-        "gulp-match": "^1.1.0",
-        "through2": "^3.0.1"
-      }
-    },
-    "node_modules/gulp-ignore/node_modules/through2": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "2 || 3"
-      }
-    },
     "node_modules/gulp-match": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz",
@@ -12271,26 +12252,6 @@
         }
       }
     },
-    "gulp-ignore": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-ignore/-/gulp-ignore-3.0.0.tgz",
-      "integrity": "sha512-hRQDJipaU5A84J7QacNGG+bnFU3QLESdjuJCRTAZ5VuKsz4LmvOrECFJeeCtqxP3RV0Pn6mawU0Q3CFZGpirSg==",
-      "requires": {
-        "gulp-match": "^1.1.0",
-        "through2": "^3.0.1"
-      },
-      "dependencies": {
-        "through2": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-          "requires": {
-            "inherits": "^2.0.4",
-            "readable-stream": "2 || 3"
-          }
-        }
-      }
-    },
     "gulp-match": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz",
diff --git a/package.json b/package.json
index 694a2b49..fd1a2d16 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,6 @@
     "gulp-concat": "^2.6.1",
     "gulp-flatten": "^0.4.0",
     "gulp-if": "^3.0.0",
-    "gulp-ignore": "^3.0.0",
     "gulp-postcss": "^8.0.0",
     "gulp-sass": "^4.1.0",
     "gulp-sourcemaps": "^2.6.5",