11.0.0-40.sme

Update Letsencrypt templates
Fix typo in css file
2025-06-18 15:44:15 +02:00 · 2025-06-18 15:42:51 +02:00 · 2025-06-18 15:42:19 +02:00 · 2025-06-18 15:40:41 +02:00 · 2025-06-17 15:33:22 +02:00 · 2025-06-13 19:55:48 +02:00
29 changed files with 1037 additions and 800 deletions
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css
@@ -104,10 +104,13 @@ html {
    border-left-width: 0px;
 }

-.user-valign-center {
+/* .user-valign-center {
    text-align: center;
-}
+    -- Use align-middle --
+} */

-.user-table-max-wdith {
+
+
+.user-table-max-width {
    max-width: 50%;
 }
--- a/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep
@@ -1,6 +1,6 @@
 <%

-    my $backups = esmith::BackupHistoryDB->open;
+    my $backups = esmith::BackupHistoryDB->open; # no UTF8
    my $now = time();
    my $backup_rec = $backups->new_record($now, {
        type => 'backup_record', BackupType => 'desktop',
@@ -22,7 +22,7 @@
    my $success = open my $fh, '-|', $cmd;
    #unless ($success) { return "Error download command."; };
    if ($success) {
-        # Try with download plugin - seems to fail to complete download and also 
+        # Try with download plugin - seems to fail to complete download and also
        # name of file deposited is not as required.
        #my $output = do { local $/; <$fh> };
        #close $fh;
--- a/root/usr/share/smanager/themes/AdminLTE/templates/letsencrypt.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/letsencrypt.html.ep
@@ -1,74 +1,78 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 % layout 'AdminLTE', title => "Sme server 2 - Letsencrypt certificate", share_dir => './';
 %# css specific to this panel:

 % 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 $lets_data->{trt}
+        <%= dumper $c->current_route %>
+        <%= 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')) {
-        <br><p>
-        %=$c->render_to_string(inline =>$c->l($c->stash('first')))
-        </p>
-
-    %} elsif ($c->stash('success')) {
-        <div class="">
-           <h2><%=$c->l('lets_Status_Report') %></h2><p>
-            %= $c->l($c->stash('success'));
-            </p>
+    % if ($c->stash('first')) {
+        <br>
+        <div>
+            <%=$c->render_to_string(inline =>$c->l($c->stash('first')))  %>
        </div>

-    %} elsif ($c->stash('error')) { 
-       <div class="">
-           <h2><%=$c->l('lets_Error_Status_Report') %></h2><p>
-            %= $c->l($c->stash('error'));
-            </p>
+    % } elsif ($c->stash('success')) {
+        <div class="text-success">
+            <h2><%=$c->l('lets_Status_Report') %></h2>
+            <div>
+                <%= $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
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep
@@ -28,7 +28,7 @@
                <th class="col-sm"><%=l 'DESCRIPTION_BRIEF' %></th>
                <th class="col-sm"><%=l 'dom_CONTENT' %></th>
                <th class="col-sm"><%=l 'dom_LABEL_NAMESERVERS'%></th>
-                <th class="col-sm user-valign-center" colspan="2"><%=l 'ACTION' %></th>
+                <th class="col-sm text-center" colspan="2"><%=l 'ACTION' %></th>
            </tr>
        </thead>

@@ -65,10 +65,10 @@
                                %   </button>
                                % </a>
                            %};
-                        %#      $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
+                        %# $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
                    %};
-                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
-                    <td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="col-auto text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="col-auto text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
                </tr>
            % }

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep
@@ -24,7 +24,7 @@
                <tr>
                    <th class="col-sm"><%= l 'GROUP' %></th>
                    <th class="col-sm"><%= l 'DESCRIPTION' %></th>
-                    <th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
+                    <th class="col-sm align-middle" colspan="2"><%= l 'ACTION' %></th>
                </tr>
            </thead>
            <tbody>
@@ -54,8 +54,8 @@
                                % </a>
                            %};

-                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
                    </tr>
                % }
            </tbody>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep
@@ -26,7 +26,7 @@
                    <th class="col-auto"><%= l 'IP_ADDRESS_OR_FQDN' %></th>
                    <th class="col-auto"><%= l 'hos_ETHERNET_ADDRESS' %></th>
                    <th class="col-auto"><%= l 'COMMENT' %></th>
-                    <th class="user-valign-center" colspan="2"><%= l 'ACTION' %></th>
+                    <th class="align-middle" colspan="2"><%= l 'ACTION' %></th>
                </tr>
            </thead>

@@ -63,8 +63,8 @@
                                % </a>
                            %};
                        % }
-                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
+                        <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>

                </tr>
               % }
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep
@@ -36,7 +36,7 @@
                 <tr>
                     <th class="col-sm"><%= l 'NAME' %></th>
                     <th class="col-sm"><%= l 'DESCRIPTION' %></th>
-                     <th class="col-sm user-valign-center" colspan="3"><%= l 'ACTION' %></th>
+                     <th class="col-sm align-middle" colspan="3"><%= l 'ACTION' %></th>
                 </tr>
             </thead>

@@ -103,9 +103,9 @@
                             % </a>
                             %};
                         % }
-                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw)%></td>
-                         <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionResetPw)%></td>
+                         <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
                     </td>
                 </tr>
             % }
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep
@@ -1,47 +1,64 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# 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 isn't required? -->
+<!--
    <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';
-        %= hidden_field 'trt' => $lets_data->{trt}
+    <!-- <form action="/smanager/letsencryptu" method="POST"> -->
+
+
        %# Inputs etc in here.

