Start Letsencrypt panels

root/usr/share/smanager/themes/AdminLTE/templates/letsencrypt.html.ep

@@ -6,69 +6,73 @@
 
 % content_for 'module' => begin
 
-<!-- needs moving -->
+<!-- reetp needs moving - probabyl not required -->
 
-%= stylesheet '/css/letsencrypt.css'
+<!-- stylesheet '/css/letsencrypt.css' -->
 
 <div  class="card-body">
 
     % if (config->{debug} == 1) {
     <pre>
-        %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-        %= dumper $lets_data->{trt}
+        <%= dumper $lets_data->{trt}  %>
     </pre>
     % }
 
     <h1><%=$title%></h1>
 
     % if ( stash('modul')) {
-    %= $c->render_to_string(inline => stash('modul') );
+        <br>
+        <div>
+            <%= $c->render_to_string(inline => stash('modul') ); %>
+        </div>
     % }
 
-    %if ($c->stash('first')) {
+    % if ($c->stash('first')) {
-        <br><p>
+        <br>
-        %=$c->render_to_string(inline =>$c->l($c->stash('first')))
+        <div>
-        </p>
+            <%=$c->render_to_string(inline =>$c->l($c->stash('first')))  %>
-
-    %} elsif ($c->stash('success')) {
-        <div class="">
-           <h2><%=$c->l('lets_Status_Report') %></h2><p>
-            %= $c->l($c->stash('success'));
-            </p>
         </div>
 
-    %} elsif ($c->stash('error')) { 
+    % } elsif ($c->stash('success')) {
-       <div class="">
+        <div class="text-success">
-           <h2><%=$c->l('lets_Error_Status_Report') %></h2><p>
+            <h2><%=$c->l('lets_Status_Report') %></h2>
-            %= $c->l($c->stash('error'));
+            <div>
-            </p>
+                <%= $c->l($c->stash('success')); %>
             </div>
-    %}
+        </div>
+
+    % } elsif ($c->stash('error')) {
+       <div class="text-danger">
+            <h2><%=$c->l('lets_Error_Status_Report') %></h2>
+            <div>
+                <%= $c->l($c->stash('error')); %>
+            </div>
+        </div>
+    % }
 
     %#Routing to partials according to trt parameter.
     %#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
 
     % if ($lets_data->{trt} eq "LIST") {
-        %= include 'partials/_lets_LIST'
+        <%= include 'partials/_lets_LIST' %>
-    %}
+    % }
 
     % if ($lets_data->{trt} eq "PARAMS") {
-        %= include 'partials/_lets_PARAMS'
+        <%= include 'partials/_lets_PARAMS' %>
-    %}
+    % }
 
     % if ($lets_data->{trt} eq "CHECKALLDOMAINS") {
-        %= include 'partials/_lets_CHECKALLDOMAINS'
+        <%= include 'partials/_lets_CHECKALLDOMAINS' %>
-    %}
+    % }
 
     % if ($lets_data->{trt} eq "CHECKALLENABLEDDOMAINS") {
-        %= include 'partials/_lets_CHECKALLENABLEDDOMAINS'
+        <%= include 'partials/_lets_CHECKALLENABLEDDOMAINS' %>
-    %}
+    % }
 
     % if ($lets_data->{trt} eq "CHECKONEDOMAIN") {
-        %= include 'partials/_lets_CHECKONEDOMAIN'
+        <%= include 'partials/_lets_CHECKONEDOMAIN' %>
-    %}
+    % }
-
-
 
 </div>
 %end

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep

@@ -2,48 +2,67 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
+
+<!-- reetp Move to JS file -->
+    <!--
     <script>
         window.onload = function() {
         SelectInput();
     };
     </script>
+    -->
 
     % if (config->{debug} == 1) {
         <pre>
-            %= dumper $lets_data
+            <%= dumper $lets_data %>
         </pre>
     % }
 
     % my $btn = l('lets_APPLY');
-    %= form_for "letsencryptu" => (method => 'POST') => begin
+
-        % param 'trt' => $lets_data->{trt} unless param 'trt';
+    <!-- reetp  could change this to a form -->
-        %= hidden_field 'trt' => $lets_data->{trt}
+
+    <!-- <form action="/smanager/letsencryptu" method="POST"> -->
+
         %# Inputs etc in here.
 
