11.0.0-42 Finish Software updater

root/usr/share/smanager/themes/AdminLTE/public/koozali/js/datetime.js

@@ -0,0 +1,18 @@
+document.addEventListener('DOMContentLoaded', function() {
+  var select = document.getElementById('time_mode_select');
+  var ntpSection = document.getElementById('ntp_section');
+  var manualSection = document.getElementById('manual_section');
+
+  function toggleSections() {
+    if (select.value === 'dat_manually_set') {
+      ntpSection.style.display = 'none';
+      manualSection.style.display = 'block';
+    } else {
+      ntpSection.style.display = 'block';
+      manualSection.style.display = 'none';
+    }
+  }
+
+  select.addEventListener('change', toggleSections);
+  toggleSections(); // Set initial state
+});

root/usr/share/smanager/themes/AdminLTE/public/koozali/js/nutups.js

@@ -1,12 +1,16 @@
 $(document).ready(function() {
     function toggleUPSClasses() {
         var selectedOption = $('#Nutmode_select').val();
+        var upsModelValue = $('#UPS_Model_select').val().toLowerCase(); // Get the current value from UPS_Model
         $('.masterups').toggle(selectedOption === 'netserver' || selectedOption === 'standalone'); // Show/Hide masterups based on Net Server or Standalone
+        $('.secondaryups').toggle(selectedOption === 'netserver' ); // Show/Hide Secondary logins for net server
         $('.slaveups').toggle(selectedOption === 'netclient'); // Show/Hide slaveups based on Net Client
+        $('.generics').toggle(selectedOption !== 'netclient' && upsModelValue === 'genericups' );
 
         // Enable/Disable inputs based on the selected option
         $('.masterups input').prop('disabled', !(selectedOption === 'netserver' || selectedOption === 'standalone')); 
         $('.slaveups input').prop('disabled', selectedOption !== 'netclient'); 
+        $('.generics input').prop('disabled', selectedOption === 'netclient');
     }
 
     function toggleGenerics() {

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

@@ -4,6 +4,8 @@
 %= javascript 'dist/js/popper.min.js'
 %= javascript 'dist/js/adminlte.min.js'
 
+%= javascript 'koozali/js/datetime.js'
+%= javascript 'koozali/js/nutups.js'
 %= javascript 'koozali/js/flag-by-locale.js'
 %= javascript 'koozali/js/sme-password.js'
 

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

@@ -4,205 +4,216 @@
 
 <div class="card-body">
 
-    % if (config->{debug} == 0) {
+    % if (config->{debug} == 1) {
         <pre>
             <%= dumper $c->current_route %>
-            <%= dumper $dat_datas %>
+            <%= dumper $dat_data %>
         </pre>
     % }
 
-    % if ( stash 'error' ) {
+
-        <br>
+    % if ($c->stash('first')) {
-        <div class="text-danger">
+        <div>
-            %= $c->render_to_string(inline => stash 'error')
+            <%= $c->render_to_string(inline =>$c->l($c->stash('first'))) %>
         </div>
-    %}
+    % } elsif ($c->stash('success')) {
+        <div class='text-success'>
+            <%= $c->l($c->stash('success')); %>
+        </div>
+    % } elsif ($c->stash('error')) {
+        <div class='text-danger'>
+            <%= $c->l($c->stash('error')); %>
+        </div>
+    % }
+
 
     <h1><%= $title %></h1>
     <br>
-    %= $modul
+    <%= $modul %>
-    <% my $btn = l('SAVE'); %>
-
-    <form action="/smanager/datetime" method="POST">
-
-        <br>
-
-        % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus';
-        % param 'Ntpserver' => 'smeserver.pool.ntp.org' unless param 'Ntpserver';
-
-        <br>
-
-        % if ($dat_datas->{ntpstatus} eq 'disabled') {
 
 
-            <div>
+    % if ($dat_data->{ntpstatus} eq 'disabled') {
-                You can manually set your server time here (static string for testing)<br><br>
+        <div class='datetime-set-ntp'>
+            <%= l 'dat_NTP_ENABLE_DESC' %>
+        </div>
+    % } else {
+
+        % my $current_year = $dat_data->{year};
+        % my $year_options  = [ map { [ $_, $_ ] } ($current_year..($current_year+30)) ];
+        % my $month_options = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (1..12) ];
+        % my $hour_options  = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (0..23) ];
+        % my $minute_options = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (0..60) ];
+        % my $second_options = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (0..60) ];
+        % my $mode_options = [
+        %   [ $c->l('dat_ntp_server'),   'dat_ntp_server' ],
+        %   [ $c->l('dat_manually_set'), 'dat_manually_set' ]
+        % ];
+
+        <br><br>
+
+        <h2><%= $c->l('Time Configuration') %></h2>
+
+
+        <form action="/smanager/datetimeu" method="POST">
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= label_for time_mode => $c->l('Time Setting Mode:') %>
+                </div>
+                <div class="col-auto">
+                    % param 'time_mode' => $dat_data->{time_mode} unless param 'time_mode';
+                    <%= select_field time_mode => ($mode_options, id => 'time_mode_select'), class => "form-select" %>
+                </div>
             </div>
 
             <br>
 
-            <div>
-                <br>
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <%= l 'dat_CURRENT_SETTING' %>
-                    </div>
-                    <div class="col-auto">
-                        <b><%= $dat_datas->{now_string} %></b>
-                    </div>
-                </div>
-
-                <br>
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <%= l 'dat_NEW_M/D/Y' %>
-                    </div>
-                    <div class="col-auto">
-                        % param 'Month' => $dat_datas->{month} unless param 'Month';
-                        %= select_field 'Month' => $c->getMonth_list(), class => "form-select"
-                    </div>
-
-                    <div class="col-auto">
-                        % param 'Day' => $dat_datas->{day} unless param 'Day';
-                        %= text_field 'Day', size => '2', class => ""
-                    </div>
-                    <div class="col-auto">
-                        % param 'Year' => $dat_datas->{year} unless param 'Year';
-                        %= text_field 'Year', size => '4', class => ""
-                    </div>
-
-                </div>
-
-                <br>
 
 
-                <div class="row g-3 align-items-center">
+            <div id='ntp_section'>
-                    <div class="col-md-1">
+                <div>
-                        <%= l 'dat_NEW_H/M/S' %>
+                    <%= $c->l('dat_NTP_CONFIGURE_DESC') %>
-                    </div>
-                    <div class="col-auto">
-                        % param 'Hour' => $dat_datas->{hour} unless param 'Hour';
-                        %= text_field 'Hour', size => '2', class => ""
-                    </div>
-                    <div class="col-auto">
-                        % param 'Minute' => $dat_datas->{minute} unless param 'Minute';
-                        %= text_field 'Minute', size => '2', class => ""
-                    </div>
-                    <div class="col-auto">
-                        % param 'Second' => $dat_datas->{second} unless param 'Second';
-                        %= text_field 'Second', size => '2', class => ""
-                    </div>
                 </div>
 
                 <br>
 
                 <div class="row g-3 align-items-center">
                     <div class="col-md-1">
-                        <%= l 'dat_AM/PM_AND_TZ' %>
+                        <label for="inputNTPServerURL" class="col-form-label"><%=$c->l('dat_NTP_Server_URL') %></label>
                     </div>
                     <div class="col-auto">
-                        % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
+                        % my $server_check = '^([a-zA-Z0-9][a-zA-Z0-9\.\-]{0,253}[a-zA-Z0-9]|(\d{1,3}\.){3}\d{1,3})$';
-                        %= select_field 'Ampm' =>  ['AM', 'PM'], class => "form-select"
+                        % param 'ntpserver' => $dat_data->{ntpserver} unless param 'ntpserver';
-                    </div>
+                        <input type="text" name="ntpserver" id="inputNTPServerURL" class="form-control" aria-describedby="NTP Server URL" pattern="<%= $server_check %>" value="<%= $dat_data->{ntpserver} %>">
-
-                   <div class="col-auto">
-                       % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
-                       %= select_field 'Timezone' =>  $c->getZone_list(), class => "form-select"
-                   </div>
-
-                </div>
-
-                <br>
-
-                <div class="form-check">
-                    <label class="form-check-label" for="radioDefault1">
-                        <%=l 'dat_NTP_CONFIGURE_TITLE' %>
-                    </label>
-                    <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault1" value="enabled">
-                </div>
-            </div>
-
-            <%#= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %>
-
-            <%= hidden_field 'Old_ntpstatus' => 'disabled' %>
-
-        % } else {
-
-            <!-- # %  if ($dat_datas->{ntpstatus} eq 'enabled') { -->
-
-            <div>
-                <%= l 'dat_NTP_ENABLE_DESC' %>
-            </div>
-
-            <div>
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <%= l 'dat_CURRENT_SETTING' %>
-                    </div>
-                    <div class="col-auto">
-                        <b><%= $dat_datas->{now_string} %></b>
                     </div>
                 </div>
-
-                <br>
-
-                <div class="form-check">
-                    <label class="form-check-label" for="radioDefault1">
-                        <%=l 'dat_NTP_CONFIGURE_TITLE' %>
-                    </label>
-                    <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault1" value="enabled">
-                </div>
-                <br>
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <label for="inputNTPServer" class="col-form-label"><%= l 'dat_NTP_SERVER' %></label>
-                    </div>
-                    <div class="col-auto">
-                        <input type="text" name="Ntpserver" id="inputNTPServer" class="form-control" aria-describedby="NTP Server" value="<%= $dat_datas->{ntpserver} %>">
-                    </div>
-                </div>
-
             </div>
 
             <br>
 
-            <div>
+            <div id='manual_section'>
-                <%= l 'dat_NTP_DISABLE_DESC' %>
+
-            </div>
+                <div>
+                    <%= $c->l('dat_NTP_DISABLE_DESC') %>
+                </div>
+
+                <br>
+
+                <div>
+                    <h3><%= $c->l('dat_set_manually') %></h3>
+                </div>
+
+                <br>
+
+                <div class="row g-3 align-items-center">
+
+                    <div class="col-md-1">
+                        <legend><%= $c->l('Date') %><legend>
+                    </div>
+
+                    <div class="col-auto">
+                        <%= $c->l('Year:') %>
+                    </div>
+
+                    <div class="col-auto">
+                        % param 'year' => ($dat_data->{year}) unless param 'year';
+                        <%= select_field year => ($year_options, id => 'year'), required => 'required', class=> "form-select" %>
+                    </div>
+
+                    <div class="col-auto">
+                        <%= $c->l('Month:') %>
+                    </div>
+
+                    <div class="col-auto">
+                        % param 'month' => ($dat_data->{month}) unless param 'month';
+                        <%= select_field month => ($month_options, id => 'month'), required => 'required', class=> "form-select" %>
+                    </div>
+
+                    <div class="col-auto">
+                        <label for="inputDay" class="col-form-label"><%= $c->l('Day:') %></label>
+                    </div>
+
+                    <div class="col-auto">
+                        % param 'day' => ($dat_data->{day}) unless param 'day';
+                        <input type="text" name="day" id="inputDay" class="form-control" aria-describedby="Day" placeholder="<%= $dat_data->{day} %>" pattern="^(0[1-9]|[12][0-9]|3[01])$" size="2" maxlength="2" required="required" inputmode = "numeric" autcomplete="off">
+                    </div>
+
+                </div>
+
+<br>
+
+                <div class="row g-3 align-items-center">
+
+                    <div class="col-md-1">
+                        <legend><%= $c->l('Time') %></legend>
+                    </div>
+
+                    <div class="col-auto">
+                        <%= $c->l('Hour:') %>
+                    </div>
+                    <div class="col-auto">
+                        % param 'hour' => ($dat_data->{hour}) unless param 'hour';
+                        %= select_field hour => ($hour_options, id => 'hour'), required => 'required', class=> "form-select"
+                    </div>
+
+                    <div class="col-auto">
+                        %= label_for minute => $c->l('Minute:')
+                    </div>
+                    <div class="col-auto">
+                        % param 'minute' => ($dat_data->{minute}) unless param 'minute';
+                        %= select_field minute => ($minute_options, id => 'minute'), required => 'required', class=> "form-select", inputmode => 'numeric'
+
+                        %#= text_field minute => id => 'minute', size => 2, maxlength => 2, placeholder => 'MM', pattern => '^[0-5][0-9]$', title => 'Minute (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
+                    </div>
+
+                    <div class="col-auto">
+                        %= label_for second => $c->l('Second:')
+                    </div>
+                    <div class="col-auto">
+                        % param 'second' => ($dat_data->{second}) unless param 'second';
+                        %= select_field minute => ($second_options, id => 'minute'), required => 'required', class=> "form-select" , inputmode => 'numeric'
+
+                    </div>
+
+                </div>
+
+
+
+
+
 
             <br>
 
-            <div class="form-check">
+            <div class="row g-3 align-items-center">
-              <label class="form-check-label" for="radioDefault2">
+                <div class="col-md-1">
-                <%= l 'dat_NTP_DISABLE_TITLE' %>
+                    <%= l 'dat_TZ' %>
-              </label>
+                </div>
-              <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault2" value="disabled">
+                <div class="col-auto">
+                    % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
+                    <%= select_field 'Timezone' =>  $c->getZone_list(), class => "form-select" %>
+                </div>
             </div>
 
-
+        </div>
-            <%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %>
-            <%#= hidden_field 'Old_ntpstatus' => 'disabled' %>
-
-        % }
-
-
 
         <br>
 
+        <%= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus}; %>
+        <%= hidden_field 'trt' => $dat_data->{trt}; %>
 