-        <h1 class=""><%=l('lets_Check_all_domains')%></h1>
-    
-        <h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
-    
-        <span class="">
-            %=l('lets_All_domains_check_result')
-        </span>
-        <span class="">
-            % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
-            %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-        </span><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>
+        <h1><%=l('lets_Check_all_domains')%></h1>
+
+        <br>
+
+        <h2><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
+
+        <br>
+
+        <!-- results box-->
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                %=l('lets_All_domains_check_result')
+            </div>
+            <div class="col-auto">
+                % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
+                %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
+            </div>
+        </div>
+
+        <br>
+
+        %# my $btn = l('lets_APPLY');
+        %# param 'trt' => $lets_data->{trt} unless param 'trt';
+        %#= hidden_field 'trt' => $lets_data->{trt}
+
+
+        % my $back_text = l('lets_Back');  # Localized text
+
+        <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> -->
+                <a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+            </div>
+        </div>
+
+    <!-- </form> -->

-        %# Probably finally by a submit.
-    %end    
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep
@@ -1,49 +1,68 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# 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';
-        %= hidden_field 'trt' => $lets_data->{trt}
+
+    <!-- reetp  could change this to a form -->
+
+    <!-- <form action="/smanager/letsencryptu" method="POST"> -->
+
        %# Inputs etc in here.

-        <h1 class=""><%=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>
+        <h1><%= l ('lets_Check_all_enabled_domains')%></h1>
+
        <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>
-        
-    
-        %# Probably finally by a submit.
-    %end    
+        <h2><%= l ('lets_Loop_through_checking_the_letsencrypt')%></h2>
+
+        <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> -->
+                <a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+            </div>
+        </div>
+
+    <!--
+    </form>
+    -->
+
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep
@@ -1,59 +1,88 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# 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 isn't required? -->
+
+    <!--
    <script>
        window.onload = function() {
        SelectInput();
    };
    </script>
-    
-    % if (config->{debug} == 1) {
+    -->
+
+    % if (config->{debug} == 0) {
        <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';
-        %= hidden_field 'trt' => $lets_data->{trt}
+
+    <!-- <form action="/smanager/letsencrypt" method="POST"> -->
+
        %# Inputs etc in here.

-        <h1 class=""><%=l('lets_Check_just_one_domain')%></h1>
-    
-        <h2 class=""><%=l('lets_Loop_through_and_check_the')%></h2>
-    
-        <p><span class="">
-            %=l('lets_Domains_name')
-        </span>
-        <span class="">
-            % param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
-            %= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
+        <h1><%=l('lets_Check_just_one_domain')%></h1>
+
        <br>
-        </span>
-        </p>
-    
-        <span class="">
-            %=l('lets_One_domain_check_result')
-        </span>
-        <span class="">
-            % param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
-            %= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-        </span>
+
+        <h2><%=l('lets_Loop_through_and_check_the')%></h2>
+
        <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>
-        
-    
-        %# Probably finally by a submit.
-    %end    
+
+
+        <!-- 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">
+
+                <%= $lets_data->{OneDomainToCheck} %>
+
+            %# param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
+            %#= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
+            </div>
+        </div>
+
+        <br>
+
+        <!-- results box-->
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('lets_One_domain_check_result') %>
+            </div>
+            <div class="col-md-auto">
+                <%= $lets_data->{OneDomainsCheck} %>
+            </div>
+            <div class="col-md-auto">
+                %# param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
+                %#= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
+
+            </div>
+
+
+        </div>
+
+        <br>
+
+
+        % 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> -->
+                <a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+            </div>
+        </div>
+
+    <!-- </form> -->
+
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep
@@ -1,152 +1,236 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# 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';
-        %= hidden_field 'trt' => $lets_data->{trt}
-        %# Inputs etc in here.

-        <div>

-        <a href='letsencryptd?trt=PARAMS' class="">
-            %= l('lets_CONFIG')
-        </a>
-        %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
-    
-    
-        <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'
-    
-    
-        <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'
-    
-    
+    <br>
+
+    <!-- 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 $modifybtn = l ('MODIFY');
+    % my $checkbtn = l ('lets_CHECK');
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l('lets_CONFIG') %>
        </div>
-        
-    
-        <h2 class=""><%=l('lets_For_this_Server')%></h2>
-    
-        <p>
-        <span class="">
-            %=l('lets_Internal_IP')
-        </span>
-        <span class="">
+        <div class="col-md-1 text-center">
+            <a href='letsencryptd?trt=PARAMS' class="btn btn-primary btn-sm" role="button"><%= $modifybtn %></a>
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l ('lets_CHECK_ALL_DOMAINS') %>
+        </div>
+        <div class="col-md-1 text-center">
+            <a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
+        </div>
+        <div class="col-md-1 text-center">
+            <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
+        </div>
+
+    <div>
+
+<br>
+
+<!--
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1 border text-center">
+            <%= l('lets_CONFIG') %>
+        </div>
+        <div class="col-md-2 border text-center">
+            <%= l ('lets_CHECK_ALL_DOMAINS') %>
+        </div>
+        <div class="col-md-2 border text-center">
+            <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
+        </div>
+    <div>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1 border text-center">
+            <a href='letsencryptd?trt=PARAMS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
+        </div>
+        <div class="col-md-2 border text-center">
+            <a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
+        </div>
+        <div class="col-md-2 border text-center">
+            <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
+        </div>
+    </div>
+
+-->
+
+
+    <!-- </form>  -->
+
+
+    <br><br>
+
+    <h2><%=l('lets_For_this_Server') %></h2>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputInternalIP" class="col-form-label"><%= l ('lets_Internal_IP') %></label>
+        </div>
+        <div class="col-auto">
            % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
-            %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
-        <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_External_Interface_IP')
-        </span>
-        <span class="">
+            <input type="text" name="InternalIP" id="inputInternalIP" class="form-control" aria-describedby="Disabled Internal IP" value="<%=$lets_data->{InternalIP}%>" disabled readonly>
+            %#= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputExternalIP" class="col-form-label"><%= l ('lets_External_Interface_IP') %></label>
+        </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>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_Internet_IP')
-        </span>
-        <span class="">
+            <input type="text" name="ExternalIP" id="inputExternalIP" class="form-control" aria-describedby="Disabled External Interface IP" value="<%=$lets_data->{ExternalIP}%>" disabled readonly>
+            %#= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputInternetIP" class="col-form-label"><%= l ('lets_Internet_IP') %></label>
+        </div>
+        <div class="col-auto">
            % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
-            %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
-        <br>
-        </span>
-        </p>
-    
-        <h2 class=""><%=l('lets_Current_certificate_details')%></h2>
-    
-        <p>
-        <span class="">
-            %=l('lets_Issuer')
-        </span>
-        <span class="">
+            <input type="text" name="InternetIP" id="inputInternetIP" class="form-control" aria-describedby="Disabled Internet IP" value="<%=$lets_data->{InternetIP}%>" disabled readonly>
+            %#= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
+        </div>
+    </div>
+
+    <br><br>
+
+    <h2><%=l('lets_Current_certificate_details') %></h2>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+           <label for="inputIssuer" class="col-form-label"><%= l ('lets_Issuer') %></label>
+        </div>
+        <div class="col-auto">
            % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
-            %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
-        <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_Expiry')
-        </span>
-        <span class="">
+            <input type="text" name="Issuer" id="inputIssuer" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Issuer}%>" disabled readonly>
+            %#= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputExpiry" class="col-form-label"><%= l ('lets_Expiry') %></label>
+        </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>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_Not_Before')
-        </span>
-                <span class="">
+            <input type="text" name="Expiry" id="inputExpiry" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Expiry}%>" disabled readonly>
+            %#= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
+        </div>
+    </div>
+
+    <br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1">
+            <label for="inputNotBefore" class="col-form-label"><%= l ('lets_Not_Before') %></label>
+        </div>
+        <div class="col-auto">
            % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
