Proxy panel done

reboot panel done
2025-06-04 18:27:40 +02:00 · 2025-06-04 18:06:02 +02:00
5 changed files with 89 additions and 58 deletions
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep
@@ -6,8 +6,8 @@

    % if (config->{debug} == 1) {
        <pre>
-            <<%=  dumper $c->current_route %>
-            <<%=  dumper $mai_datas %>
+            <%=  dumper $c->current_route %>
+            <%=  dumper $mai_datas %>
        </pre>
    % }

@@ -19,7 +19,7 @@
        </div>
    % }

-    <h1><%=  $title %></h1>
+    <h1><%= $title %></h1>

    <br>

--- 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">

--- 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>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep
@@ -4,37 +4,46 @@

 <div class="card-body">

-    %if (config->{debug} == 1) {
-    <p>
-    (DBG)route: <%= $c->current_route %><br>
-    </p>
-    %}
+    % if (config->{debug} == 1) {
+        <pre>
+            <%=  dumper $c->current_route %>
+        </pre>
+    % }
+
+    <h1><%=  $title %></h1>

-    <h1><%= $title %></h1>
    <br>

-    %= $modul
+    <%= $modul %>

-    <%  my $btn = l('PERFORM'); %>
-    %= form_for 'reboot' => (method => 'POST') => begin
+    <form action="/smanager/reboot" method="POST">

-    <p>
-    %= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION'))
-    <br><br>
+        <div class="col-md-6">
+            <%= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION')) %>
+        </div>

-    <span class="">
-    %=l 'rbo_LABEL_REBOOT'
-    </span>
-    <span class="">
-    %= select_field 'function' => $c->rebootFunction_list()
-    </span>
-    </p><br>
+        <br>

-    %= submit_button "$btn", class => ""
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'rbo_LABEL_REBOOT' %>
+            </div>
+            <div class="col-auto">
+                <%= select_field 'function' => $c->rebootFunction_list(), class => "form-select"  %>
+             </div>
+        </div>

-    % end
+        <br>

-    %= hidden_field 'debug' => '1'
+        % my $btn = l('PERFORM');
+        <%= hidden_field 'debug' => '1' %>
+
+        <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>
 %end
--- 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 27
+%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,12 @@ 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
+
 * Wed Jun 04 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-27.sme
 - finish Email panels
 - Fix login password toggle
Author	SHA1	Message	Date
John Crisp	307ee9dea4	Proxy panel done	2025-06-04 18:27:40 +02:00
John Crisp	05d0b91138	reboot panel done	2025-06-04 18:06:02 +02:00