From c3aef48fbd38be2a79c6700c7214faafd8a4fd3a Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 15 May 2024 08:13:45 +0200 Subject: [PATCH] www/caddy: style sweep --- .../opnsense/mvc/app/views/OPNsense/Caddy/diagnostics.volt | 4 ++-- .../src/opnsense/mvc/app/views/OPNsense/Caddy/general.volt | 4 ++-- .../src/opnsense/scripts/OPNsense/Caddy/caddy_diagnostics.py | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/diagnostics.volt b/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/diagnostics.volt index b42a37741..40ac5e0fd 100644 --- a/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/diagnostics.volt +++ b/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/diagnostics.volt @@ -82,7 +82,7 @@ /** * Shows a BootstrapDialog alert with custom settings. - * + * * @param {string} type - Type of the dialog based on BootstrapDialog types. * @param {string} title - Title of the dialog. * @param {string} message - Message to be displayed in the dialog. @@ -151,7 +151,7 @@ .custom-style .display-area { overflow-y: scroll; /* Dynamic height management using clamp for varying screen sizes */ - height: clamp(50px, 50vh, 4000px); + height: clamp(50px, 50vh, 4000px); margin-bottom: 20px; /* Adds bottom margin to separate from the help text */ } diff --git a/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/general.volt b/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/general.volt index 3ee96f862..272973e4f 100644 --- a/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/general.volt +++ b/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/general.volt @@ -81,7 +81,7 @@ dfObj.reject(); // AJAX request failed } }); - }, + }, false, // disable_dialog: Show the dialog with the validation error function(errorData) { // callback_fail: What to do when save fails // Handle failure due to validation errors or other issues @@ -113,7 +113,7 @@ function() { // callback_ok: What to do when save is successful showAlert("{{ lang._('Configuration saved successfully. Please do not forget to apply the configuration.') }}", "{{ lang._('Save Success') }}"); dfObj.resolve(); - }, + }, false, // disable_dialog: Show the dialog with the validation error function(errorData) { // callback_fail: What to do when save fails showAlert("{{ lang._('Configuration save failed: ') }}" + (errorData.message || "{{ lang._('Validation Error') }}"), "{{ lang._('Error') }}"); diff --git a/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_diagnostics.py b/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_diagnostics.py index ec1e2d13f..243a0555d 100755 --- a/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_diagnostics.py +++ b/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_diagnostics.py @@ -83,4 +83,3 @@ if __name__ == "__main__": else: # Output error details in JSON format if no action is specified print(json.dumps({"error": "No Action Specified", "message": "No action specified"})) -