-
+        <% my $btn = l('SAVE'); %>
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
-
-
     </form>
 
+    % }
+
 </div>
-%end
+% end
+1;

root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep.old

@@ -1,172 +0,0 @@
-% layout 'AdminLTE', title => "Sme server 2 - datetime";
-
-% content_for 'module' => begin
-
-<div class="card-body">
-
-    % if (config->{debug} == 1) {
-        <pre>
-            <%= dumper $c->current_route %>
-            <%= dumper $dat_datas %>
-        </pre>
-    % }
-
-    % if ( stash 'error' ) {
-        <br>
-        <div class="text-danger">
-            %= $c->render_to_string(inline => stash 'error')
-        </div>
-    %}
-
-    <h1><%= $title %></h1>
-    <br>
-    %= $modul
-    <% my $btn = l('SAVE'); %>
-
-    <form action="/smanager/datetime" method="POST">
-
-        <br>
-
-        % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus';
-
-        <div class="form-check">
-            <label class="form-check-label" for="radioDefault1">
-                <%=l 'dat_NTP_CONFIGURE_TITLE' %>
-            </label>
-            <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault1">
-        </div>
-
-        <br>
-
-        <%= radio_button Ntpstatus => 'enabled' %>
-        <%=l 'dat_NTP_CONFIGURE_TITLE' %>
-
-        <br>
-
-        % if ($dat_datas->{ntpstatus} eq 'disabled') {
-
-            <div>
-                Status disabled
-                <%= l 'dat_NTP_ENABLE_DESC' %>
-                <br>
-            </div>
-
-        % } else {
-
-            <div>
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <%= l 'dat_CURRENT_SETTING' %>
-                    </div>
-                    <div class="col-auto">
-                        <b><%= $dat_datas->{now_string} %></b>
-                    </div>
-                </div>
-
-                <br>
-
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <label for="inputNTPServer" class="col-form-label"><%= l 'dat_NTP_SERVER' %></label>
-                    </div>
-                    <div class="col-auto">
-                        <input type="text" name="Ntpserver" id="inputNTPServer" class="form-control" aria-describedby="NTP Server" value="<%= $dat_datas->{ntpserver} %>">
-                    </div>
-                </div>
-
-            </div>
-        % }
-
-
-        <%= radio_button Ntpstatus => 'disabled' %>
-        <%= l 'dat_NTP_DISABLE_TITLE' %>
-
-        <div class="form-check">
-          <label class="form-check-label" for="radioDefault2">
-            <%= l 'dat_NTP_DISABLE_TITLE' %>
-          </label>
-          <input class="form-check-input" type="radio" name="Ntpstatus" id="radioDefault2" value="disabled">
-        </div>
-
-
-
-
-        % if ($dat_datas->{ntpstatus} eq 'enabled') {
-
-            <br><br>
-            <div>
-                <%= l 'dat_NTP_DISABLE_DESC' %>
-            </div>
-
-        % } else {
-
-        <div>
-            <br>
-
-            <%= l 'dat_CURRENT_SETTING' %>
-
-            <b><%= $dat_datas->{now_string} %></b>
-
-            <br>
-            <span class="">
-            <%= l 'dat_NEW_M/D/Y' %>
-            </span>
-            <span class="">
-            % param 'Month' => $dat_datas->{month} unless param 'Month';
-            %= select_field 'Month' => $c->getMonth_list(), class => ""
-            </span>
-            <span class="">
-            % param 'Day' => $dat_datas->{day} unless param 'Day';
-            %= text_field 'Day', size => '2', class => ""
-            </span>
-            <span class="">
-            % param 'Year' => $dat_datas->{year} unless param 'Year';
-            %= text_field 'Year', size => '4', class => ""
-            </span>
-            <br>
-            <span class="">
-            <%= l 'dat_NEW_H/M/S' %>
-            </span>
-            <span class="">
-            % param 'Hour' => $dat_datas->{hour} unless param 'Hour';
-            %= text_field 'Hour', size => '2', class => ""
-            </span>
-            <span class="">
-            % param 'Minute' => $dat_datas->{minute} unless param 'Minute';
-            %= text_field 'Minute', size => '2', class => ""
-            </span>
-            <span class="">
-            % param 'Second' => $dat_datas->{second} unless param 'Second';
-            %= text_field 'Second', size => '2', class => ""
-            </span>
-            <br>
-            <span class="">
-            <%= l 'dat_AM/PM_AND_TZ' %>
-            </span>
-            <span class="">
-            % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
-            %= select_field 'Ampm' =>  ['AM', 'PM'], class => ""
-            </span>
-            <span class="">
-            % param 'Timezone' => $c->getTimezone() unless param 'Timezone';
-            %= select_field 'Timezone' =>  $c->getZone_list(), class => ""
-            </span>
-            </p>
-        </div>
-        % }
-
-        <br>
-        <%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %>
-
-        <div class="row g-3 align-items-center">
-            <div class="col-md-2">
-                <button type="submit" class="btn btn-primary"><%= $btn %></button>
-            </div>
-        </div>
-
-
-    </form>
-
-</div>
-%end

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/nutups.html.ep