-        <h1 class=""><%=l('lets_Check_all_enabled_domains')%></h1>
+        <h1><%= l ('lets_Check_all_enabled_domains')%></h1>
 
-        <h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
-    
-        <span class="">
-            %=l('lets_Enabled_domains_check_result')
-        </span>
-        <span class="">
-            % param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
-            %= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-        </span>
         <br>
 
-        <span class="">
+        <h2><%= l ('lets_Loop_through_checking_the_letsencrypt')%></h2>
-                        %my $back_text = l('lets_Back');  # Localized text
-                        %my $actionBack = qq{
-                        %       <a href="letsencryptd">
-                        %       <input class="" type='submit'  value='$back_text'>
-                        %       </a>
-                        %};
-                      <%= $c->render_to_string(inline => $actionBack) %>
-        </span>
 
+        <br>
+
+        <!-- Domains being checked -->
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_Enabled_domains_check_result') %>
+            </div>
+            <div class="col-auto">
+                % param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
+                %= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
+            </div>
+        </div>
+
+        <br>
+
+        <!-- results box-->
+
+        % my $back_text = l('lets_Back');  # Localized text
+        %# param 'trt' => $lets_data->{trt} unless param 'trt';
+        %#= hidden_field 'trt' => $lets_data->{trt}
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+
+            </div>
+        </div>
+
+    <!--
+    </form>
+    -->
 
-        %# Probably finally by a submit.
-    %end    
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep

@@ -2,11 +2,14 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
+
+    <!--
     <script>
         window.onload = function() {
         SelectInput();
     };
     </script>
+    -->
 
     % if (config->{debug} == 1) {
         <pre>
@@ -15,45 +18,60 @@
     % }
 
     % my $btn = l('lets_APPLY');
-    %= form_for "letsencryptu" => (method => 'POST') => begin
+
-        % param 'trt' => $lets_data->{trt} unless param 'trt';
+    <!-- <form action="/smanager/letsencrypt" method="POST"> -->
-        %= hidden_field 'trt' => $lets_data->{trt}
+
         %# Inputs etc in here.
 
-        <h1 class=""><%=l('lets_Check_just_one_domain')%></h1>
+        <h1><%=l('lets_Check_just_one_domain')%></h1>
 
-        <h2 class=""><%=l('lets_Loop_through_and_check_the')%></h2>
+        <br>
 
-        <p><span class="">
+        <h2><%=l('lets_Loop_through_and_check_the')%></h2>
-            %=l('lets_Domains_name')
+
-        </span>
+        <br>
-        <span class="">
+
+
+        <!-- Domain being checked -->
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_Domains_name') %>
+            </div>
+            <div class="col-auto">
             % param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
             %= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
-        <br>
+            </div>
-        </span>
+        </div>
-        </p>
 
-        <span class="">
+        <br>
-            %=l('lets_One_domain_check_result')
+
-        </span>
+        <!-- results box-->
-        <span class="">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+            <%= l ('lets_One_domain_check_result') %>
+            </div>
+            <div class="col-auto">
             % param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
             %= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-        </span>
+            </div>
+        </div>
+
         <br>
 
-        <span class="">
-                        %my $back_text = l('lets_Back');  # Localized text
-                        %my $actionBack = qq{
-                        %       <a href="letsencryptd">
-                        %       <input class="" type='submit'  value='$back_text'>
-                        %       </a>
-                        %};
-                      <%= $c->render_to_string(inline => $actionBack) %>
-        </span>
 
+        % my $back_text = l('lets_Back');  # Localized text
+        %# param 'trt' => $lets_data->{trt} unless param 'trt';
+        %#= hidden_field 'trt' => $lets_data->{trt}
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+
+            </div>
+        </div>
+
+    <!-- </form> -->
 
-        %# Probably finally by a submit.
-    %end    
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep

@@ -2,151 +2,207 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
+
+<!-- reetp Move to JS file -->
+    <!--
     <script>
         window.onload = function() {
         SelectInput();
     };
     </script>
+    -->
 
     % if (config->{debug} == 1) {
         <pre>
-            %= dumper $lets_data
+            <%= dumper $lets_data %>
         </pre>
     % }
 
