From 307ee9dea443ee5f0092d3ac42a5c6b3779ada91 Mon Sep 17 00:00:00 2001
From: John Crisp <jcrisp@safeandsoundit.co.uk>
Date: Wed, 4 Jun 2025 18:27:40 +0200
Subject: [PATCH] Proxy panel done

---
 .../AdminLTE/templates/emailsettings.html.ep  |  2 +-
 .../themes/AdminLTE/templates/proxy.html.ep   | 78 +++++++++++--------
 smeserver-manager-AdminLTE.spec               |  5 +-
 3 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
index 7d43887..1660dc4 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
@@ -24,8 +24,8 @@
     %}
 
     <h1><%= $title%></h1>
-    <br>
 
+    <br>
 
     <form action="/smanager/emailsettings" method="POST">
 
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep
index 6e8da37..7a1df56 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep
@@ -5,56 +5,72 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <div>
-    (DBG)route: <%= $c->current_route %><br>
-    (DBG)ht stat: <%= $prx_datas->{http_proxy_status}%> <br>
-    (DBG)sm stat: <%=$prx_datas->{smtp_proxy_status} %>
-    </div>
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $prx_datas->{http_proxy_status} %>
+            <%= dumper $prx_datas->{smtp_proxy_status} %>
+        </pre>
     % }
+
+
     <h1><%= $title %></h1>
+
     <br>
+
     <%= $modul %>
 
-    <% my $btn = l('SAVE'); %>
-
     <form action="/smanager/hostentriesd" method="POST">
+
+        <br>
+
         <div>
-            <div>
-                <%=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' %>
+           <%=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' %>
+        </div>
 
-                <br><br>
+        <br>
 
-                <div>
-                    <%=l 'prx_HTTP_PROXY_STATUS_LABEL' %>
-                </div>
-
-                <div>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=l 'prx_HTTP_PROXY_STATUS_LABEL' %>
+            </div>
+            <div class="col-auto">
                     % param 'http_proxy_status' => $prx_datas->{http_proxy_status} unless param 'http_proxy_status';
-                    <%= select_field 'http_proxy_status' =>  [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']] %>
-                </div>
+                    <%= select_field 'http_proxy_status' =>  [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        % if ( $prx_datas->{smtp_proxy_status} ) {
+
+            <br>
+
+            <div>
+                <%=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' %>
             </div>
 
-            % if ( $prx_datas->{smtp_proxy_status} ) {
-                <div>
-                    <%=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' %>
-                <br><br>
-                <div>
-                    <%=l 'prx_SMTP_PROXY_STATUS_LABEL' %>
-                </div>
-                <div>
-                    % param 'smtp_proxy_status' => $prx_datas->{smtp_proxy_status} unless param 'smtp_proxy_status';
-                    <%= select_field 'smtp_proxy_status' => [[ (l 'ENABLED') => 'transparent'], [ (l 'DISABLED') => 'disabled'], [ (l 'prx_BLOCKED') => 'blocked']], default => $prx_datas->{smtp_proxy_status} %>
-                    <br><br>
-                </div>
-            % }
+            <br>
 
             <div class="row g-3 align-items-center">
                 <div class="col-md-2">
-                    <button type="submit" class="btn btn-primary"><%= $btn %></button>
+                    <%=l 'prx_SMTP_PROXY_STATUS_LABEL' %>
+                </div>
+                <div class="col-auto">
+                    % param 'smtp_proxy_status' => $prx_datas->{smtp_proxy_status} unless param 'smtp_proxy_status';
+                    <%= select_field 'smtp_proxy_status' => [[ (l 'ENABLED') => 'transparent'], [ (l 'DISABLED') => 'disabled'], [ (l 'prx_BLOCKED') => 'blocked']], default => $prx_datas->{smtp_proxy_status} , class => "form-select" %>
                 </div>
             </div>
+        % }
+
+        <br>
+
+        % my $btn = l('SAVE');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
         </div>
 
+
     </form>
 
 </div>
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec
index 9cb5bd8..c5e06e5 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 28
+%define release 29
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,6 +26,9 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Wed Jun 04 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-29.sme
+- Proxy panel done
+
 * Wed Jun 04 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-28.sme
 - Reboot panel done