@@ -9,52 +9,59 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <pre>
+        <pre>
-        %= dumper $c->current_route
+            %= dumper $c->current_route
-        %= dumper $nut_data->{trt}
+            %= dumper $nut_data->{trt}
-    </pre>
+        </pre>
     % }
 
     <h1><%=$title%></h1>
 
     % if ( stash('modul')) {
-    %= $c->render_to_string(inline => stash('modul') );
+        <%= $c->render_to_string(inline => stash('modul') ); %>
     % }
 
     %if ($c->stash('first')) {
         <br><p>
-        %=$c->render_to_string(inline =>$c->l($c->stash('first')))
+            <%=$c->render_to_string(inline =>$c->l($c->stash('first'))) %>
         </p>
 
     %} elsif ($c->stash('success')) {
-        <div class="">
+        <div class="text-success">
-           <h2><%=$c->l('nut_Status_Report') %></h2><p>
+           <h2><%=$c->l('nut_Status_Report') %></h2>
-            %= $c->l($c->stash('success'));
+           <div>
-            </p>
+                <%= $c->l($c->stash('success')); %>
+            </div>
         </div>
-        <br />
+        <br>
 
     %} elsif ($c->stash('error')) {
-       <div class="">
+       <div class="text-danger">
-           <h2><%=$c->l('nut_Error_Status_Report') %></h2><p>
+           <h2><%=$c->l('nut_Error_Status_Report') %></h2>
-            %= $c->l($c->stash('error'));
+           <div>
-            </p>
+                <%= $c->l($c->stash('error')); %>
+            </div>
         </div>
-        <br />
+        <br>
     %}
 
     %#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'
 
+    <br>
+
     % if ($nut_data->{trt} eq "STATUS") {
-        %= include 'partials/_nut_STATUS'
+        <%= include 'partials/_nut_STATUS' %>
     %}
 
+    <br>
+
     % if ($nut_data->{trt} eq "CONFIG") {
-        %= include 'partials/_nut_CONFIG'
-    %}
 
+        <%= include 'partials/_nut_CONFIG' %>
+    %}
 
 
 </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'
 
 
-        </div>
+    <!-- </form>  -->
 
 
-        <h2 class=""><%=l('lets_For_this_Server')%></h2>
+        <br><br>
+
+        <h2><%=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>
-        </span>
-        </p>
 
-        <p>
+            <div class="row g-3 align-items-center">
-        <span class="">
+                <div class="col-md-1">
-            %=l('lets_External_Interface_IP')
+                    <%= l ('lets_Internal_IP') %>
-        </span>
+                </div>
-        <span class="">
+                <div class="col-auto">
-            % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
+                    % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
-            %= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
+                    %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
-        <br>
+                </div>
-        </span>
+            </div>
-        </p>
 
-        <p>
+            <br>
-        <span class="">
-            %=l('lets_Internet_IP')
-        </span>
-        <span class="">
-            % 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>
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= 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'
+                </div>
+            </div>
 
-        <p>
+            <br>
-        <span class="">
-            %=l('lets_Issuer')
-        </span>
-        <span class="">
-            % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
-            %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
-        <br>
-        </span>
-        </p>
 
-        <p>
+            <div class="row g-3 align-items-center">
-        <span class="">
+                <div class="col-md-1">
-            %=l('lets_Expiry')
+                    <%= l ('lets_Internet_IP') %>
-        </span>
+                </div>
-        <span class="">
+                <div class="col-auto">
-            % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
+                    % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
-            %= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
+                    %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
-        <br>
+                </div>
-        </span>
+            </div>
-        </p>
 
-        <p>
+            <br><br>
-        <span class="">
-            %=l('lets_Not_Before')
-        </span>
-                <span class="">
-            % 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>
+            <h2><%=l('lets_Current_certificate_details') %></h2>
 
-        <br />
+            <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>
-                </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>
 
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                <%= l ('lets_Issuer') %>
+                </div>
+                <div class="col-auto">
+                    % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
+                    %= 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">
+                    <%= 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'
+                </div>
+            </div>
+
+            <br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= 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>
+
+            % $linkbtn = l 'lets_CHECK';
+
+            <table class="table table-bordered">
+                <thead>
+                    <tr table-head-row>
+                        <th><%= l ('lets_Domain_name_/_HOSTNAME') %></th>
+                        <th><%= l ('lets_Brief_description') %></th>
+                        <th><%= l ('lets_Content') %></th>
+                        <th><%= l ('lets_LABEL_NAMESERVERS') %></th>
+                        <th><%= l ('lets_LABEL_POINT') %></th>
+                        <th><%= l ('lets_LABEL_LECERT') %></th>
+                        <th><%= l ('lets_IS_IN_CERT') %></th>
+                        <th><%= 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><%=$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,151 @@
 %# 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">
-            % my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
+            <div class="col-md-1">
-            % param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
+                <%= l ('lets_SERVICE_STATUS') %>
-            %= select_field 'hookScript' => @hookScript_options, class => ""
+            </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="">
+        <div class="row g-3 align-items-center">
-            %=l('lets_HOSTOVERRIDE_STATUS')
+            <div class="col-md-1">
-        </span>
+                <%= l ('lets_HOOKSCRIPT_STATUS') %>
-        <span class="">
+            </div>
-            % my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
+            <div class="col-auto">
-            % param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
+                % my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
-            %= select_field 'hostOverride' => @hostOverride_options, class => ""
+                % param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
+                %= select_field 'hookScript' => @hookScript_options, class => "form-select"
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
 
-        <p>
+
-        <span class="">
+        <div class="row g-3 align-items-center">
-            %=l('lets_ACCEPT_TERMS_STATUS')
+            <div class="col-md-1">
-        </span>
+                <%= l ('lets_HOSTOVERRIDE_STATUS') %>
-        <span class="">
+            </div>
-            % my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
+            <div class="col-auto">
-            % param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
+                % my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
-            %= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => ""
+                % param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
+                %= select_field 'hostOverride' => @hostOverride_options, class => "form-select"
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
 
-        <p>
+
-        <span class="">
+        <div class="row g-3 align-items-center">
-            %=l('lets_API_STATUS')
+            <div class="col-md-1">
-        </span>
+                <%= l ('lets_ACCEPT_TERMS_STATUS') %>
-                <span class="">
+            </div>
-            % my @API_options = [['2' => '2']];
+            <div class="col-auto">
-            % param 'API' => $lets_data->{API} unless param 'API';
+                % my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
-            %= select_field 'API' => @API_options, class => ""
+                % param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
+                %= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => "form-select"
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
 
