From b1cdcdf0b89a5c5b62766f7dd364f617bd9e4255 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Thu, 28 Oct 2021 19:41:46 +1100
Subject: [PATCH] More fixes

- About modal
- Server-side modals
- icon badges
- checkboxes in API forms
---
 InvenTree/InvenTree/static/css/inventree.css | 21 +++++++++++++++--
 InvenTree/templates/about.html               |  8 +++----
 InvenTree/templates/js/translated/forms.js   | 24 ++++++++++++--------
 InvenTree/templates/js/translated/helpers.js |  2 +-
 InvenTree/templates/modals.html              |  6 ++---
 5 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 559c30b219..cfa6846f10 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -229,8 +229,6 @@
     padding: 5px 10px;
 }
 
-/* Bootstrap table overrides */
-
 .stock-sub-group td {
     background-color: #ebf4f4;
 }
@@ -392,6 +390,10 @@
     font-size: 90%;
 }
 
+.table-condensed td {
+    padding: .25em .5em;
+}
+
 /* grid display for part images */
 
 .table-img-grid tr {
@@ -436,6 +438,12 @@
     float: right;
 }
 
+.icon-badge {
+    padding-right: 2px;
+    padding-left: 2px;
+    font-size: 125%;
+}
+
 .part-properties > span {
     padding-left: 5px;
     padding-right: 5px;
@@ -473,6 +481,10 @@
     padding-right: 5px;
 }
 
+.form-switch {
+    font-size: 120%;
+}
+
 .media {
     /* padding-top: 15px; */
     overflow: visible;
@@ -1015,4 +1027,9 @@ input[type='number']{
 
 .borderless {
     border: none;
+}
+
+a {
+    text-decoration: none;
+    background-color: transparent;
 }
\ No newline at end of file
diff --git a/InvenTree/templates/about.html b/InvenTree/templates/about.html
index 04f3380ca2..be69c1aebc 100644
--- a/InvenTree/templates/about.html
+++ b/InvenTree/templates/about.html
@@ -6,11 +6,9 @@
     <div class='modal-dialog'>
         <div class='modal-content'>
             <div class="modal-header">
-              <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-              <img src="{% static 'img/inventree.png' %}" height='60' style='float: left;' alt='Inventree Logo'>
-              <h3>{% trans "InvenTree Version Information" %}</h3>
+              <img src="{% static 'img/inventree.png' %}" height='40px' style='float: left; padding-right: 25px;' alt='Inventree Logo'>
+              <h4>{% trans "InvenTree Version Information" %}</h4>
+              <button type='button' class='btn-close' data-bs-dismiss='modal' aria-label='{% trans "Close" %}'></button>
             </div>
             <div class='modal-form-content-wrapper'>
                 <div class='modal-form-content'>
diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js
index fa293d79b3..a0c123a31b 100644
--- a/InvenTree/templates/js/translated/forms.js
+++ b/InvenTree/templates/js/translated/forms.js
@@ -1815,7 +1815,11 @@ function constructField(name, parameters, options) {
     }
 
     if (parameters.help_text && !options.hideLabels) {
-        html += constructHelpText(name, parameters, options);
+
+        // Boolean values are handled differently!
+        if (parameters.type != 'boolean') {
+            html += constructHelpText(name, parameters, options);
+        }
     }
 
     // Div for error messages
@@ -1990,7 +1994,6 @@ function constructInputOptions(name, classes, type, parameters) {
 
     switch (parameters.type) {
     case 'boolean':
-        opts.push(`style='display: inline-block; width: 20px; margin-right: 20px;'`);
         break;
     case 'integer':
     case 'float':
@@ -2003,6 +2006,15 @@ function constructInputOptions(name, classes, type, parameters) {
 
     if (parameters.multiline) {
         return `<textarea ${opts.join(' ')}></textarea>`;
+    } else if (parameters.type == 'boolean') {
+        return `
+        <div class='form-check form-switch'>
+            <input ${opts.join(' ')}>
+            <label class='form-check-label' for=''>
+                <em><small>${parameters.help_text}</small></em>
+            </label>
+        </div>
+        `;
     } else {
         return `<input ${opts.join(' ')}>`;
     }
@@ -2187,13 +2199,7 @@ function constructRawInput(name, parameters) {
  */
 function constructHelpText(name, parameters) {
     
-    var style = '';
-
-    if (parameters.type == 'boolean') {
-        style = `style='display: inline-block; margin-left: 25px' `;
-    }
-
-    var html = `<div id='hint_id_${name}' ${style}class='help-block'><i>${parameters.help_text}</i></div>`;
+    var html = `<div id='hint_id_${name}' class='help-block'><i>${parameters.help_text}</i></div>`;
 
     return html;
 }
diff --git a/InvenTree/templates/js/translated/helpers.js b/InvenTree/templates/js/translated/helpers.js
index 208a0a41ed..984be5dea7 100644
--- a/InvenTree/templates/js/translated/helpers.js
+++ b/InvenTree/templates/js/translated/helpers.js
@@ -92,7 +92,7 @@ function select2Thumbnail(image) {
  */
 function makeIconBadge(icon, title) {
 
-    var html = `<span class='fas ${icon} float-right' title='${title}'></span>`;
+    var html = `<span class='icon-badge fas ${icon} float-right' title='${title}'></span>`;
 
     return html;
 }
diff --git a/InvenTree/templates/modals.html b/InvenTree/templates/modals.html
index 00d15823ee..28dbe0caf2 100644
--- a/InvenTree/templates/modals.html
+++ b/InvenTree/templates/modals.html
@@ -35,10 +35,8 @@
         <div class='modal-dialog'>
             <div class='modal-content'>
                 <div class="modal-header">
-                  <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                  </button>
-                  <h3 id='modal-title'><em>Form Title Here</em></h3>
+                  <h4 id='modal-title'><em>Form Title Here</em></h4>
+                  <button type='button' class='btn-close' data-bs-dismiss='modal' aria-label='{% trans "Close" %}'></button>
                 </div>
                 <div class='modal-form-content-wrapper'>
                   <div class='alert alert-block alert-danger' id='form-validation-warning' style="display: none;">