From 1f3795a38816dafbf7dcf6d5a42da1122cb417a9 Mon Sep 17 00:00:00 2001 From: John Crisp Date: Thu, 7 Aug 2025 14:20:43 +0200 Subject: [PATCH] Add Please Wait fro default theme and reboot template formatting --- .../AdminLTE/public/koozali/css/adminlte.koozali.css | 11 +++++++++++ .../AdminLTE/public/koozali/js/sme-password.js | 12 ++++++++++++ .../themes/AdminLTE/templates/reboot.html.ep | 7 +++++-- smeserver-manager-AdminLTE.spec | 6 +++++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css index d06388c..883b675 100644 --- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css +++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css @@ -118,3 +118,14 @@ html { .nutTable tr td:nth-child(1){ width:30%; } + + +#busy-indicator { + display: none; + margin-top: 10px; + font-weight: bold; + color: red; +} +.busy { + cursor: wait; /* Change the cursor to a 'wait' cursor */ +} diff --git a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/sme-password.js b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/sme-password.js index 7ec14b0..dc3cf5d 100644 --- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/sme-password.js +++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/sme-password.js @@ -21,6 +21,18 @@ $(document).ready(function () { } }); +// and busy cursor +$(document).ready(function () { + // Handle form submission for any form + $('form').on('submit', function (event) { + // Disable all submit buttons and update their labels + $(this).find('button[type="submit"]').prop('disabled', true).text('Please wait...'); + $(this).find('input[type="submit"]').prop('disabled', true).val('Please wait...'); + // Add busy cursor + $('body').addClass('busy'); + }); +}); + $(document).ready(function () { // Get the fields diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep index e9a0fbb..64b76ed 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep @@ -2,15 +2,17 @@ % content_for 'module' => begin +<%= dumper $c->current_route %> +
% if (config->{debug} == 1) {
-            <%= dumper $c->current_route %>
+            <%=  dumper $c->current_route %>
         
% } -

<%= $title %>

+

<%= $title %>


@@ -45,5 +47,6 @@
+ %end \ No newline at end of file diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index f61d120..12853ca 100644 --- a/smeserver-manager-AdminLTE.spec +++ b/smeserver-manager-AdminLTE.spec @@ -1,6 +1,6 @@ %define name smeserver-manager-AdminLTE %define version 11.0.0 -%define release 51 +%define release 52 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} @@ -29,6 +29,10 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Thu Aug 07 2025 John Crisp 11.0.0-52.sme +- Add Please wait on submit as per default template +- Formatting reboot template + * Tue Aug 05 2025 John Crisp 11.0.0-51.sme - Fix reboot/shutdown failure - thanks Massimo [SME: 13097]