-        <p>
+
-        <span class="">
+        <div class="row g-3 align-items-center">
-            %=l('lets_KEYSIZE_STATUS')
+            <div class="col-md-1">
-        </span>
+                <%= l ('lets_API_STATUS') %>
-        <span class="">
+            </div>
-            % my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
+            <div class="col-auto">
-            % param 'keysize' => $lets_data->{keysize} unless param 'keysize';
+                % my @API_options = [['2' => '2']];
-            %= select_field 'keysize' => @keysize_options, class => ""
+                % param 'API' => $lets_data->{API} unless param 'API';
+                %= select_field 'API' => @API_options, class => "form-select"
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
 
-        <p>
+
-        <span class="">
+        <div class="row g-3 align-items-center">
-            %=l('lets_CONFIGUREMODE_STATUS')
+            <div class="col-md-1">
-        </span>
+                <%= l ('lets_KEYSIZE_STATUS') %>
-        <span class="">
+            </div>
-            % my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
+            <div class="col-auto">
-            % param 'configure' => $lets_data->{configure} unless param 'configure';
+                % my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
-            %= select_field 'configure' => @configure_options, class => ""
+                % param 'keysize' => $lets_data->{keysize} unless param 'keysize';
+                %= select_field 'keysize' => @keysize_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="">
+        <div class="row g-3 align-items-center">
-            %= submit_button l('lets_Save'), class => ""
+            <div class="col-md-1">
-        </span>
+                <%= 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>
 
-        %# Probably finally by a submit.
+        <br>
-    %end    
+
+
+        <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>

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