-    % my $btn = l('lets_APPLY');
+
-    %= form_for "letsencryptu" => (method => 'POST') => begin
+    <br>
-        % param 'trt' => $lets_data->{trt} unless param 'trt';
+
-        %= hidden_field 'trt' => $lets_data->{trt}
+    <!-- reetp  could change this to a form -->
+
+    <!-- <form action="/smanager/letsencryptu" method="POST"> -->
+
+        %# my $btn = l('lets_APPLY');
+        %# param 'trt' => $lets_data->{trt} unless param 'trt';
+        %#= hidden_field 'trt' => $lets_data->{trt}
+
+        % my $linkbtn = l ('MODIFY');
+
         %# Inputs etc in here.
+        %# reetp Needs some language translations?
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l('lets_CONFIG') %>
+            </div>
+            <div class="col-auto">
+                <a href='letsencryptd?trt=PARAMS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
+            </div>
+        </div>
 
-        <div>
+        <br>
 
-        <a href='letsencryptd?trt=PARAMS' class="">
-            %= l('lets_CONFIG')
-        </a>
         %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
 
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_CHECK_ALL_DOMAINS') %>
+            </div>
+            <div class="col-auto">
+                <a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
+            </div>
+        </div>
 
-        <a href='letsencryptd?trt=CHECKALLDOMAINS' class="">
-            %= l('lets_CHECK_ALL_DOMAINS')
-        </a>
         %#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3'
 
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
+            </div>
+            <div class="col-auto">
+                <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
+            </div>
+        </div>
 
-        <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="">
-            %= l('lets_CHECK_ALL_ENABLED_DOMAINS')
-        </a>
         %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
 
 
+    <!-- </form>  -->
+
+
+        <br><br>
+
+        <h2><%=l('lets_For_this_Server') %></h2>
+
+        <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l ('lets_Internal_IP') %>
                 </div>
-        
+                <div class="col-auto">
-    
-        <h2 class=""><%=l('lets_For_this_Server')%></h2>
-    
-        <p>
-        <span class="">
-            %=l('lets_Internal_IP')
-        </span>
-        <span class="">
                     % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
                     %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
-        <br>
+                </div>
-        </span>
+            </div>
-        </p>
 
-        <p>
+            <br>
-        <span class="">
+
-            %=l('lets_External_Interface_IP')
+            <div class="row g-3 align-items-center">
-        </span>
+                <div class="col-md-1">
-        <span class="">
+                    <%= l ('lets_External_Interface_IP') %>
+                </div>
+                <div class="col-auto">
                     % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
                     %= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
-        <br>
+                </div>
-        </span>
+            </div>
-        </p>
 
-        <p>
+            <br>
-        <span class="">
+
-            %=l('lets_Internet_IP')
+            <div class="row g-3 align-items-center">
-        </span>
+                <div class="col-md-1">
-        <span class="">
+                    <%= l ('lets_Internet_IP') %>
+                </div>
+                <div class="col-auto">
                     % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
                     %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
+                </div>
+            </div>
+
+            <br><br>
+
+            <h2><%=l('lets_Current_certificate_details') %></h2>
+
             <br>
-        </span>
-        </p>
 
-        <h2 class=""><%=l('lets_Current_certificate_details')%></h2>
+            <div class="row g-3 align-items-center">
-    
+                <div class="col-md-1">
-        <p>
+                <%= l ('lets_Issuer') %>
-        <span class="">
+                </div>
-            %=l('lets_Issuer')
+                <div class="col-auto">
-        </span>
-        <span class="">
                     % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
                     %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
-        <br>
+                </div>
-        </span>
+            </div>
-        </p>
 
-        <p>
+            <br>
-        <span class="">
+
-            %=l('lets_Expiry')
+            <div class="row g-3 align-items-center">
-        </span>
+                <div class="col-md-1">
-        <span class="">
+                    <%= l ('lets_Expiry') %>
+                </div>
+                <div class="col-auto">
                     % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
                     %= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
-        <br>
+                </div>
-        </span>
+            </div>
-        </p>
 
-        <p>
+            <br>
-        <span class="">
+
-            %=l('lets_Not_Before')
+            <div class="row g-3 align-items-center">
-        </span>
+                <div class="col-md-1">
-                <span class="">
+                    <%= l ('lets_Not_Before') %>
+                </div>
+                <div class="col-auto">
                     % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
                     %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