-            %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
-        <br>
-        </span>
-        </p>
-    
-        <h2 class=""><%=l('lets_List_of_Domains_and_Hosts')%></h2>
-    
-        <br />
-        <table class="table table-bordered">
-            <thead class="">
-                <tr table-head-row>
-                    <th class=""><%=l('lets_Domain_name_/_HOSTNAME')%></th>
-                    <th class=""><%=l('lets_Brief_description')%></th>
-                    <th class=""><%=l('lets_Content')%></th>
-                    <th class=""><%=l('lets_LABEL_NAMESERVERS')%></th>
-                    <th class=""><%=l('lets_LABEL_POINT')%></th>
-                    <th class=""><%=l('lets_LABEL_LECERT')%></th>
-                    <th class=""><%=l('lets_IS_IN_CERT')%></th>
-                    <th class=""><%=l('lets_CHECK')%></th>
+            <input type="text" name="NotBefore" id="inputNotBefore" class="form-control" aria-describedby="Disabled Not before" value="<%=$lets_data->{NotBefore}%>" disabled readonly>
+            %#= 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>
+
+    <table class="table table-bordered">
+        <thead>
+            <tr table-head-row>
+                <th><%= l ('lets_Domain_name_/_HOSTNAME') %></th>
+                <th><%= l ('lets_Brief_description') %></th>
+                <th class="text-center"><%= l ('lets_Content') %></th>
+                <th class="text-center"><%= l ('lets_LABEL_NAMESERVERS') %></th>
+                <th class="text-center"><%= l ('lets_LABEL_POINT') %></th>
+                <th class="text-center"><%= l ('lets_LABEL_LECERT') %></th>
+                <th class="text-center"><%= l ('lets_IS_IN_CERT') %></th>
+                <th class="text-center"><%= l ('lets_CHECK') %></th>
+            </tr>
+        </thead>
+        <tbody>
+            % my $control_data = $c->stash('DomainList');
+            % foreach my $row (@$control_data) {
+                % my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'});
+                % my $type = $c->render_to_string(inline=>$row->{'Table1-TYPE'});
+                <tr>
+                    % if  ($type eq "Domain\n"){
+                        <td><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
+                    % }
+                    % if ($type eq "Host\n") {
+                        <td><i class="bi bi-arrow-return-right"> </i><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
+                    % }
+
+                    <td ><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %></td>
+
+                    % if ($link ne "") {
+                    <td class="text-center"><a href= "<%= $link %>" class="btn btn-primary btn-sm" role="button" > <%= $checkbtn %></a></td>
+                    % } else {
+                        <td>&nbsp</td>
+                    % }
                </tr>
-            </thead>
-            <tbody class="">
-                % my $control_data = $c->stash('DomainList');
-                % foreach my $row (@$control_data) {
-                <tr class="">
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Content'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'})%></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>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%></td>
-                    <td class=""><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%></td>     
-                </tr>
-                %}
-            </tbody>
-        </table>
-        
-    
-        %# Probably finally by a submit.
-    %end    
+            % }
+        </tbody>
+    </table>
+
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep
@@ -1,130 +1,154 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
+%# 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_for "letsencryptu" => (method => 'POST') => begin
+
+    <form action="/smanager/letsencryptu" method="POST">
+
        % 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>
-    
-        <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>
-        <span class="">
-            %=l('lets_HOOKSCRIPT_STATUS')
-        </span>
-        <span class="">
-            % my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
-            % param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
-            %= select_field 'hookScript' => @hookScript_options, class => ""
-        <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_HOSTOVERRIDE_STATUS')
-        </span>
-        <span class="">
-            % my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
-            % param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
-            %= select_field 'hostOverride' => @hostOverride_options, class => ""
-        <br>
-        </span>
-        </p>
-    
-        <p>
-        <span class="">
-            %=l('lets_ACCEPT_TERMS_STATUS')
-        </span>
-        <span class="">
-            % 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 => ""
-        <br>
-        </span>
-        </p>
+        <h2 class=""><%=l('lets_Manage_letsencrypt-config_settings:') %></h2>