@@ -13,31 +13,30 @@
     % }
 
 	% if ($ret{ret} eq "") {
-		<br>
+		<div>
-        <%= l "ln_FIRSTPAGE_DESC" %>
+            <%= 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) {
+    % if (config->{debug} == 1) {
-    <div>
+        <div>
-        <%= dumper $c->current_route %>
+            <%= dumper $c->current_route %>
-        <%= dumper $c->stash("ret") %>
+            <%= dumper $c->stash("ret") %>
-    </div>
+        </div>
     % }
 
     <form action="/smanager/localnetworksb" method="POST">
@@ -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>
-            <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
             <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/_nut_CONFIG.html.ep

@@ -2,162 +2,205 @@
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
 %#
 <div>
+
+<!-- reetp This needs fixing -->
+<!--
     <script>
         window.onload = function() {
         SelectInput();
     };
-
     </script>
-    % if (config->{debug} == 1) {
+-->
+
+    % if (config->{debug} == 0) {
         <pre>
             %= dumper $nut_data
         </pre>
     % }
 
-    % my $btn = l('nut_APPLY');
+
-    %= form_for "nutupsu" => (method => 'POST') => begin
+    <form action="/smanager/nutupsu" method="POST">
-        % param 'trt' => $nut_data->{trt} unless param 'trt';
+
-        %= hidden_field 'trt' => $nut_data->{trt}
         %# Inputs etc in here.
 
-        <h2 class=""><%=l('nut_Manage_Nutups-config_settings:')%></h2>
+        <!-- reetp - autocomplete="off" ? -->
 
-        <p>
+        <h2><%=l('nut_Manage_Nutups-config_settings:')%></h2>
-        <span class="">
+
-            %=l('nut_Nut_status')
+        <br>
-        </span>
+
-        <span class="">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l ('nut_Nut_status') %>
+            </div>
+            <div class="col-auto">
             %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
             %# param 'status' => $nut_data->{status} unless param 'status';
 
-            % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
+                % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
-            %= select_field 'status' => @status_options, class => "", id => ""
+                <%= select_field 'status' => @status_options, class => "form-select"  %>
+            </div>
+        </div>
+
         <br>
-        </span>
-        </p>
 
-        <p>
+        <div class="row g-3 align-items-center">
-        <span class="">
+            <div class="col-md-1">
-            %=l('nut_Nut_mode')
+                <%= l ('nut_Nut_mode') %>
-        </span>
+            </div>
-        <span class="">
+            <div class="col-auto">
-            % my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
+                % my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
-            % param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
+                % param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
-            %= select_field 'Nutmode' => @Nutmode_options, class => "", id => ""
+                <%= select_field 'Nutmode' => @Nutmode_options, class => "form-select" %>
+            </div>
+        </div>
+
+        <br><br>
+
+        <h2><%=l('nut_if_Net_Server')%></h2>
+
         <br>
-        </span>
-        </p>
 
-        <div class="">
+        <div class="row g-3 align-items-center">
-            <h2 class=""><%=l('nut_if_Net_Server')%></h2>
+            <div class="col-md-1">
-        
+                <label for="inputMasterUPSName" class="col-form-label"><%= l ('nut_MasterUPS_UPSNAME@IP') %></label>
-            <p>
+            </div>
-            <span class="">
+            <div class="col-auto">
-                %=l('nut_MasterUPS_UPSNAME@IP')
-            </span>
-            <span class="">
                 % param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
-                %= text_field 'MasterUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'ups@localhost'
+                <input type="text" name="MasterUPS_Name" pattern=".*" size="50" id="inputMasterUPSName" class="form-control" aria-describedby="Master UPS Name" placeholder="ups@localhost" value="<%= $nut_data->{MasterUPS_Name} %>" >
-            <br>
+            </div>
-            </span>
+        </div>
-            </p>
 
-            <p>
+        <br>
-            <span class="">
+
-                %=l('nut_MasterUPS_Password')
+        <div class="row g-3 align-items-center">
-            </span>
+            <div class="col-md-1">
-            <span class="">
+                <label for="MasterUPSPassword" class="col-form-label"><%= l ('nut_MasterUPS_Password') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password';
-                %=password_field 'MasterUPS_Password', class => ""
+                <input type="password" name="MasterUPS_Password" id="MasterUPSPassword" class="form-control" aria-describedby="Master UPS Password" value="<%= $nut_data->{MasterUPS_Password} %>">
-            </span>
+            </div>
-            </p>
+            <!-- reetp fix toggle password -->
+            <!-- <div class="col-auto">
+                <span id="togglePassword" class="bi bi-eye"></span>
+            </div>
+            -->
+        </div>
 
-            <p>
+        <br>
-            <span class="">
+
-                %=l('nut_UPS_Model')
+        <div class="row g-3 align-items-center">
-            </span>
+            <div class="col-md-1">
-            <span class="">
+                <%= l ('nut_UPS_Model') %>
+            </div>
+            <div class="col-auto">
                 % my @UPS_Model_options = $c->get_model_options();
                 % param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model';
-                %= select_field 'UPS_Model' => \@UPS_Model_options, class => "", id => ""
+                %= select_field 'UPS_Model' => \@UPS_Model_options, class => "form-select"
-            <br>
+            </div>
-            </span></p>
+        </div>
 
-            <p><span class="">
+        <br>
-                %=l('nut_UPS_Device')
+
-            </span><span class="">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputUPSDevice" class="col-form-label"><%= l ('nut_UPS_Device') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device';
-                %= text_field 'UPS_Device', size => '50', class => "" , pattern=>'.*' , placeholder=>'auto (for usb)'
+                <input type="text" name="UPS_Device" pattern=".*" size="50" id="inputUPSDevice" class="form-control" aria-describedby="UPS Device" placeholder="auto (for usb)" value="<%= $nut_data->{UPS_Device} %>" >
-            <br></span></p>
+            </div>
         </div>
 
-        <div class="">
+        <br><br>
-            <h2 class=""><%=l('nut_if_Net_Client')%></h2>
+
-            <p>
+        <h2><%=l('nut_if_Net_Client')%></h2>
-            <span class="">
+
-                %=l('nut_SlaveUPS_UPSNAME@IP')
+        <br>
-            </span>
+
-            <span class="">
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputSlaveUPSDevice" class="col-form-label"><%= l ('nut_SlaveUPS_UPSNAME@IP') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name';
-                %= text_field 'SlaveUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'upsname@IP'
+                <input type="text" name="SlaveUPS_Name" pattern=".*" size="50" id="inputSlaveUPSDevice" class="form-control" aria-describedby="Slave UPS Name" placeholder="upsname@IP" value="<%= $nut_data->{SlaveUPS_Name} %>" >
-            <br>
+            </div>
-            </span>
-            </p>
-        
-            <p>
-            <span class="">
-                %=l('nut_SlaveUPS_Password')
-            </span>
-            <span class="">
-                % param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password';
-                %=password_field 'SlaveUPS_Password', class => ""
-            </span>
-            </p>
         </div>
 
-        <div class="">
+        <br>
-`           <h2 class=""><%=l('nut_if_genericups')%></h2>
+
-            <p>
+        <div class="row g-3 align-items-center">
-            <span class="">
+            <div class="col-md-1">
-                %=l('nut_UPS_Generic_Type')
+                <label for="SlaveUPSPassword" class="col-form-label"><%= l ('nut_SlaveUPS_Password') %></label>
-            </span>
+            </div>
-            <span class="">
+            <div class="col-auto">
+                % param 'SlaveUPS_Pass' => $nut_data->{SlaveUPS_Pass} unless param 'SlaveUPS_Pass';
+                <input type="password" name="SlaveUPS_Pass" id="SlaveUPSPassword" class="form-control" aria-describedby="Slave UPS Password" value="<%= $nut_data->{SlaveUPS_Pass} %>">
+            </div>
+            <!-- reetp fix toggle password -->
+            <!-- <div class="col-auto">
+                <span id="togglePassword" class="bi bi-eye"></span>
+            </div>
+            -->
+        </div>
+
+        <br><br>
+
+        <h2><%=l('nut_if_genericups')%></h2>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <label for="inputUPSGenericType" class="col-form-label"><%= l ('nut_UPS_Generic_Type') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
-                %= text_field 'UPS_gen_Type', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Type'
+                <input type="text" name="UPS_gen_Type" pattern=".*" size="50" id="inputUPSGenericType" class="form-control" aria-describedby="UPS Generic Type" placeholder="UPS_Gen_Type" value="<%= $nut_data->{UPS_gen_Type} %>" >
-            <br>
+            </div>
-            </span>
+        </div>
-            </p>
 
-            <p>
+        <br>
-            <span class="">
+
-                %=l('nut_UPS_Generic_Manufacturer')
+        <div class="row g-3 align-items-center">
-            </span>
+            <div class="col-md-1">
-            <span class="">
+                <label for="inputUPSManufacturer" class="col-form-label"><%= l ('nut_UPS_Generic_Manufacturer') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
-                %= text_field 'UPS_gen_Mfr', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Mfr'
+                <input type="text" name="UPS_gen_Mfr" pattern=".*" size="50" id="inputUPSManufacturer" class="form-control" aria-describedby="UPS Generic Manufacturer" placeholder="UPS_sen_Mfr" value="<%= $nut_data->{UPS_gen_Mfr} %>" >
-            <br>
+            </div>
-            </span>
+        </div>
-            </p>
 
-            <p>
+        <br>
-            <span class="">
+
-                %=l('nut_UPS_Generic_Model')
+        <div class="row g-3 align-items-center">
-            </span>
+            <div class="col-md-1">
-            <span class="">
+                <label for="inputUPSModel" class="col-form-label"><%= l ('nut_UPS_Generic_Model') %></label>
+            </div>
+            <div class="col-auto">
                 % param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
-                %= text_field 'UPS_gen_Model', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Model'
+                <input type="text" name="UPS_gen_Model" pattern=".*" size="50" id="inputUPSModel" class="form-control" aria-describedby="UPS Generic Model" placeholder="UPS_gen_Model" value="<%= $nut_data->{UPS_gen_Model} %>" >
-            <br>
+            </div>
-            </span>
+        </div>
-            </p>
-`       </div>
 
-        <span class="">
+        <br>
-            %= submit_button l('nut_Save'), class => ""
-        </span>
 
+        % param 'trt' => $nut_data->{trt} unless param 'trt';
+        <%= hidden_field 'trt' => $nut_data->{trt} %>
 
+        % my $btn = l ('nut_Save');
 
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
 
         %# Probably finally by a submit.
-    %end    
+    </form>
+    <br>
+
 </div>

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

@@ -2,12 +2,15 @@
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
 %#
 <div>
+
+<!--
     <script>
         window.onload = function() {
         SelectInput();
     };
-    
     </script>
+-->
+
     % if (config->{debug} == 1) {
         <pre>
             %= dumper $nut_data
@@ -32,11 +35,11 @@
         </div>
 
 
-        <h2 class=""><%=l('nut_Status_of_the_controlled_UPS')%></h2>
+        <h2><%= l ('nut_Status_of_the_controlled_UPS')%></h2>
 
-        <p class="">
+        <div >
-            %=l('nut_Descriptive_paragraph')
+            <%= l ('nut_Descriptive_paragraph') %>
-        </p>
+        </div>
 
 <!--
         <span class="">

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

@@ -1,45 +1,107 @@
 <h1>UPS Status</h1>
+
 %= stylesheet '/css/nut_ups-status-page.css'
+
 <div class="container-md">
-        <div>
+    <div>
-            <h2>Device Information</h2>
+        <h2>Device Information</h2>
-            <table class="table table-bordered">
+        <table class="table table-bordered">
-                <tr><td>Manufacturer:</td><td><%= $nut_data->{'ups_data'}->{'device.mfr'} %></td></tr>
+            <tr>
-                <tr><td>Model:</td><td><%= $nut_data->{'ups_data'}->{'device.model'} %></td></tr>
+                <td>Manufacturer:</td>
-                <tr><td>Serial:</td><td><%= $nut_data->{'ups_data'}->{'device.serial'} %></td></tr>
+                <td><%= $nut_data->{'ups_data'}->{'device.mfr'} %></td>
-                <tr><td>Type:</td><td><%= $nut_data->{'ups_data'}->{'device.type'} %></td></tr>
+            </tr>
-            </table>
+            <tr>
-        </div>
+                <td>Model:</td>
+                <td><%= $nut_data->{'ups_data'}->{'device.model'} %></td>
+            </tr>
+            <tr>
+                <td>Serial:</td>
+                <td><%= $nut_data->{'ups_data'}->{'device.serial'} %></td>
+            </tr>
+            <tr>
+                <td>Type:</td>
+                <td><%= $nut_data->{'ups_data'}->{'device.type'} %></td>
+            </tr>
+        </table>
+    </div>
 
-        <div>
+    <br>
-            <h2>Battery Status</h2>
-            <table class="table table-bordered">
-                <tr><td>Charge:</td><td><%= $nut_data->{'ups_data'}->{'battery.charge'} %>%</td></tr>
-                <tr><td>Runtime:</td><td><%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes</td></tr>
-                <tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V</td></tr>
-                <tr><td>Type:</td><td><%= $nut_data->{'ups_data'}->{'battery.type'} %></td></tr>
-            </table>
-        </div>
 
-        <div>
+    <div>
-            <h2>Input Power</h2>
+        <h2>Battery Status</h2>
-            <table class="table table-bordered">
+        <table class="table table-bordered">
-                <tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'input.voltage'} %>V</td></tr>
+            <tr>
-                <tr><td>Nominal Voltage:</td><td><%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V</td></tr>
+                <td>Charge:</td>
-                <tr><td>Sensitivity:</td><td><%= $nut_data->{'ups_data'}->{'input.sensitivity'} %></td></tr>
+                <td><%= $nut_data->{'ups_data'}->{'battery.charge'} %>%</td>
-                <tr><td>Transfer High:</td><td><%= $nut_data->{'ups_data'}->{'input.transfer.high'} %>V</td></tr>
+            </tr>
-                <tr><td>Transfer Low:</td><td><%= $nut_data->{'ups_data'}->{'input.transfer.low'} %>V</td></tr>
+            <tr>
-            </table>
+                <td>Runtime:</td>
-        </div>
+                <td><%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes</td>
+            </tr>
+            <tr>
+                <td>Voltage:</td>
+                <td><%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V</td>
+            </tr>
+            <tr>
+                <td>Type:</td>
+                <td><%= $nut_data->{'ups_data'}->{'battery.type'} %></td>
+            </tr>
+        </table>
+    </div>
 
-        <div>
+    <br>
-            <h2>UPS Status</h2>
+
-            <table class="table table-bordered">
+    <div>
-                <tr><td>Status:</td><td><%= $nut_data->{'ups_data'}->{'ups.status'} %></td></tr>
+        <h2>Input Power</h2>
-                <tr><td>Load:</td><td><%= $nut_data->{'ups_data'}->{'ups.load'} %>%</td></tr>
+        <table class="table table-bordered">
-                <tr><td>Beeper:</td><td><%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %></td></tr>
+            <tr>
-                <tr><td>Firmware:</td><td><%= $nut_data->{'ups_data'}->{'ups.firmware'} %></td></tr>
+                <td>Voltage:</td>
-                <tr><td>Test Result:</td><td><%= $nut_data->{'ups_data'}->{'ups.test.result'} %></td></tr>
+                <td><%= $nut_data->{'ups_data'}->{'input.voltage'} %>V</td>
-            </table>
+            </tr>
-        </div>
+            <tr>
+                <td>Nominal Voltage:</td>
+                <td><%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V</td>
+            </tr>
+            <tr>
+                <td>Sensitivity:</td>
+                <td><%= $nut_data->{'ups_data'}->{'input.sensitivity'} %></td>
+            </tr>
+            <tr>
+                <td>Transfer High:</td>
+                <td><%= $nut_data->{'ups_data'}->{'input.transfer.high'} %>V</td>
+            </tr>
+            <tr>
+                <td>Transfer Low:</td>
+                <td><%= $nut_data->{'ups_data'}->{'input.transfer.low'} %>V</td>
+            </tr>
+        </table>
+    </div>
+
+    <br>
+
+    <div>
+        <h2>UPS Status</h2>
+        <table class="table table-bordered">
+            <tr>
+                <td>Status:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.status'} %></td>
+            </tr>
+            <tr>
+                <td>Load:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.load'} %>%</td>
+            </tr>
+            <tr>
+                <td>Beeper:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %></td>
+            </tr>
+            <tr>
+                <td>Firmware:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.firmware'} %></td>
+            </tr>
+            <tr>
+                <td>Test Result:</td>
+                <td><%= $nut_data->{'ups_data'}->{'ups.test.result'} %></td>
+            </tr>
+        </table>
+    </div>
 </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 "") {
-        <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
+        <div>
-    % } elsif (index($ret{ret},"SUCCESS") != -1) {
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
-        <br>
-       <div>
-           <h2> Operation Status Report</h2>
-            <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
         </div>
-       % } else {
+    % } 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">
+        <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,16 +46,16 @@
 
     </form>
 
+    <br>
 
-
+    % if ($empty) {
-    % if ($empty){
             <br>
             <%= l 'pf_NO_FORWARDS' %>
     % } else {
-            <br>
+        <br>
-            <%= l 'pf_SHOW_FORWARDS' %>
+        <%= l 'pf_SHOW_FORWARDS' %>
-            <br><br>
+        <br><br>
-            <table class="table table-bordered">
+        <table class="table table-bordered">
             <thead>
             <tr>
                 <th><%= l 'pf_LABEL_PROTOCOL' %></th>
@@ -104,12 +100,12 @@
 
                                 <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
                             </tr>
+                            % }
+                        % }
                     % }
                 % }