+                </div>
+            </div>
+
+            <br><br>
+
+            <h2 class=""><%=l('lets_List_of_Domains_and_Hosts') %></h2>
+
             <br>
-        </span>
-        </p>
 
-        <h2 class=""><%=l('lets_List_of_Domains_and_Hosts')%></h2>
+            % $linkbtn = l 'lets_CHECK';
 
-        <br />
             <table class="table table-bordered">
-            <thead class="">
+                <thead>
                     <tr table-head-row>
-                    <th class=""><%=l('lets_Domain_name_/_HOSTNAME')%></th>
+                        <th><%= l ('lets_Domain_name_/_HOSTNAME') %></th>
-                    <th class=""><%=l('lets_Brief_description')%></th>
+                        <th><%= l ('lets_Brief_description') %></th>
-                    <th class=""><%=l('lets_Content')%></th>
+                        <th><%= l ('lets_Content') %></th>
-                    <th class=""><%=l('lets_LABEL_NAMESERVERS')%></th>
+                        <th><%= l ('lets_LABEL_NAMESERVERS') %></th>
-                    <th class=""><%=l('lets_LABEL_POINT')%></th>
+                        <th><%= l ('lets_LABEL_POINT') %></th>
-                    <th class=""><%=l('lets_LABEL_LECERT')%></th>
+                        <th><%= l ('lets_LABEL_LECERT') %></th>
-                    <th class=""><%=l('lets_IS_IN_CERT')%></th>
+                        <th><%= l ('lets_IS_IN_CERT') %></th>
-                    <th class=""><%=l('lets_CHECK')%></th>
+                        <th><%= l ('lets_CHECK') %></th>
                     </tr>
                 </thead>
-            <tbody class="">
+                <tbody>
                     % my $control_data = $c->stash('DomainList');
                     % foreach my $row (@$control_data) {
-                <tr class="">
+                        % my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'});
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%></td>
+                        % my $type = $c->render_to_string(inline=>$row->{'Table1-TYPE'});
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%></td>
+                        <tr>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Content'})%></td>
+                            % if  ($type eq "Domain\n"){
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'})%></td>
+                                <td><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'})%></td>
+                            % }
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'})%></td>
+                            % if ($type eq "Host\n") {
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%></td>
+                                <td><i class="bi bi-arrow-return-right"> </i><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%></td>     
+                            % }
+
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
+                            <td><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %></td>
+
+                            % if ($link ne "") {
+                            <td><a href= "<%= $link %>" class="btn btn-outline-primary btn-sm" role="button" > <%= $linkbtn %></a></td>
+                            % } else {
+                                <td>&nbsp</td>
+                            % }
                         </tr>
-                %}
+                    % }
                 </tbody>
             </table>
 
-    
-        %# Probably finally by a submit.
-    %end    
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep

@@ -2,129 +2,152 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
+
+<!-- reetp This needs fixing -->
+<!--
     <script>
         window.onload = function() {
         SelectInput();
     };
     </script>
-    
+-->
     % if (config->{debug} == 1) {
         <pre>
-            %= dumper $lets_data
+            <%= dumper $lets_data %>
         </pre>
     % }
 
-    % my $btn = l('lets_APPLY');
+    <form action="/smanager/letsencryptu" method="POST">
-    %= form_for "letsencryptu" => (method => 'POST') => begin
+
         % param 'trt' => $lets_data->{trt} unless param 'trt';
         %= hidden_field 'trt' => $lets_data->{trt}
         %# Inputs etc in here.
 
-        <h2 class=""><%=l('lets_Manage_letsencrypt-config_settings:')%></h2>
+        <h2 class=""><%=l('lets_Manage_letsencrypt-config_settings:') %></h2>
 
-        <p class="">
-            %=l('lets_CONFIG_LETSENCRYPT')
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_SERVICE_STATUS')
-        </span>
-                <span class="">
-            %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']];
-            % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
-            %# param 'status' => $lets_data->{status} unless param 'status';
-            %= select_field 'status' => @status_options, class => ""
         <br>
-        </span>
-        </p>
 