-        <p>
-        <span class="">
-            %=l('lets_API_STATUS')
-        </span>
-                <span class="">
-            % my @API_options = [['2' => '2']];
-            % param 'API' => $lets_data->{API} unless param 'API';
-            %= select_field 'API' => @API_options, class => ""
        <br>
-        </span>
-        </p>

-        <p>
-        <span class="">
-            %=l('lets_KEYSIZE_STATUS')
-        </span>
-        <span class="">
-            % my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
-            % param 'keysize' => $lets_data->{keysize} unless param 'keysize';
-            %= select_field 'keysize' => @keysize_options, class => ""
+        <div>
+            <%= l ('lets_CONFIG_LETSENCRYPT') %>
+        </div>
+
+        <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>
-        </span>
-        </p>

-        <p>
-        <span class="">
-            %=l('lets_CONFIGUREMODE_STATUS')
-        </span>
-        <span class="">
-            % 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 => ""
+
+        <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 => "form-select"
+            </div>
+        </div>
+
        <br>
-        </span>
-        </p>

-        <p>
-        <span class="">
-            %=l('lets_EMAIL')
-        </span>
-        <span class="">
-            % param 'email' => $lets_data->{email} unless param 'email';
-            %=email_field 'email', class => ""
-        </span>
-        </p>

-        <span class="">
-            %= submit_button l('lets_Save'), class => ""
-        </span>
+        <div class="row g-3 align-items-center">
+            <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 => "form-select"
+            </div>
+        </div>

-        %# Probably finally by a submit.
-    %end    
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <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 => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <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 => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <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 => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <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 => "form-select"
+            </div>
+        </div>
+
+        <br>
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="email_address" class="col-form-label"><%= l ('lets_EMAIL') %></label>
+
+            </div>
+            <div class="col-auto">
+                % param 'email' => $lets_data->{email} unless param 'email';
+                <input type="email" name="email" id="email_address" class="form-control" aria-describedby="Email Address" value="<%= $lets_data->{email} %>">
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = l('lets_APPLY');
+
+        <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>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep
@@ -1,42 +1,43 @@
 <div>

-    % my $retref= $c->stash("ret");
-    % my %ret;
-    % unless (length($retref)) {%ret = (ret=>"");}
-    % else {%ret = %$retref;}
+    % my $retref = $c->stash("ret");
+    % my %ret = $retref ? %$retref : (ret => "");
+    % my @vars = split(/,/, $ret{vars} // '');
+    % 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];
-
-    %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');
-    % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
-
-   % if (config->{debug} == 1) {
-    <div>
-        <%= dumper $c->current_route %>
-        <%= dumper $c->stash("ret") %>
-    </div>
+    % if ($c->app->config->{debug}) {
+        <br>
+        <pre>
+            <%= dumper { ret_data => \%ret } %>
+        </pre>
    % }

+	% if ($ret{ret} eq "") {
+		<div>
+            <%= l "ln_FIRSTPAGE_DESC" %>
+        </div>
+        % } elsif (index($ret{ret},"SUCCESS") != -1) {
+           <div>
+               <!-- <h2> Operation Status Report</h2> -->
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+            </div>
+        % } else {
+           <div class="text-danger">
+               <!-- <h2> Operation Status Report - Error</h2> -->
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+            </div>
+    % }
+
+    <br>
+
+    % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
+
+    % if (config->{debug} == 1) {
+        <div>
+            <%= dumper $c->current_route %>
+            <%= dumper $c->stash("ret") %>
+        </div>
+    % }

    <form action="/smanager/localnetworksb" method="POST">
        <div>
@@ -54,7 +55,7 @@
              <label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
            </div>
            <div class="col-auto">
-              <input type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" >
+              <input type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="Network" >
            </div>
        </div>

@@ -65,7 +66,7 @@
              <label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
            </div>
            <div class="col-auto">
-              <input type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" >
+              <input type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="Network Subnet Mask" >
            </div>
        </div>

@@ -76,17 +77,20 @@
              <label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
            </div>
            <div class="col-auto">
-              <input type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" >
+              <input type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="Network Router" >
            </div>
        </div>

        <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>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep
@@ -6,22 +6,22 @@
    % 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">

        <div>
-            <h2><%=l "ln_REMOVE_TITLE" %></h2>
+            <h2><%= l "ln_REMOVE_TITLE" %></h2>
        </div>

        <div>
-            <%=l "ln_REMOVE_DESC" %>
+            <%= l "ln_REMOVE_DESC" %>
        </div>

        <br><br>
@@ -60,29 +60,26 @@
        <br>

        % if ($deletehosts) {
-        <br>
+            <br>

-        <b>tell me if you find this!</b>
-
-        <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
-        <br>
-        <span class="">
-            <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
-        </span>
-        <span class="">
-            <%= check_box deletehost=>1, checked=>1 %>
-        </span>
-        <br><br>
+            <div>
+                <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
+            </div>
+            <br>
+            <div class="text-danger align-bottom">
+                <%= $c->l("ln_REMOVE_HOSTS_LABEL") %>&nbsp&nbsp<input type="checkbox" name="deletehost">
+            </div>
+            <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>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep
@@ -5,37 +5,31 @@
        <br>

        % my $retref = $c->stash("ret");
-        % my %ret;
-        % unless (length($retref)) {%ret = (ret=>"");}
-        % else {%ret = %$retref;}
+        % my %ret = $retref ? %$retref : (ret => "");
+        % my @vars = split(/,/, $ret{vars} // '');
+        % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;

-        <!-- So at this point the next section is only relevant it ret is not defined -->
+        % if ($c->app->config->{debug}) {
+            <br>
+            <pre>
+                <%= dumper { ret_data => \%ret } %>
+            </pre>
+        % }

-        %# my $element_count = scalar(@ret);
-
-        %# if (length $element_count == 0) {
-            % 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];
-            % my $var7 = $vars[6];
-        %# }
-
-        %if ($ret{ret} eq "") {
+        % if ($ret{ret} eq "") {
            <%= l "ln_FIRSTPAGE_DESC" %>
        % } elsif (index($ret{ret},"SUCCESS") != -1) {
+            <h2> Operation Status Report</h2>
            <br>
            <div>
-                <h2> Operation Status Report</h2>
-                <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
            </div>
        % } else {
-            <div>
+            <h2> Operation Status Report - Error</h2>
+            <br>
+            <div class="text-danger">
                <h2> Operation Status Report - Error</h2>
-                <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
+                <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
            </div>
        % }

@@ -63,7 +57,7 @@
                        <th><%= l 'ln_SUBNET_MASK' %></th>
                        <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
                        <th><%= l 'ROUTER' %></th>
-                        <th><%= l 'ACTION' %></th>
+                        <th class="text-center"><%= l 'ACTION' %></th>
                    </tr>
                </thead>
                <tbody>
@@ -90,7 +84,7 @@
                                    % </a>
                                    %};
                                % }
-                                <td><%= $c->render_to_string(inline => $actionRemove) %></td>
+                                <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
                            </tr>
                        % }
                </tbody>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep
@@ -1,95 +1,122 @@
 <div>

-    % my $retref= $c->stash("ret");
-    % my %ret;
-    % unless (length($retref)) {%ret = (ret=>"");}
-    % else {%ret = %$retref;}
-    
-    % 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];
+    % my $retref = $c->stash("ret");
+    % my %ret = $retref ? %$retref : (ret => "");
+    % my @vars = split(/,/, $ret{vars} // '');
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;

    <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>
-    %= dumper $c->current_route
-    %= dumper $c->stash("ret")
-    </p>
-    % }
-     
-    %= form_for '/portforwardingb' => (method => 'POST') => begin
-        <h2>
-        %=l "pf_CREATE_RULE"
-        </h2>
-            <p>
-                %=l "pf_SUMMARY_ADD_DESC"
-            </p><br>
-            <span class="">
-                %=l "pf_LABEL_PROTOCOL"
-            </span>
-            <span class="">
-                %=select_field  'proto'=>["TCP","UDP"]
-            </span><br><br>
-            <span class="">
-                %=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
+   % if (config->{debug} == 1) {
+    <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $c->stash("ret") %>
+    </pre>
+    % }
+
+    % if ($ret{'ret'} eq "") {
+        <div>
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
+        </div>
+    % } elsif (index($ret{ret},"SUCCESS") != -1) {
+       <div>
+           <!--<h2> Operation Status Report</h2>-->
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % } else {
+       <div class="text-danger">
+           <!--<h2> Operation Status Report - Error</h2>-->
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % }
+
+    <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>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep
@@ -1,73 +1,98 @@
 <div>

-    % my $btn = l('REMOVE');
    % my $proto = $pf_datas->{proto};
    % my $sport = $pf_datas->{sport};
    % my $dport = $pf_datas->{dport};
    % my $dhost = $pf_datas->{dhost};
    % my $cmmnt = $pf_datas->{cmmnt};
    % my $allow = $pf_datas->{allow};
-    
-   % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $c->stash("ret")
-    %= dumper %$pf_datas
-    </p>
-    % }
-     
-    %= form_for '/portforwardinge' => (method => 'POST') => begin
-        <br>
-        %= l "pf_SUMMARY_REMOVE_DESC"
-            </p><br>
-            <span class="">
-                %=l "pf_LABEL_PROTOCOL"
-            </span>
-            <span class="">
-                %=$proto
-            </span><br><br>
-            <span class="">
-                %=l "pf_LABEL_SOURCE_PORT"
-            </span>
-            <span class="">
-                %=$sport
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_HOST"
-            </span>
-            <span class="">
-                %=$dport
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_LABEL_DESTINATION_PORT"
-            </span>
-            <span class="">
-                %=$dhost
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_RULE_COMMENT"
-            </span>
-            <span class="">
-                %=$cmmnt
-            </span>
-            <br><br>
-            <span class="">
-                %=l "pf_ALLOW_HOSTS"
-            </span>
-            <span class="">
-                %=$allow
-            </span>
-            <br><br>
-        %#}
-            %= hidden_field sport=>$sport
-            %= hidden_field proto=>$proto
-            <br>
-            %= submit_button "$btn", class => ""
-            </p>

-    %end
+   % if (config->{debug} == 1) {
+        <pre>
+            <%= dumper $c->current_route %>
+            <%= dumper $c->stash("ret") %>
+            <%= dumper %$pf_datas %>
+        </pre>
+    % }
+
+    <form action="/smanager/portforwardinge" method="POST">
+
+        <br>
+        <div>
+            <%= 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 >
+                    <td>
+                        <%= l 'pf_LABEL_PROTOCOL' %>
+                    </td>
+                    <td>
+                       <%= $proto %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_LABEL_SOURCE_PORT' %>
+                    </td>
+                    <td>
+                       <%= $sport %>
+                    </td>
+                <tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_LABEL_DESTINATION_HOST' %>
+                    </td>
+                    <td>
+                       <%= $dport %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_LABEL_DESTINATION_PORT' %>
+                    </td>
+                    <td>
+                       <%= $dhost %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_RULE_COMMENT' %>
+                    </td>
+                    <td>
+                        <%= $cmmnt %>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <%= l 'pf_ALLOW_HOSTS' %>
+                    </td>
+                    <td>
+                        <%= $allow %>
+                    </td>
+                </tr>
+            </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>
+            </div>
+        </div>
+    </form>

 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep
@@ -1,120 +1,111 @@
 <div>
-    % my $btn = l('pf_CREATE_RULE');
-    %= form_for '/portforwardinga' => (method => 'POST') => begin