-            % }
+            </tbody>
-        % }
+        </table>
-        </tbody>
-    </table>
     <%= hidden_field 'trt' => $pf_datas->{trt} %>
 
 </div>

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>
     % }

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

@@ -5,117 +5,141 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $yum_datas
+            <%= dumper $yum_datas %>
-    </p>
+        </pre>
     % }
 
     <h1><%= $title%></h1>
 
     % if ( $notif ) {
-    <br>
+        <br>
-    <span class="">
+        <div class="text-warn">
-    %= $notif
+            <%= $notif %>
-    </span>
+        </div>
-    %}
+        <br>
+    % }
 
     % if ( $c->is_empty('updates') ) {
-    <br>
+        <br>
-    <div class=""><h2>
+        <div>
-    %=l 'yum_TITLE_UPTODATE'
+            <h2><%=l 'yum_TITLE_UPTODATE' %></h2>
-    </h2>
+            <br>
-    %=l 'yum_DESC_UPTODATE'
+            <%=l 'yum_DESC_UPTODATE' %>
-    </div>
+        </div>
-    <br>
+        <br>
-    %}
+    % }
 
     % if ( $c->non_empty('updates') ) {
-    <br>
+        <br>
-    <div class="">
+        <div>
-    <h2>
+            <h2><%= l 'yum_TITLE_UPDATES_AVAILABLE' %></h2>
-    %=l 'yum_TITLE_UPDATES_AVAILABLE'
+            <%= l 'yum_DESC_UPDATES_AVAILABLE' %>
-    </h2>
+        </div>
-    %=l 'yum_DESC_UPDATES_AVAILABLE'
+        <br>
-    </div>
-    <br>
 
-    %= form_for 'yum' => (method => 'POST') => begin
+        <form action="/smanager/yum" method="POST">
-            %=  hidden_field 'trt' => 'UPDT'
+            % my $btnInUp = $c->l('yum_BUTTON_INSTALL_UPDATES');
-        %= submit_button $c->l('yum_BUTTON_INSTALL_UPDATES'), class => ""
+            <%= hidden_field 'trt' => 'UPDT' %>
-    % end
+            <div class="row g-3 align-items-center">
-    %}
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-sm btn-primary"><%= $btnInUp %></button>
+                </div>
+            </div>
+        </form>
+    % }
 
     % if ( $c->non_empty('available') ) {
-    %= form_for 'yum' => (method => 'POST') => begin
+        <form action="/smanager/yum" method="POST">
-        <br>
+            <br>
-            %=  hidden_field 'trt' => 'INST'
+            % my $btnInAv = $c->l('yum_BUTTON_INSTALL_AVAILABLE');
-        %= submit_button $c->l('yum_BUTTON_INSTALL_AVAILABLE'), class => ""
+            <%= hidden_field 'trt' => 'INST' %>
-    % end
+            <div class="row g-3 align-items-center">
-    %}
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-sm btn-primary"><%= $btnInAv %></button>
+                </div>
+            </div>
+        </form>
+    % }
 
     % if ( $c->non_empty('installed') ) {
-    %= form_for 'yum' => (method => 'POST') => begin
+        <form action="/smanager/yum" method="POST">
-        <br>
+            <br>
-            %=  hidden_field 'trt' => 'REMO'
+            % my $btnInRm = $c->l('yum_BUTTON_REMOVE');
-        %= submit_button $c->l('yum_BUTTON_REMOVE'), class => ""
+            <%= hidden_field 'trt' => 'REMO' %>
-    % end
+            <div class="row g-3 align-items-center">
-    %}
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-sm btn-primary"><%= $btnInRm %></button>
+                </div>
+            </div>
 
+    % }
+
+    </form>
+
+    <br>
     <!--<br><hr class=""><br>-->
 
-    %= form_for 'yum' => (method => 'POST') => begin
+    <form action="/smanager/yum" method="POST">
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2 border-bottom">
-    %=l 'yum_LABEL_YUM_STATUS'
+                <%= l 'yum_LABEL_YUM_STATUS' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto border-bottom">
-    %= $c->get_status('status', 'localise')
+                <%= $c->get_status('status', 'localise') %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2 border-bottom">
-    %=l 'yum_LABEL_YUM_PACKAGEFUNCTIONS'
+                <%= l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto border-bottom">
-    %= $c->get_status('PackageFunctions', 'localise')
+                <%= $c->get_status('PackageFunctions', 'localise') %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2 border-bottom">
-    %=l 'yum_LABEL_YUM_DELTARPMPROCESS'
+                <%= l 'yum_LABEL_YUM_DELTARPMPROCESS' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto border-bottom">
-    %= $c->get_status('DeltaRpmProcess', 'localise')
+                <%= $c->get_status('DeltaRpmProcess', 'localise') %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2 border-bottom">
-    %=l 'yum_LABEL_YUM_DOWNLOADONLY'
+                <%= l 'yum_LABEL_YUM_DOWNLOADONLY' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto border-bottom">
-    %= $c->get_status('DownloadOnly', 'localise')
+                <%= $c->get_status('DownloadOnly', 'localise') %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    <p>
+        <div class="row g-3 align-items-center">
-    <span class="">
+            <div class="col-md-2 border-bottom">
-    %=l 'yum_LABEL_YUM_AUTOINSTALLUPDATES'
+                <%= l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' %>
-    </span>
+            </div>
-    <span class="">
+            <div class="col-auto border-bottom">
-    %= $c->get_status('AutoInstallUpdates', 'localise')
+                <%= $c->get_status('AutoInstallUpdates', 'localise') %>
-    </span>
+            </div>
-    </p>
+        </div>
 
