Fixed checkbox layout on modal from snipe#15296

Signed-off-by: snipe <[email protected]>
TelecomsSansFrontieres · Sep 9, 2024 · 28f169d · 28f169d
1 parent 66b7f60
commit 28f169d
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 132 deletions.
diff --git a/public/css/build/app.css b/public/css/build/app.css
@@ -697,6 +697,9 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.modal-warning .modal-help {
+  color: #fff8af;
+}
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }

diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
@@ -330,6 +330,9 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.modal-warning .modal-help {
+  color: #fff8af;
+}
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }

diff --git a/public/css/dist/all.css b/public/css/dist/all.css
@@ -21669,6 +21669,9 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.modal-warning .modal-help {
+  color: #fff8af;
+}
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }
@@ -23122,6 +23125,9 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.modal-warning .modal-help {
+  color: #fff8af;
+}
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }

diff --git a/public/js/build/app.js b/public/js/build/app.js
@@ -130,74 +130,43 @@ pieOptions = {
 //-----------------
 
 var baseUrl = $('meta[name="baseUrl"]').attr('content');
-(function ($, settings) {
-  var Components = {};
-  Components.modals = {};
+$(function () {
+  var $el = $('table');
 
   // confirm restore modal
-  Components.modals.confirmRestore = function () {
-    var $el = $('table');
-    var events = {
-      'click': function click(evnt) {
-        var $context = $(this);
-        var $restoreConfirmModal = $('#restoreConfirmModal');
-        var href = $context.attr('href');
-        var message = $context.attr('data-content');
-        var title = $context.attr('data-title');
-        $('#restoreConfirmModalLabel').text(title);
-        $restoreConfirmModal.find('.modal-body').text(message);
-        $('#restoreForm').attr('action', href);
-        $restoreConfirmModal.modal({
-          show: true
-        });
-        return false;
-      }
-    };
-    var render = function render() {
-      $el.on('click', '.restore-asset', events['click']);
-    };
-    return {
-      render: render
-    };
-  };
+
+  $el.on('click', '.restore-asset', function (evnt) {
+    var $context = $(this);
+    var $restoreConfirmModal = $('#restoreConfirmModal');
+    var href = $context.attr('href');
+    var message = $context.attr('data-content');
+    var title = $context.attr('data-title');
+    $('#confirmModalLabel').text(title);
+    $restoreConfirmModal.find('.modal-body').text(message);
+    $('#restoreForm').attr('action', href);
+    $restoreConfirmModal.modal({
+      show: true
+    });
+    return false;
+  });
 
   // confirm delete modal
-  Components.modals.confirmDelete = function () {
-    var $el = $('table');
-    var events = {
-      'click': function click(evnt) {
-        var $context = $(this);
-        var $dataConfirmModal = $('#dataConfirmModal');
-        var href = $context.attr('href');
-        var message = $context.attr('data-content');
-        var title = $context.attr('data-title');
-        $('#myModalLabel').text(title);
-        $dataConfirmModal.find('.modal-body').text(message);
-        $('#deleteForm').attr('action', href);
-        $dataConfirmModal.modal({
-          show: true
-        });
-        return false;
-      }
-    };
-    var render = function render() {
-      $el.on('click', '.delete-asset', events['click']);
-    };
-    return {
-      render: render
-    };
-  };
 
-  /**
-   * Application start point
-   * Component definition stays out of load event, execution only happens.
-   */
-  $(function () {
-    new Components.modals.confirmRestore().render();
-    new Components.modals.confirmDelete().render();
+  $el.on('click', '.delete-asset', function (evnt) {
+    var $context = $(this);
+    var $dataConfirmModal = $('#dataConfirmModal');
+    var href = $context.attr('href');
+    var message = $context.attr('data-content');
+    var title = $context.attr('data-title');
+    $('#myModalLabel').text(title);
+    $dataConfirmModal.find('.modal-body').text(message);
+    $('#deleteForm').attr('action', href);
+    $dataConfirmModal.modal({
+      show: true
+    });
+    return false;
   });
-})(jQuery, window.snipeit.settings);
-$(document).ready(function () {
+
   /*
   * Slideout help menu
   */

diff --git a/public/js/dist/all.js b/public/js/dist/all.js
@@ -59324,74 +59324,43 @@ pieOptions = {
 //-----------------
 
 var baseUrl = $('meta[name="baseUrl"]').attr('content');
-(function ($, settings) {
-  var Components = {};
-  Components.modals = {};
+$(function () {
+  var $el = $('table');
 
   // confirm restore modal
-  Components.modals.confirmRestore = function () {
-    var $el = $('table');
-    var events = {
-      'click': function click(evnt) {
-        var $context = $(this);
-        var $restoreConfirmModal = $('#restoreConfirmModal');
-        var href = $context.attr('href');
-        var message = $context.attr('data-content');
-        var title = $context.attr('data-title');
-        $('#restoreConfirmModalLabel').text(title);
-        $restoreConfirmModal.find('.modal-body').text(message);
-        $('#restoreForm').attr('action', href);
-        $restoreConfirmModal.modal({
-          show: true
-        });
-        return false;
-      }
-    };
-    var render = function render() {
-      $el.on('click', '.restore-asset', events['click']);
-    };
-    return {
-      render: render
-    };
-  };
+
+  $el.on('click', '.restore-asset', function (evnt) {
+    var $context = $(this);
+    var $restoreConfirmModal = $('#restoreConfirmModal');
+    var href = $context.attr('href');
+    var message = $context.attr('data-content');
+    var title = $context.attr('data-title');
+    $('#confirmModalLabel').text(title);
+    $restoreConfirmModal.find('.modal-body').text(message);
+    $('#restoreForm').attr('action', href);
+    $restoreConfirmModal.modal({
+      show: true
+    });
+    return false;
+  });
 
   // confirm delete modal
-  Components.modals.confirmDelete = function () {
-    var $el = $('table');
-    var events = {
-      'click': function click(evnt) {
-        var $context = $(this);
-        var $dataConfirmModal = $('#dataConfirmModal');
-        var href = $context.attr('href');
-        var message = $context.attr('data-content');
-        var title = $context.attr('data-title');
-        $('#myModalLabel').text(title);
-        $dataConfirmModal.find('.modal-body').text(message);
-        $('#deleteForm').attr('action', href);
-        $dataConfirmModal.modal({
-          show: true
-        });
-        return false;
-      }
-    };
-    var render = function render() {
-      $el.on('click', '.delete-asset', events['click']);
-    };
-    return {
-      render: render
-    };
-  };
 
-  /**
-   * Application start point
-   * Component definition stays out of load event, execution only happens.
-   */
-  $(function () {
-    new Components.modals.confirmRestore().render();
-    new Components.modals.confirmDelete().render();
+  $el.on('click', '.delete-asset', function (evnt) {
+    var $context = $(this);
+    var $dataConfirmModal = $('#dataConfirmModal');
+    var href = $context.attr('href');
+    var message = $context.attr('data-content');
+    var title = $context.attr('data-title');
+    $('#myModalLabel').text(title);
+    $dataConfirmModal.find('.modal-body').text(message);
+    $('#deleteForm').attr('action', href);
+    $dataConfirmModal.modal({
+      show: true
+    });
+    return false;
   });
-})(jQuery, window.snipeit.settings);
-$(document).ready(function () {
+
   /*
   * Slideout help menu
   */

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,9 +1,9 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=5030f4cb69d0d0b87b7fe6ba1b9eece9",
+    "/js/build/app.js": "/js/build/app.js?id=1d7c22e5a4811c37a9d70bf354ae1e9d",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9",
     "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=b4888ad2f6b8e7bdf012279808908c90",
-    "/css/build/app.css": "/css/build/app.css?id=e413bd66bd54cdd31219e148c3d70155",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=9265dbc8adc38d13abec7f8ff0374dce",
+    "/css/build/app.css": "/css/build/app.css?id=76584ef562c22532ffa84748f18e3a65",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
     "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=393aaa7b368b0670fc42434c8cca7dc7",
@@ -19,7 +19,7 @@
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0640e45bad692dcf62873c6e85904899",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
-    "/css/dist/all.css": "/css/dist/all.css?id=d0d01ea8f03fe60b1ea549854d582a0c",
+    "/css/dist/all.css": "/css/dist/all.css?id=0978d9f0ba8d47527c248074b757b03d",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
@@ -111,5 +111,5 @@
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=393d720a0f9aba560094fbc8d3b0c0f0",
     "/js/build/vendor.js": "/js/build/vendor.js?id=c1c24b883f48dc3d16b817aed0b457cc",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=6660df122e24940d42d03c06775fec7b",
-    "/js/dist/all.js": "/js/dist/all.js?id=05654cea82a7a1b78cb20e449d004268"
+    "/js/dist/all.js": "/js/dist/all.js?id=9fe982072b024cb5b1c41764713de1f7"
 }
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
@@ -358,6 +358,10 @@ body {
   white-space: normal;
 }
 
+.modal-warning .modal-help {
+  color: #fff8af;
+}
+
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }

diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
@@ -33,10 +33,12 @@
                     </div>
                     <div class="modal-body">
                         <p>{{ trans('admin/settings/message.backup.restore_warning') }}</p>
-                        <p><label><input type="checkbox"
-                                         name="clean" {{ config('backup.sanitize_by_default') ? "checked='checked'" : "" }}>{{ trans('admin/settings/general.backups_clean') }}
+                        <div class="form-group">
+                            <label class="form-control">
+                                <input type="checkbox" name="clean" {{ config('backup.sanitize_by_default') ? "checked='checked'" : "" }}>{{ trans('admin/settings/general.backups_clean') }}
                             </label></p>
-                        <p>{{ trans('admin/settings/general.backups_clean_helptext') }}</p>
+                            <p class="help-block modal-help">{{ trans('admin/settings/general.backups_clean_helptext') }}</p>
+                        </div>
                     </div>
                     <div class="modal-footer">
                         {{ csrf_field() }}