-    % my $retref= $c->stash("ret");
-    % my %ret;
-    % unless (length($retref)) {%ret = (ret=>"");}
-    % else {%ret = %$retref;}
- 
+    % my $retref = $c->stash("ret");
+    % my %ret = $retref ? %$retref : (ret => "");
+    % my @vars = split(/,/, $ret{vars} // '');
+    % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
+
    % my $numtcpforwards = @$tcpforwards;
    % my $numudpforwards = @$udpforwards;

-    % 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];
+    % if ($c->app->config->{debug}) {
+        <pre>
+            <%= dumper { ret_data => \%ret } %>
+        </pre>
+    % }

-    %if ($ret{ret} eq "") {
-        %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION'));
-    %} elsif (index($ret{ret},"SUCCESS") != -1) {
-        <br>
-       <div class="">
-           <!--<h2> Operation Status Report</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+    % if ($ret{ret} eq "") {
+        <div>
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
        </div>
-       %} else { 
-        <br>
-       <div class="">
-           <!--<h2> Operation Status Report - Error</h2>-->
-            %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-        </div>
-    %}
+    % } elsif (index($ret{ret},"SUCCESS") != -1) {
+
+        <div>
+           <h2> Operation Status Report</h2>
+            <%= $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->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % }

-    <p>
    <br>
-    %= submit_button "$btn", class => ""
-    </p>

+    <form action="/smanager/portforwardinga" method="POST">

-    % end   
-   
-    %   if ($empty){
+    % my $btn = l('pf_CREATE_RULE');
+
+    <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>
+
+    <br>
+
+    % if ($empty) {
            <br>
-        %=l 'pf_NO_FORWARDS'
-    %   } else {
+            <%= l 'pf_NO_FORWARDS' %>
+    % } else {
        <br>
-        %=l 'pf_SHOW_FORWARDS'
-    <br><br />
+        <%= l 'pf_SHOW_FORWARDS' %>
+        <br><br>
        <table class="table table-bordered">
-        <thead>
-        <tr>
-            <th class="">
-                %=l 'pf_LABEL_PROTOCOL'
-            </th>
-            <th class="">
-                %=l 'pf_LABEL_SOURCE_PORT'
-            </th>
-            <th class="">
-                %=l 'pf_LABEL_DESTINATION_HOST'
-            </th>
-            <th class="">
-                %=l 'pf_LABEL_DESTINATION_PORT'
-            </th>
-            <th class="">
-                %=l 'pf_ALLOW_HOSTS'
-            </th>
-            <th class="">
-                %=l 'pf_RULE_COMMENT'
-            </th>
-            <th class="" '>
-                %=l 'ACTION'
-            </th>
-        </tr>
-        </thead>
-        <tbody>
-        % my %forwards = ();
-        % $forwards{TCP} = $tcpforwards;
-        % $forwards{UDP} = $udpforwards;
-
-        % foreach my $proto (sort keys %forwards) {
-
-        %    if (@{ $forwards{$proto} }) {
-        %        foreach my $entry (@{ $forwards{$proto} }) {
+            <thead>
            <tr>
-        %           my $sport = $entry->key;
-        %           my $dhost = $entry->prop('DestHost');
-        %           my $dport = $entry->prop('DestPort') || '';
-        %           my $cmmnt  = $entry->prop('Comment') || '';
-        %           my $allow  = $entry->prop('AllowHosts') || '';
-        %=          t td => (class => "") => $proto
-        %=          t td => (class => "") => $sport
-        %=          t td => (class => "") => $dhost
-        %=          t td => (class => "") => $dport
-        %=          t td => (class => "") => $allow
-        %=          t td => (class => "") => $cmmnt
-                    <td class="">
-                        %my $remove_text = l('REMOVE');  # Localized text
-                        %my $csrf_token = "TOKEN";  # CSRF token for security
-                        %my $actionRemove = qq{
-                                                %       <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto">
-                        %   <button type='button' class="" title='$remove_text' >
-                        %       $remove_text
-                        %   </button>
-                                                %       </a>
-                        %};
-                    <%= $c->render_to_string(inline => $actionRemove) %>
-                    </td>
+                <th><%= l 'pf_LABEL_PROTOCOL' %></th>
+                <th><%= l 'pf_LABEL_SOURCE_PORT' %></th>
+                <th><%= l 'pf_LABEL_DESTINATION_HOST' %></th>
+                <th><%= l 'pf_LABEL_DESTINATION_PORT' %></th>
+                <th><%= l 'pf_ALLOW_HOSTS' %></th>
+                <th><%= l 'pf_RULE_COMMENT' %></th>
+                <th class="text-center"><%= l 'ACTION' %></th>
            </tr>
-         %       }
-         %   }
-        %}
-    %}
-    </tbody>
-    </table>
-    %= hidden_field 'trt' => $pf_datas->{trt}
- 
+            </thead>
+            <tbody>
+                % my %forwards = ();
+                % $forwards{TCP} = $tcpforwards;
+                % $forwards{UDP} = $udpforwards;
+
+                % foreach my $proto (sort keys %forwards) {
+
+                    % if (@{ $forwards{$proto} }) {
+                        % foreach my $entry (@{ $forwards{$proto} }) {
+                            <tr class="align-middle">
+                                % my $sport = $entry->key;
+                                % my $dhost = $entry->prop('DestHost');
+                                % my $dport = $entry->prop('DestPort') || '';
+                                % my $cmmnt  = $entry->prop('Comment') || '';
+                                % my $allow  = $entry->prop('AllowHosts') || '';
+                                <td><%= $proto %></td>
+                                <td><%= $sport %></td>
+                                <td><%= $dhost %></td>
+                                <td><%= $dport %></td>
+                                <td><%= $allow %></td>
+                                <td><%= $cmmnt %></td>
+                                % my $remove_text = l('REMOVE');  # Localized text
+                                % my $csrf_token = "TOKEN";  # CSRF token for security
+                                % my $actionRemove = qq{
+                                % <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto">
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %       $remove_text
+                                %   </button>
+                                % </a>
+                                % };
+
+                                <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                            </tr>
+                            % }
+                        % }
+                    % }
+                % }
+            </tbody>
+        </table>
+    <%= hidden_field 'trt' => $pf_datas->{trt} %>
+
 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep
@@ -17,7 +17,7 @@
            </div>

            <div class="col-auto">
-                <input type="text" name="pseudonymDesc" id="inputPseudonymDesc" class="form-control" aria-describedby="PseudonymDesc"  >
+                <input type="text" name="pseudonymDesc" id="inputPseudonymDesc" class="form-control" aria-describedby="Pseudonym Description"  >
            </div>
        </div>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep
@@ -22,9 +22,9 @@
    <table class="table table-bordered user-table-max-width">
        <thead>
            <tr>
-                    <th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
-                    <th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></th>
-                    <th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
+                <th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
+                <th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></th>
+                <th class="col-sm align-middle" colspan="2"><%= l 'ACTION' %></th>
                <!-- <th class="" style="display: normal;"></th> -->
            </tr>
        </thead>
@@ -57,7 +57,7 @@
                            %   $modify_text
                            %   </button>
                            % </a>
-                            %};
+                            % };
                        % }

                        % if ($removable eq 'yes')  {
@@ -70,11 +70,11 @@
                            %   $remove_text
                            %   </button>
                            % </a>
-                            %};
+                            % };
                        % }

-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>

                </tr>
            % }
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
@@ -36,7 +36,7 @@
                    <th class="col-sm"><%= $limit %></th>
                    <th class="col-sm"><%= $absolute %></th>
                    <th class="col-sm"><%= $current %></th>
-                    <th class="col-sm user-valign-center"><%= l 'ACTION' %></th>
+                    <th class="col-sm align-middle"><%= l 'ACTION' %></th>
                </tr>
            </thead>

@@ -77,7 +77,7 @@
                    % </a>
                    %};

-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
                </tr>
            %    }
            </tbody>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep
@@ -16,7 +16,7 @@

        <br><br>

-        <table class="table table-bordered user-table-max-wdith">
+        <table class="table table-bordered user-table-max-width">
            <thead>
                <tr>
                    <th class="col-sm">
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
@@ -23,11 +23,11 @@
        <table class="table table-bordered">
            <thead>
                <tr>
-                    <th><%=l 'ACCOUNT' %></th>
-                    <th><%=l 'USER_NAME' %></th>
-                    <th><%=l 'usr_VPN_CLIENT_ACCESS' %></th>
-                    <th><%=l 'usr_FORWARDING_ADDRESS' %></th>
-                    <th class="user-valign-center" colspan="5"><%= l 'ACTION' %></th>
+                    <th><%= l 'ACCOUNT' %></th>
+                    <th><%= l 'USER_NAME' %></th>
+                    <th><%= l 'usr_VPN_CLIENT_ACCESS' %></th>
+                    <th><%= l 'usr_FORWARDING_ADDRESS' %></th>
+                    <th class="text-center text-center" colspan="5"><%= l 'ACTION' %></th>
                </tr>
            </thead>
            <tbody>
@@ -136,17 +136,17 @@
                    <!-- If webmail disabled??? -->
                    % $actionroundcube = qq{
                        %<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
-                        %   <button type='button' class="btn btn-primary" title='$roundcube_text' >
+                         %   <button type='button' class="btn btn-primary" title='$roundcube_text' >
                        %       $roundcube_text
                        %   </button>
                        %</a>
                    %};

-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionLock) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
-                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionLock) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    <td class="text-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
                </tr>
                % }
            </tbody>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep
@@ -1,11 +1,11 @@
 <div>

    %   my $btn = l('usr_LOCK');
-    
+
    <form action="/smanager/useraccountsd" method="POST">

    %#= form_for '/useraccountsd' => (method => 'POST') => begin
-    
+
    <div>
    <h2><%= l 'usr_LOCK_ACCOUNT_TITLE' %></h2>
    </div>
@@ -13,12 +13,12 @@
    <div>
    Needs a text change in the Lex files
    <br>
-    <%= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} ) %> 
+    <%= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} ) %>
    </div>

    <br><br>

-    <table class="table table-bordered user-table-max-wdith">
+    <table class="table table-bordered user-table-max-width">
        <thead>
            <tr>
                <th class="col-sm">
@@ -50,8 +50,8 @@
    %= hidden_field 'trt' => $usr_datas->{trt}
    %= hidden_field 'user' => $usr_datas->{user}
    %= hidden_field 'name' => $usr_datas->{name}
-    
+
    </form>
-    %# end    
+    %# end

 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep
@@ -18,7 +18,7 @@

    <br>

-    <table class="table table-bordered user-table-max-wdith">
+    <table class="table table-bordered user-table-max-width">
        <thead>
            <tr>
                <th class="col-sm">
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep
@@ -3,75 +3,75 @@
    % my $btn = l('SAVE');
    <form action="/smanager/useraccountsd" method="POST">
    %#= form_for '/useraccountsd' => (method => 'POST') => begin
-    
+
        <div>
        <h2><%= l 'PASSWORD_RESET' %></h2>
        </div>
-        
+
        <br>
-    
+
        <div>
        <%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' %>
        </div>
-    
+
        <br>
-    
+
        <div>
        <%=l 'usr_CURRENT_SYSTEM_PASSWORD' %>
        </div>
-        
+
        <br>
-    
+
       <div class="row g-3 align-items-center">
            <div class="col-md-2">
            <input name="CurPass" id="Pass" type="password" class="form-control sme-password" placeholder="Current Password">
            </div>
-        </div>  
-    
+        </div>
+
        <br>
-    
+
        <div>
        <%= l 'usr_NEW_SYSTEM_PASSWORD' %>
        </div>
-        
+
        <br>