-    %=  hidden_field 'trt' => 'CONF'
+        <br>
-    <br>
-    %= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => ""
 
-    % end
+        % my $btnConfig = $c->l('yum_BUTTON_CONFIGURATION');
+        <%=  hidden_field 'trt' => 'CONF' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-sm btn-primary"><%= $btnConfig %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
 

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

@@ -5,105 +5,157 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $yum_datas
+            <%= dumper $yum_datas %>
-    </p>
+        </pre>
     % }
 
+
     <h1><%= $title%></h1>
 
     % if ( $notif ) {
-    <br>
+        <br>
-    <div class="">
+        <div class="text-warn">
-    %= $notif
+            <%= $notif %>
-    </div>
+        </div>
-    %}
+        <br>
+    % }
 
-    %= form_for 'yumd' => (method => 'POST') => begin
 
-    <p>
+    <form action="/smanager/yumd" method="POST">
-    <span class="">
-    %=l 'yum_LABEL_YUM_STATUS'
-    </span>
-    <span class="">
-    % param 'yum_check4updates' => $c->get_status('check4updates') unless param 'yum_check4updates';
-    %= select_field 'yum_check4updates' => $c->get_check_freq_opt()
-    </span>
-    </p>
 
-    <br>
+        <div class="row g-3 align-items-center">
-    %=l 'yum_DESC_YUM_PACKAGEFUNCTIONS'
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_STATUS' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_check4updates' => $c->get_status('check4updates') unless param 'yum_check4updates';
+                <%= select_field 'yum_check4updates' => $c->get_check_freq_opt(), class => "form-select" %>
+            </div>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
-    %=l 'yum_LABEL_YUM_PACKAGEFUNCTIONS'
-    </span>
-    <span class="">
-    % param 'yum_PackageFunctions' => $c->get_status('PackageFunctions') unless param 'yum_PackageFunctions';
-    %= select_field 'yum_PackageFunctions' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
-    </span>
-    </p>
 
-    <br>
+        <%= l 'yum_DESC_YUM_PACKAGEFUNCTIONS' %>
-    %=l 'yum_DESC_ENABLED_REPOSITORIES'
 
-    <p>
+        <br><br>
-    <span class="">
-    %=l 'yum_LABEL_ENABLED_REPOSITORIES'
-    </span>
-    <span class="">
-    % param 'SelectedRepositories' => $c->get_repository_current_options() unless param 'SelectedRepositories';
-    %= select_field 'SelectedRepositories' => $c->get_repository_options2(), class => "", multiple => '1'
-    </span>
-    </p>
 
-    <br>
+        <div class="row g-3 align-items-center">
-    %=l 'yum_DESC_YUM_DELTARPMPROCESS'
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_PackageFunctions' => $c->get_status('PackageFunctions') unless param 'yum_PackageFunctions';
+                <%= select_field 'yum_PackageFunctions' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
 
-    <p>
+        <br>
-    <span class="">
-    %=l 'yum_LABEL_YUM_DELTARPMPROCESS'
-    </span>
-    <span class="">
-    % param 'yum_DeltaRpmProcess' => $c->get_status('DeltaRpmProcess') unless param 'yum_DeltaRpmProcess';
-    %= select_field 'yum_DeltaRpmProcess' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
-    </span>
-    </p>
 
-    <br>
+        <%= l 'yum_DESC_ENABLED_REPOSITORIES' %>
-    %=l 'yum_DESC_YUM_DOWNLOADONLY'
 
-    <p>
+        <br><br>
-    <span class="">
-    %=l 'yum_LABEL_YUM_DOWNLOADONLY'
-    </span>
-    <span class="">
-    % param 'yum_DownloadOnly' => $c->get_status('DownloadOnly') unless param 'yum_DownloadOnly';
-    %= select_field 'yum_DownloadOnly' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
-    </span>
-    </p>
 
-    <br>
+        <br>
-    %=l 'yum_DESC_YUM_AUTOINSTALLUPDATES'
 
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_YUM_AUTOINSTALLUPDATES'
-    </span>
-    <span class="">
-    % param 'yum_AutoInstallUpdates' => $c->get_status('AutoInstallUpdates') unless param 'yum_AutoInstallUpdates';
-    %= select_field 'yum_AutoInstallUpdates' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
-    </span>
-    </p>
 
-    %=  hidden_field 'trt' => 'CONF'
-    <br>
-    <!--<div class="">-->
-    %= submit_button $c->l('SAVE'), class => ""
-    <!--</div>-->
 
-    % end
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_ENABLED_REPOSITORIES' %>
+            </div>
+            <div class="col-auto">
+                % param 'SelectedRepositories' => $c->get_repository_current_options() unless param 'SelectedRepositories';
+
+                <%= select_field 'SelectedRepositories' => $c->get_repository_options2(), multiple => '1', size => "16", class => "form-select" %>
+            </div>
+        </div>
+
+<br>
+        <%= dumper $c->get_repository_options2() %>
+<br>
+        <%= dumper $c->get_repository_current_options () %>
+<br>
+        <%= dumper $c->every_param('SelectedRepositories') %>
+<br>
+
+
+        %# my @repo ();
+        %# my %repositories = $c->get_repository_options2();
+        <%#= dumper %repositories %>
+
+        %# foreach my @repository (keys %$repositories) {
+            <%#= dumper @repository %>
+            <br>
+            %# my $repoName = $_->{Name};
+            %# my $repoStatus = $_ -> {Status};
+        %# }
+
+
+
+        <br>
+
+        <%= l 'yum_DESC_YUM_DELTARPMPROCESS' %>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_DELTARPMPROCESS' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_DeltaRpmProcess' => $c->get_status('DeltaRpmProcess') unless param 'yum_DeltaRpmProcess';
+                <%= select_field 'yum_DeltaRpmProcess' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <%= l 'yum_DESC_YUM_DOWNLOADONLY' %>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_DOWNLOADONLY' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_DownloadOnly' => $c->get_status('DownloadOnly') unless param 'yum_DownloadOnly';
+                <%= select_field 'yum_DownloadOnly' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <%= l 'yum_DESC_YUM_AUTOINSTALLUPDATES' %>
+
+        <br><br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' %>
+            </div>
+            <div class="col-auto">
+                % param 'yum_AutoInstallUpdates' => $c->get_status('AutoInstallUpdates') unless param 'yum_AutoInstallUpdates';
+                <%= select_field 'yum_AutoInstallUpdates' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btnSave = $c->l('SAVE');
+        <%=  hidden_field 'trt' => 'CONF' %>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-sm btn-primary"><%= $btnSave %></button>
+            </div>
+        </div>
+
+    </form>
+
+
 
 </div>
 

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

@@ -5,61 +5,79 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $yum_datas
+            <%= dumper $yum_datas %>
-    </p>
+        </pre>
     % }
 
     <h1><%= $title%></h1>
 
     % if ( $notif ) {
-    <br>
+        <br>
-    <div class="">
+        <div class="text-warn">
-    %= $notif
+            <%= $notif %>
-    </div>
+        </div>
-    %}
+        <br>
-    <br>
+    % }
 
-    %= form_for 'yumd' => (method => 'POST') => begin
+    <form action="/smanager/yumd" method="POST">
 
-    %=l 'yum_HEADER_AVAILABLE_SOFTWARE'
+        <%= l 'yum_HEADER_AVAILABLE_SOFTWARE' %>
-    <br><br>
-    % if ($c->non_empty('available','group')) {
-    %=l 'yum_DESC_AVAILABLE_GROUPS'
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_AVAILABLE_GROUPS'
-    </span>
-    <span class="">
-    % param 'SelectedGroups' => $c->get_names2('updates','group') unless param 'SelectedGroups';
-    %= select_field 'SelectedGroups' => $c->get_options2('available', 'group'), class => "", multiple => "1"
-    </span>
-    </p>
-    %}
-    <br>
-    % if ($c->non_empty('available','packages')) {
-    %=l 'yum_DESC_AVAILABLE_PACKAGES'
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_AVAILABLE_PACKAGES'
-    </span>
-    <span class="">
-    % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages';
-    %= select_field 'SelectedPackages' => $c->get_options2('available', 'package'), class => "", multiple => "1"
-    </span>
-    </p>
-    %}
 
-    <!-- $c->print_skip_header() -->
+        <br><br>
 