-        <p>
+        <div>
-        <span class="">
+            <%= l ('lets_CONFIG_LETSENCRYPT') %>
-            %=l('lets_HOOKSCRIPT_STATUS')
+        </div>
-        </span>
+
-        <span class="">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_SERVICE_STATUS') %>
+            </div>
+            <div class="col-auto">
+                    % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
+                    %= select_field 'status' => @status_options, class => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_HOOKSCRIPT_STATUS') %>
+            </div>
+            <div class="col-auto">
                 % my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
                 % param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
-            %= select_field 'hookScript' => @hookScript_options, class => ""
+                %= select_field 'hookScript' => @hookScript_options, class => "form-select"
-        <br>
+            </div>
-        </span>
+        </div>
-        </p>
 
-        <p>
+        <br>
-        <span class="">
+
-            %=l('lets_HOSTOVERRIDE_STATUS')
+
-        </span>
+        <div class="row g-3 align-items-center">
-        <span class="">
+            <div class="col-md-1">
+                <%= l ('lets_HOSTOVERRIDE_STATUS') %>
+            </div>
+            <div class="col-auto">
                 % my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
                 % param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
-            %= select_field 'hostOverride' => @hostOverride_options, class => ""
+                %= select_field 'hostOverride' => @hostOverride_options, class => "form-select"
-        <br>
+            </div>
-        </span>
+        </div>
-        </p>
 
-        <p>
+        <br>
-        <span class="">
+
-            %=l('lets_ACCEPT_TERMS_STATUS')
+
-        </span>
+        <div class="row g-3 align-items-center">
-        <span class="">
+            <div class="col-md-1">
+                <%= l ('lets_ACCEPT_TERMS_STATUS') %>
+            </div>
+            <div class="col-auto">
                 % my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
                 % param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
-            %= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => ""
+                %= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => "form-select"
-        <br>
+            </div>
-        </span>
+        </div>
-        </p>
 
-        <p>
+        <br>
-        <span class="">
+
-            %=l('lets_API_STATUS')
+
-        </span>
+        <div class="row g-3 align-items-center">
-                <span class="">
+            <div class="col-md-1">
+                <%= l ('lets_API_STATUS') %>
+            </div>
+            <div class="col-auto">
                 % my @API_options = [['2' => '2']];
                 % param 'API' => $lets_data->{API} unless param 'API';
-            %= select_field 'API' => @API_options, class => ""
+                %= select_field 'API' => @API_options, class => "form-select"
-        <br>
+            </div>
-        </span>
+        </div>
-        </p>
 
-        <p>
+        <br>
-        <span class="">
+
-            %=l('lets_KEYSIZE_STATUS')
+
-        </span>
+        <div class="row g-3 align-items-center">
-        <span class="">
+            <div class="col-md-1">
+                <%= l ('lets_KEYSIZE_STATUS') %>
+            </div>
+            <div class="col-auto">
                 % my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
                 % param 'keysize' => $lets_data->{keysize} unless param 'keysize';
-            %= select_field 'keysize' => @keysize_options, class => ""
+                %= select_field 'keysize' => @keysize_options, class => "form-select"
-        <br>
+            </div>
-        </span>
+        </div>
-        </p>
 
-        <p>
+        <br>
-        <span class="">
+
-            %=l('lets_CONFIGUREMODE_STATUS')
+
-        </span>
+        <div class="row g-3 align-items-center">
-        <span class="">
+            <div class="col-md-1">
+                <%= l ('lets_CONFIGUREMODE_STATUS') %>
+            </div>
+            <div class="col-auto">
                 % my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
                 % param 'configure' => $lets_data->{configure} unless param 'configure';
-            %= select_field 'configure' => @configure_options, class => ""
+                %= select_field 'configure' => @configure_options, class => "form-select"
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
 
-        <p>
+
-        <span class="">
+        <div class="row g-3 align-items-center">
-            %=l('lets_EMAIL')
+            <div class="col-md-1">
-        </span>
+                <label for="email_address" class="col-form-label"><%= l ('lets_EMAIL') %></label>
-        <span class="">
+
+            </div>
+            <div class="col-auto">
                 % param 'email' => $lets_data->{email} unless param 'email';