-    
+
         <div class="row g-3 align-items-center">
            <div class="col-md-2">
            <input name="Pass" id="Pass" type="password" class="form-control sme-password" placeholder="New Password">
            </div>
-        </div>  
-    
-    
+        </div>
+
+
        <br>
-    
-    
+
+
        <div>
        <%= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY' %>
        </div>
-    
+
        <br>
-        
+
        <div class="row g-3 align-items-center">
            <div class="col-md-2">
            <input name="PassVerify" id="PassVerify" type="password" class="form-control sme-password" placeholder="New Password verify">
            </div>
-        </div>  
-    
+        </div>
+
        <br>
-    
+
        <br>
-    
+
        <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 'trt' => $usr_datas->{trt}
        %= hidden_field 'user' => $usr_datas->{user}
        %= hidden_field 'name' => $usr_datas->{name}
-    
+
    %# end
    </form>

--- a/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep
@@ -5,28 +5,29 @@
 <div  class="card-body">

    % if (config->{debug} == 1) {
-    <p>
-        %= dumper "<pf>".$c->current_route
-        %= dumper $c->stash("ret")
-        %= dumper $c->stash("portforwarding")
+    <pre>
+        <%= dumper "<pf>".$c->current_route %>
+        <%= dumper $c->stash("ret") %>
+        <%= dumper $c->stash("portforwarding") %>
        %  my $ref = $pf_datas->{portforwarding};
-        %= dumper $ref->{TCP}->[0]."</pf>"
-    </p>
+        <%= dumper $ref->{TCP}->[0]."</pf>" %>
+    </pre>
    % }
-    
+
    <h1><%= $title%></h1>
-     %= $modul
+
+    %= $modul

    % if ($pf_datas->{trt} eq 'ADD') {
-        %= include 'partials/_pf_add'
-    %} elsif ($pf_datas->{trt} eq 'ADD1') {
-        %= include 'partials/_pf_add'
-    %} elsif ($pf_datas->{trt} eq 'DEL') {
-        %= include 'partials/_pf_del'
-    %} elsif ($pf_datas->{trt} eq 'DEL1'){
-        %= include 'partials/_pf_list'
-    %} else {
-        %= include 'partials/_pf_list'
+        <%= include 'partials/_pf_add' %>
+    % } elsif ($pf_datas->{trt} eq 'ADD1') {
+        <%= include 'partials/_pf_add' %>
+    % } elsif ($pf_datas->{trt} eq 'DEL') {
+        <%= include 'partials/_pf_del' %>
+    % } elsif ($pf_datas->{trt} eq 'DEL1'){
+        <%= include 'partials/_pf_list' %>
+    % } else {
+        <%= include 'partials/_pf_list' %>
    %}

 </div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
@@ -85,10 +85,10 @@
            <tbody>

            % foreach my $val ( @vals ) {
-            %     my ($net, $mask) = split '/', $val;
-            %     $mask = '255.255.255.255' unless ($mask);
-            %     my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
-                <tr  class="align-middle">
+                % my ($net, $mask) = split '/', $val;
+                % $mask = '255.255.255.255' unless ($mask);
+                % my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
+                <tr class="align-middle">
                    <td><%= $net %></td>
                    <td><%= $mask %></td>
                    <td><%= $numhosts %></td>
@@ -96,7 +96,7 @@
                    <input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'>
                    </td>
                </tr>
-            %    }
+            % }

            </tbody>
        </table>
--- 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 35
+%define release 40
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -11,13 +11,12 @@ URL: https://adminlte.io/
 Group: SMEserver/addon
 source: %{name}-%{version}.tar.gz

-
 Packager: Brian Read <brianr@koozali.org>
 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

@@ -29,6 +28,25 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip

 %changelog
+* Wed Jun 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-40.sme
+- Finish Letsencrypt panels
+- fix CSS and _usr files typo
+
+* 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]
+- Portforwarding panels done but require fix to module similar to 13041 above.
+
 * Thu Jun 12 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-35.sme
 - Finish backup panels
 - Finish printer panels
Author	SHA1	Message	Date
John Crisp	4d47e099a6	11.0.0-40.sme	2025-06-18 15:44:15 +02:00
John Crisp	9e05c8df28	Update Letsencrypt templates	2025-06-18 15:42:51 +02:00
John Crisp	625855f87e	Fix typo in css file	2025-06-18 15:42:19 +02:00
John Crisp	37361c8c3f	Fix typo in _usr files	2025-06-18 15:40:41 +02:00
John Crisp	322d3b7038	Start Letsencrypt panels	2025-06-17 15:33:22 +02:00
John Crisp	1baec827d3	11.0.0-38.sme More formatting	2025-06-13 19:55:48 +02:00
John Crisp	2d6deb9b37	More formatting with PortForwards	2025-06-13 19:54:20 +02:00
John Crisp	f547a5300d	More formatting with LocalNetworks	2025-06-13 19:49:28 +02:00
John Crisp	5f90b6573f	Finish PortForwarding 11.0.0-37.sme	2025-06-13 18:09:57 +02:00
John Crisp	a2c75d9a29	Finish PortForwarding 11.0.0-37.sme	2025-06-13 18:06:17 +02:00
John Crisp	76cbe17b34	Tweaks and portforwarding 11.0.0-36.sme	2025-06-13 17:19:26 +02:00
John Crisp	ffe62c9951	Portforwarding panels modified	2025-06-13 16:49:27 +02:00
John Crisp	2ccc3b18cc	Cosmetic tweaks	2025-06-13 16:48:11 +02:00
John Crisp	b356e9fabe	Cosmetic tweaks	2025-06-13 16:47:49 +02:00
John Crisp	03eacd8e36	Fix localnetworks [SME: 13041]	2025-06-13 16:47:29 +02:00
John Crisp	9963a8836f	Cosmetic tweaks	2025-06-13 16:44:09 +02:00