From fed1cce71658265d8a6217f69849fa11fd4cec74 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 15 Feb 2024 19:25:17 +0100 Subject: [PATCH] wip #6727 @3 --- config/backpack/base.php | 1 + public/images/loader.json | 1 + .../fluidbook/toolbox/css/loader.less | 8 +++++ .../packages/fluidbook/toolbox/js/bundle.js | 24 ++++++++++++++- .../base/inc/sidebar_content.blade.php | 2 -- .../crud/inc/form_save_buttons.blade.php | 30 ++++++++++++++----- 6 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 public/images/loader.json diff --git a/config/backpack/base.php b/config/backpack/base.php index 2f7e3b1a0..857c2d18a 100644 --- a/config/backpack/base.php +++ b/config/backpack/base.php @@ -156,6 +156,7 @@ return [ 'https://cdnjs.cloudflare.com/ajax/libs/gsap/3.11.4/gsap.min.js', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js', 'https://cdnjs.cloudflare.com/ajax/libs/sweetalert2/11.7.3/sweetalert2.all.js', + 'https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js', // examples (everything inside the bundle, loaded from CDN) // 'https://code.jquery.com/jquery-3.4.1.min.js', diff --git a/public/images/loader.json b/public/images/loader.json new file mode 100644 index 000000000..6635011f6 --- /dev/null +++ b/public/images/loader.json @@ -0,0 +1 @@ +{"v":"5.8.1","fr":30,"ip":0,"op":60,"w":300,"h":300,"nm":"loading_6","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":60,"s":[360]}],"ix":10},"p":{"a":0,"k":[150.00000000000003,150.00000000000003,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[30.000000000000004,30.000000000000004,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.2039,0.4431,0.7843,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":50,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[0]},{"t":60,"s":[99]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[1]},{"t":50,"s":[100]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":60,"s":[3]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":30,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[150.00000000000003,150.00000000000003,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[30.000000000000004,30.000000000000004,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.6598,0.7683,0.9202,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":50,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}],"markers":[]} diff --git a/public/packages/fluidbook/toolbox/css/loader.less b/public/packages/fluidbook/toolbox/css/loader.less index 8260abdea..1500a385c 100644 --- a/public/packages/fluidbook/toolbox/css/loader.less +++ b/public/packages/fluidbook/toolbox/css/loader.less @@ -6,6 +6,11 @@ height: 100%; background-color: rgba(0, 0, 0, 0.25); cursor: wait; + z-index: 2147483648; + + lottie-player { + margin: 0 auto; + } div { position: absolute; @@ -76,4 +81,7 @@ } } +.featherlight { + z-index: auto !important; +} diff --git a/public/packages/fluidbook/toolbox/js/bundle.js b/public/packages/fluidbook/toolbox/js/bundle.js index a2918dc8c..ca0146573 100644 --- a/public/packages/fluidbook/toolbox/js/bundle.js +++ b/public/packages/fluidbook/toolbox/js/bundle.js @@ -54,9 +54,31 @@ $(function () { }); }); +function reloadPagePortions(callback) { + $.ajax({ + url: window.location, + dataType: 'html', + cache: false, + }).done(function (html) { + let res = $(html); + $("[data-reload-portion]").each(function () { + let selector = '#' + $(this).attr('id'); + let c = $(res).find(selector).html(); + $(this).html(c); + }); + if (callback !== undefined) { + callback.call(); + } + }); +} + +function showSimpleLoader() { + $('body').prepend('
'); +} + function showLoader(message, progress) { if ($("#loader").length === 0) { - $('body').append('
'); + $('body').prepend('
'); } if (message !== '' && progress > 0) { var pb = $("#loader progress"); diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php index 03b613054..3b11bd1c9 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -29,9 +29,7 @@ }); function checkUnread() { - if (!isFocused()) { - console.log('is not focused'); setTimeout(checkUnread, 10000); return; } diff --git a/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php b/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php index 6541252ce..c8dd21519 100644 --- a/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php +++ b/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php @@ -29,7 +29,7 @@ @if(!empty($saveAction['options'])) + class="caret">▼
@foreach( $saveAction['options'] as $value => $label) + class="la la-trash-alt"> {{ trans('backpack::crud.delete') }} @endif
@endif @@ -65,18 +65,26 @@