-            %=email_field 'email', class => ""
+                <input type="email" name="email" id="email_address" class="form-control" aria-describedby="Email Address" value="<%= $lets_data->{email} %>">
-        </span>
+            </div>
-        </p>
+        </div>
 
-        <span class="">
+        <br>
-            %= submit_button l('lets_Save'), class => ""
-        </span>
 
-        %# Probably finally by a submit.
+        % my $btn = l('lets_APPLY');
-    %end    
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep

@@ -13,24 +13,23 @@
     % }
 
 	% if ($ret{ret} eq "") {
-		<br>
+		<div>
             <%= l "ln_FIRSTPAGE_DESC" %>
-        <BR>
+        </div>
         % } elsif (index($ret{ret},"SUCCESS") != -1) {
-           <div class="">
+           <div>
-               <h2> Operation Status Report</h2>
+               <!-- <h2> Operation Status Report</h2> -->
-                <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
             </div>
         % } else {
-           <div class="">
+           <div class="text-danger">
-               <h2> Operation Status Report - Error</h2>
+               <!-- <h2> Operation Status Report - Error</h2> -->
-                <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
             </div>
     % }
 
     <br>
 
-    % my $btn = l('ADD');
     % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
 
     % if (config->{debug} == 1) {
@@ -84,11 +83,14 @@
 
         <br><br>
 
+        % my $btn = l('ADD');
+
         <div class="row g-3 align-items-center">
             <div class="col-md-1">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
+
     </form>
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep

@@ -6,12 +6,12 @@
     % my $router = $ln_datas->{router};
 
    % if (config->{debug} == 1) {
-    <div>
+    <pre>
         <%= dumper $c->current_route %>
         <%= dumper $c->stash("ret") %>
         <%= dumper %$ln_datas %>
         <%= dumper $deletehosts %>
-    </div>
+    </pre>
     % }
 
     <form action="/smanager/localnetworkse" method="POST">
@@ -62,28 +62,24 @@
         % if ($deletehosts) {
             <br>
 
-            <b>tell me if you find this!</b>
+            <div>
-            <b>Please opoen a bug and tell me</b>
-
                 <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
+            </div>
             <br>
-            <span class="">
+            <div class="text-danger align-bottom">
-                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
+                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>&nbsp&nbsp<input type="checkbox" name="deletehost">
-            </span>
+            </div>
-            <span class="">
-                <%= check_box deletehost=>1, checked=>1 %>
-            </span>
             <br><br>
         % }
 
+        <%= hidden_field localnetwork=>$localnetwork %>
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
 
-        <%= hidden_field localnetwork=>$localnetwork %>
-
     </form>
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep

@@ -1,95 +1,122 @@
 <div>
 
-    % my $retref= $c->stash("ret");
+    % my $retref = $c->stash("ret");
-    % my %ret;
+    % my %ret = $retref ? %$retref : (ret => "");
-    % unless (length($retref)) {%ret = (ret=>"");}
+    % my @vars = split(/,/, $ret{vars} // '');
-    % else {%ret = %$retref;}
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
-    
-    % my @vars = split(",",$ret{vars});
-    % my $var1 = @vars[0];
-    % my $var2 = @vars[1];
-    % my $var3 = @vars[2];
-    % my $var4 = @vars[3];
-    % my $var5 = @vars[4];
-    % my $var6 = @vars[5];
 
     <br>
-    %if ($ret{'ret'} eq "") {
-    
-    %} elsif (index($ret{ret},"SUCCESS") != -1) {
-       <div class="">
-           <!--<h2> Operation Status Report</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-        </div>
-       %} else { 
-       <div class="">
-           <!--<h2> Operation Status Report - Error</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-        </div>
-    %}
-    <br />
-    % my $btn = l('ADD');
 
    % if (config->{debug} == 1) {
-    <p>
+    <pre>
-    %= dumper $c->current_route
+        <%= dumper $c->current_route %>
-    %= dumper $c->stash("ret")
+        <%= dumper $c->stash("ret") %>
-    </p>
+    </pre>
     % }
 
-    %= form_for '/portforwardingb' => (method => 'POST') => begin
+    % if ($ret{'ret'} eq "") {
-        <h2>
+        <div>
-        %=l "pf_CREATE_RULE"
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
-        </h2>
+        </div>
-            <p>
+    % } elsif (index($ret{ret},"SUCCESS") != -1) {
-                %=l "pf_SUMMARY_ADD_DESC"
+       <div>
-            </p><br>
+           <!--<h2> Operation Status Report</h2>-->
-            <span class="">
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-                %=l "pf_LABEL_PROTOCOL"
+        </div>
-            </span>
+    % } else {
-            <span class="">
+       <div class="text-danger">
-                %=select_field  'proto'=>["TCP","UDP"]
+           <!--<h2> Operation Status Report - Error</h2>-->
-            </span><br><br>
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-            <span class="">
+        </div>
-                %=l "pf_LABEL_SOURCE_PORT"
+    % }
-            </span>
-            <span class="">
-                %=text_field 'sport'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_PORT"
-            </span>
-            <span class="">
-                %=text_field 'dport'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_HOST"
-            </span>
-            <span class="">
-                %=text_field 'dhost'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_ALLOW_HOSTS"
-            </span>
-            <span class="">
-                %=text_field 'allow'
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_RULE_COMMENT"
-            </span>
-            <span class="">
-                %=text_field 'cmmnt'
-            </span>
-            <br><br>
-            <p>
-            <br>
-            %= submit_button "$btn", class => ""
-            </p>
 
-    %end
+    <br>
+
+    <h2><%= l "pf_CREATE_RULE" %></h2>
+
+      <form action="/smanager/portforwardingb" method="POST">
+
+        <br>
+        <div>
+            <%= l "pf_SUMMARY_ADD_DESC" %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l "pf_LABEL_PROTOCOL" %>
+            </div>
+            <div class="col-auto">
+                <%=select_field  'proto'=>["TCP","UDP"], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputSourcePort" class="col-form-label"><%= l "pf_LABEL_SOURCE_PORT" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="sport" id="inputSourcePort" class="form-control" aria-describedby="Source Port">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputDestinationPort" class="col-form-label"><%= l "pf_LABEL_DESTINATION_PORT" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="port" id="inputDestinationPort" class="form-control" aria-describedby="Destination Port">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputDestinationHost" class="col-form-label"><%= l "pf_LABEL_DESTINATION_HOST" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="dhost" id="inputDestinationHost" class="form-control" aria-describedby="Destination Host">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputAllowHosts" class="col-form-label"><%= l "pf_ALLOW_HOSTS" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="allow" id="inputAllowHosts" class="form-control" aria-describedby="Allow Hosts">
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputRuleComment" class="col-form-label"><%= l "pf_RULE_COMMENT" %></label>
+            </div>
+            <div class="col-auto">
+                <input type="text" name="cmmnt" id="inputRuleComment" class="form-control" aria-describedby="Comment">
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('ADD');
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+    </form>
 
 </div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep

@@ -1,6 +1,5 @@
 <div>
 
-    % my $btn = l('REMOVE');
     % my $proto = $pf_datas->{proto};
     % my $sport = $pf_datas->{sport};
     % my $dport = $pf_datas->{dport};
@@ -8,7 +7,7 @@
     % my $cmmnt = $pf_datas->{cmmnt};
     % my $allow = $pf_datas->{allow};
 
-   % if (config->{debug} == 0) {
+   % if (config->{debug} == 1) {
         <pre>
             <%= dumper $c->current_route %>
             <%= dumper $c->stash("ret") %>
@@ -23,11 +22,17 @@
             <%= l 'pf_SUMMARY_REMOVE_DESC' %>
         </div>
 
+        <br>
+
         <table>
+        <thead>
+            <th class="col-md-4">&nbsp</th>
+            <th class="col-md-4">&nbsp</th>
+        </thead>
             <tbody>
-                <tr>
+                <tr >
                     <td>
-                        <% l 'pf_LABEL_PROTOCOL' %>
+                        <%= l 'pf_LABEL_PROTOCOL' %>
                     </td>
                     <td>
                        <%= $proto %>
@@ -35,7 +40,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <% l 'pf_LABEL_SOURCE_PORT' %>
+                        <%= l 'pf_LABEL_SOURCE_PORT' %>
                     </td>
                     <td>
                        <%= $sport %>
@@ -43,7 +48,7 @@
                 <tr>
                 <tr>
                     <td>
-                        <% l 'pf_LABEL_DESTINATION_HOST' %>
+                        <%= l 'pf_LABEL_DESTINATION_HOST' %>
                     </td>
                     <td>
                        <%= $dport %>
@@ -51,7 +56,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <% l 'pf_LABEL_DESTINATION_PORT' %>
+                        <%= l 'pf_LABEL_DESTINATION_PORT' %>
                     </td>
                     <td>
                        <%= $dhost %>
@@ -59,7 +64,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <% l 'pf_RULE_COMMENT' %>
+                        <%= l 'pf_RULE_COMMENT' %>
                     </td>
                     <td>
                         <%= $cmmnt %>
@@ -67,7 +72,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <% l 'pf_ALLOW_HOSTS' %>
+                        <%= l 'pf_ALLOW_HOSTS' %>
                     </td>
                     <td>
                         <%= $allow %>
@@ -76,9 +81,13 @@
             </tbody>
         </table>
 
+        <br>
+
         <%= hidden_field sport=>$sport %>
         <%= hidden_field proto=>$proto %>
 
+        % my $btn = l('REMOVE');
+
         <div class="row g-3 align-items-center">
             <div class="col-md-1">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep

@@ -1,45 +1,41 @@
 <div>
 
-
+    % my $retref = $c->stash("ret");
-
+    % my %ret = $retref ? %$retref : (ret => "");
-    <form action="/smanager/portforwardinga" method="POST">
+    % my @vars = split(/,/, $ret{vars} // '');
-
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
-    <br>
-
-    % my $retref= $c->stash("ret");
-    % my %ret;
-    % unless (length($retref)) {%ret = (ret=>"");}
-    % else {%ret = %$retref;}
 
     % my $numtcpforwards = @$tcpforwards;
     % my $numudpforwards = @$udpforwards;
 
-    % my @vars = split(",",$ret{vars});
+    % if ($c->app->config->{debug}) {
-    % my $var1 = @vars[0];
+        <pre>
-    % my $var2 = @vars[1];
+            <%= dumper { ret_data => \%ret } %>
-    % my $var3 = @vars[2];
+        </pre>
-    % my $var4 = @vars[3];
+    % }
-    % my $var5 = @vars[4];
-    % my $var6 = @vars[5];
 
     % if ($ret{ret} eq "") {
+        <div>
             <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
+        </div>
     % } elsif (index($ret{ret},"SUCCESS") != -1) {
-        <br>
+
         <div>
            <h2> Operation Status Report</h2>
-            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
         </div>
     % } else {
         <br>
         <div class="text-danger">
            <h2> Operation Status Report - Error</h2>
-            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
+           <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
         </div>
     % }
 
     <br>
 
+    <form action="/smanager/portforwardinga" method="POST">
+
     % my $btn = l('pf_CREATE_RULE');
 
     <div class="row g-3 align-items-center">
@@ -50,9 +46,9 @@
 
     </form>
 
+    <br>
 
-
+    % if ($empty) {
-    % if ($empty){
             <br>
             <%= l 'pf_NO_FORWARDS' %>
     % } else {

root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep

@@ -9,7 +9,7 @@
         <%= dumper "<pf>".$c->current_route %>
         <%= dumper $c->stash("ret") %>
         <%= dumper $c->stash("portforwarding") %>
-        %  my $ref = $pf_datas->{portforwarding}; %>
+        %  my $ref = $pf_datas->{portforwarding};
         <%= dumper $ref->{TCP}->[0]."</pf>" %>
     </pre>
     % }

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 36
+%define release 39
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -16,7 +16,7 @@ BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: smeserver-devtools
 Requires: smeserver-release >= 11.0
-Requires: smeserver-manager >= 11.0.0
+Requires: smeserver-manager >= 11.0.0-91
 Requires: smeserver-lib >= 11.0.0-13
 Requires: e-smith-manager >= 2.4.0-22
 
@@ -28,6 +28,16 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Tue Jun 17 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-39.sme
+- Start Letsencrypt panels
+
+* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-38.sme
+- More formatting for LocalNetworks
+- More formatting for PortForwards
+
+* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-37.sme
+- Finish portforwarding to work with [SME:13043]
+
 * Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-36.sme
 - Cosmetic tweaks
 - Localnetworking fix via [SME: 13041]