-    %=  hidden_field 'trt' => 'INST'
+        % if ($c->non_empty('available','group')) {
-    <br><br>
+
-    <!-- <div class="">-->
+            <%=l 'yum_DESC_AVAILABLE_GROUPS' %>
-    %= submit_button $c->l('yum_INSTALL_SOFTWARE'), class => ""
+
-    <!--</div>-->
+            <br><br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l 'yum_LABEL_AVAILABLE_GROUPS' %>
+                </div>
+                <div class="col-md-3">
+                    % param 'SelectedGroups' => $c->get_names2('updates','group') unless param 'SelectedGroups';
+                    <%= select_field 'SelectedGroups' => $c->get_options2('available', 'group'), class => "form-select", size => "10", multiple => "1" %>
+                </div>
+            </div>
+        % }
+
+        <br><br>
+
+        % if ($c->non_empty('available','packages')) {
+
+            <%= l 'yum_DESC_AVAILABLE_PACKAGES' %>
+
+            <br><br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%=l 'yum_LABEL_AVAILABLE_PACKAGES' %>
+                </div>
+                <div class="col-md-3">
+                    % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages';
+                    %= select_field 'SelectedPackages' => $c->get_options2('available', 'package'), class => "form-select", size => "10", multiple => "1"
+                </div>
+            </div>
+
+        % }
+
+        <!-- $c->print_skip_header() -->
+        <br>
+        <%=  hidden_field 'trt' => 'INST' %>
+        % my $btnSave = $c->l('yum_INSTALL_SOFTWARE');
+
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-sm btn-primary"><%= $btnSave %></button>
+            </div>
+        </div>
+
+    </form>
 
-    % end
 
 </div>
 

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

@@ -9,35 +9,39 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $yum_datas
+            <%= dumper $yum_datas %>
-    </p>
+        </pre>
     % }
 
     <h1><%= $title%></h1>
 
     % if ( $notif ) {
+        <br>
+        <div class="text-warn">
+            <%= $notif %>
+        </div>
+        <br>
+    % }
+
+    <form action="/smanager/yum" method="POST">
+
     <br>
-    <div class="">
+    <h2>Please Wait - Yum Running (<%= $c->get_yum_status_page() %>)</h2>
-    %= $notif
-    </div>
-    %}
 
-    %= form_for 'yum' => (method => 'POST') => begin
-
-    <BR><center><H2>Please Wait - Yum Running (<%= $c->get_yum_status_page() %>)</H2></center>
 
     <%= $c->render_to_string(inline => $c->format_yum_log()) %>
 
     %=  hidden_field 'trt' => 'LOGF'
+
     <br>
 
     <!-- div class="">
     prc= submit_button $c->l('NEXT'), class => ""
     </div -->
 
-    % end
+    </form>
 
 </div>
 

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

@@ -1,62 +1,84 @@
-% layout 'AdminLTE', title => "Sme server 2 - yum_update";
+% layout 'AdminLTE', title => "Sme server 2 - yum_remove";
 
 % content_for 'module' => begin
 
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $yum_datas
+            <%= dumper $yum_datas %>
-    </p>
+        </pre>
     % }
 
     <h1><%= $title%></h1>
-    <br>
 
     % if ( $notif ) {
-    <br><div class="">
+        <br>
-    %= $notif
+        <div class="text-warn">
-    </div>
+            <%= $notif %>
-    %}
+        </div>
+        <br>
+    % }
 
-    %= form_for 'yumd' => (method => 'POST') => begin
+    <form action="/smanager/yumd" method="POST">
 
-    %=l 'yum_HEADER_INSTALLED_SOFTWARE'
+        <%= l 'yum_HEADER_INSTALLED_SOFTWARE' %>
 
-    <br>
+        <br>
-    % if ($c->non_empty('installed','group')) {
-    %=l 'yum_DESC_INSTALLED_GROUPS'
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_INSTALLED_GROUPS'
-    </span>
-    <span class="">
-    %= select_field 'SelectedGroups' => $c->get_options2('installed', 'group'), class => "", multiple => "1"
-    </span></p>
-    %}
-    <br>
-    % if ($c->non_empty('installed','packages')) {
-    %=l 'yum_DESC_INSTALLED_PACKAGES'
-    <p>
-    <span class="">
-    %=l 'yum_LABEL_INSTALLED_PACKAGES'
-    </span>
-    <span class="">
-    %= select_field 'SelectedPackages' => $c->get_options2('installed', 'package'), class => "", multiple => "1"
-    </span>
-    </p>
-    %}
 
-    <!--subroutine src="print_skip_header()" /-->
+        % if ($c->non_empty('installed','group')) {
 
-    %=  hidden_field 'trt' => 'REMO'
+            <%=l 'yum_DESC_INSTALLED_GROUPS' %>
-    <br>
-    <!--<div class="">-->
-    %= submit_button $c->l('REMOVE'), class => ""
-    <!--</div>-->
 
-    % end
+            <br><br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%= l 'yum_LABEL_INSTALLED_GROUPS' %>
+                </div>
+                <div class="col-md-3">
+                    %# param 'SelectedGroups' => $c->get_names2('updates','group') unless param 'SelectedGroups';
+                    <%= select_field 'SelectedGroups' => $c->get_options2('installed', 'group'), class => "form-select", size => "10", multiple => "1" %>
+                </div>
+            </div>
+        % }
+
+        <br><br>
+
+        % if ($c->non_empty('installed','packages')) {
+
+            <%= l 'yum_DESC_INSTALLED_PACKAGES' %>
+
+            <br><br>
+
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <%=l 'yum_LABEL_INSTALLED_PACKAGES' %>
+                </div>
+                <div class="col-md-3">
+                    %# param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages';
+                    %= select_field 'SelectedPackages' => $c->get_options2('installed', 'package'), class => "form-select", size => "10", multiple => "1"
+                </div>
+            </div>
+
+        % }
+
+
+        <!--subroutine src="print_skip_header()" /-->
+
+
+        <br>
+        <%=  hidden_field 'trt' => 'REMO' %>
+        % my $btn = $c->l('REMOVE');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-sm btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
 

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

@@ -5,43 +5,52 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
+        <pre>
-    %= dumper $c->current_route
+            <%= dumper $c->current_route %>
-    %= dumper $yum_datas
+            <%= dumper $yum_datas %>
-    </p>
+        </pre>
     % }
 
     <h1><%= $title%></h1>
 
     % if ( $notif ) {
-    <br><div class="">
+        <br>
-    %= $notif
+        <div class="text-warn">
-    </div>
+            <%= $notif %>
-    %}
+        </div>
+    % }
 
-    %= form_for 'yumd' => (method => 'POST') => begin
+    <form action="/smanager/yumd" method="POST">
 
-    %=l 'yum_DESC_AVAILABLE_UPDATES'
+        <div>
+            <%=l 'yum_DESC_AVAILABLE_UPDATES' %>
+        </div>
 
-    <p>
+        <div>
-    <span class="">
+            <%=l 'yum_LABEL_AVAILABLE_UPDATES' %>
-    %=l 'yum_LABEL_AVAILABLE_UPDATES'
+        </div>
-    </span>
-    <span class="">
-    % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages';
-    %= select_field 'SelectedPackages' => $c->get_options2('updates', 'package'), class => "", multiple => "1"
-    </span>
-    </p>
 
-        <!-- $c->print_skip_header() -->
+        <div>
+            % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages';
+            <%= select_field 'SelectedPackages' => $c->get_options2('updates', 'package'), class => "form-select", multiple => "1"  %>
+        </div>
 
-        %=  hidden_field 'trt' => 'UPDT'
+            <!-- $c->print_skip_header() -->
-    <br>
+
-    <!--<div class="">-->
+        <%=  hidden_field 'trt' => 'UPDT' %>
-    %= submit_button $c->l('yum_INSTALL_UPDATES'), class => ""
+
-    <!--</div>-->
+        <br>
+
+        % $btn = $c->l('yum_INSTALL_UPDATES');
+
+        <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>
 
-    % end
 
 </div>
 

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,7 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 36
+%define release 42
+
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -16,7 +17,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 +29,29 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Thu Jun 26 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-42.sme
+- Finish Software updater
+
+* Thu Jun 19 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-41.sme
+- Work on NutUPS
+- Work on DateTime
+- Work on Letsencrypt
+- Fix usr panel typo
+
+* 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]