From 252bf204100e0efa372e6b4f9c5c964354975bf8 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Tue, 25 Mar 2025 15:05:34 +0000 Subject: [PATCH] * Tue Mar 25 2025 Brian Read 11.0.0-73.sme - Some changes to error message format in css. - Fix DB Cache problem with port forwarding panel [SME: 12970] - Fix error and success message display for port forwarding panel [SME: 12969] --- .../smanager/lib/SrvMngr/Controller/Portforwarding.pm | 6 +++++- .../smanager/themes/default/public/css/new-sme-main.css | 9 ++++++--- .../share/smanager/themes/default/public/css/new_sme.css | 2 +- .../themes/default/templates/partials/_pf_add.html.ep | 7 ++++--- .../themes/default/templates/partials/_pf_list.html.ep | 8 +++++--- smeserver-manager.spec | 7 ++++++- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm index 8ba29c1..9e7dfe4 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm @@ -142,6 +142,10 @@ sub do_display { if ($trt eq 'LIST') { #List all the port forwards + # Open them again as maybe written to above + $tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n"; + $udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n"; + my @tcpforwards = $tcp_db->get_all; my @udpforwards = $udp_db->get_all; my $empty = 1 if not @tcpforwards and not @udpforwards; @@ -395,4 +399,4 @@ sub validate_allowed_hosts { } ## end foreach (split(/[\s,]+/, $ahost...)) return %valid_ahost_list; } ## end sub validate_allowed_hosts -1; +1; \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/public/css/new-sme-main.css b/root/usr/share/smanager/themes/default/public/css/new-sme-main.css index 65b5876..fac2b14 100644 --- a/root/usr/share/smanager/themes/default/public/css/new-sme-main.css +++ b/root/usr/share/smanager/themes/default/public/css/new-sme-main.css @@ -201,11 +201,13 @@ body.menu { div.error, div.sme-error, span.error, span.sme-error { color: red; - background-color: #fff; + background-color: #f9f9f9; border-width: 1px; border-style: solid; border-color: red; - padding: 2px; + padding: 10px; + border-radius: 10px; + } form { @@ -493,5 +495,6 @@ div.success, span.success { border-width: 1px; border-style: solid; border-color: #006400 ; - padding: 8px; + padding: 10px; + border-radius: 10px; } \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/public/css/new_sme.css b/root/usr/share/smanager/themes/default/public/css/new_sme.css index c676aa7..4b9c602 100644 --- a/root/usr/share/smanager/themes/default/public/css/new_sme.css +++ b/root/usr/share/smanager/themes/default/public/css/new_sme.css @@ -125,7 +125,7 @@ } #header2 { - width: 94.2%; + width:96%; margin-left: 1px; margin-top: 4px; } diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep index f4b1c6f..5cd2053 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep @@ -13,16 +13,17 @@ % my $var5 = @vars[4]; % my $var6 = @vars[5]; +
%if ($ret{'ret'} eq "") { %} elsif (index($ret{ret},"SUCCESS") != -1) {
-

Operation Status Report

+ %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
%} else {
-

Operation Status Report - Error

+ %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
%} @@ -84,4 +85,4 @@ %end - + \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep index d4c5f0d..8b66d6e 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep @@ -21,13 +21,15 @@ %if ($ret{ret} eq "") { %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %} elsif (index($ret{ret},"SUCCESS") != -1) { +
-

Operation Status Report

+ %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
%} else { +
-

Operation Status Report - Error

+ %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
%} @@ -113,4 +115,4 @@ %= hidden_field 'trt' => $pf_datas->{trt} - + \ No newline at end of file diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 82de64e..5856c97 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 72 +%define release 73 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -143,6 +143,11 @@ true %defattr(-,root,root) %changelog +* Tue Mar 25 2025 Brian Read 11.0.0-73.sme +- Some changes to error message format in css. +- Fix DB Cache problem with port forwarding panel [SME: 12970] +- Fix error and success message display for port forwarding panel [SME: 12969] + * Mon Mar 24 2025 Brian Read 11.0.0-72.sme - Remove css files from template structure [SME: 12967] - Rationalise and merge css files