Update Letsencrypt templates

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

@@ -2,46 +2,63 @@
 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
 %#
 <div>
+
+<!-- reetp this isn't required? -->
+<!--
     <script>
         window.onload = function() {
         SelectInput();
     };
     </script>
+-->
 
     % if (config->{debug} == 1) {
         <pre>
-            %= dumper $lets_data
+            <%= dumper $lets_data %>
         </pre>
     % }
 
-    % my $btn = l('lets_APPLY');
+    <!-- <form 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.
 
-        <h1 class=""><%=l('lets_Check_all_domains')%></h1>
+        <h1><%=l('lets_Check_all_domains')%></h1>
 
-        <h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
+        <br>
 
-        <span class="">
+        <h2><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
+
+        <br>
+
+        <!-- results box-->
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
                 %=l('lets_All_domains_check_result')
-        </span>
+            </div>
-        <span class="">
+            <div class="col-auto">
                 % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
                 %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-        </span><br>
+            </div>
-    
+        </div>
-        <span class="">
+
-                        %my $back_text = l('lets_Back');  # Localized text
+        <br>
-                        %my $actionBack = qq{
+
-                        %       <a href="letsencryptd">
+        %# my $btn = l('lets_APPLY');
-                        %       <input class="" type='submit'  value='$back_text'>
+        %# param 'trt' => $lets_data->{trt} unless param 'trt';
-                        %       </a>
+        %#= hidden_field 'trt' => $lets_data->{trt}
-                        %};
+
-                      <%= $c->render_to_string(inline => $actionBack) %>
+
-        </span>
+        % my $back_text = l('lets_Back');  # Localized text
-
+
-        %# Probably finally by a submit.
+        <div class="row g-3 align-items-center">
-    %end    
+            <div class="col-md-2">
+                <!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
+                <a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+            </div>
+        </div>
+
+    <!-- </form> -->
+
 </div>

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

@@ -56,8 +56,8 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+                <!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
-
+                <a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
             </div>
         </div>
 

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

@@ -3,6 +3,8 @@
 %#
 <div>
 
+<!-- reetp this isn't required? -->
+
     <!--
     <script>
         window.onload = function() {
@@ -11,9 +13,9 @@
     </script>
     -->
 
-    % if (config->{debug} == 1) {
+    % if (config->{debug} == 0) {
         <pre>
-            %= dumper $lets_data
+            <%= dumper $lets_data %>
         </pre>
     % }
 
@@ -39,8 +41,11 @@
                 <%= 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'
+                <%= $lets_data->{OneDomainToCheck} %>
+
+            %# param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
+            %#= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
             </div>
         </div>
 
@@ -52,10 +57,16 @@
             <div class="col-md-1">
                 <%= l ('lets_One_domain_check_result') %>
             </div>
-            <div class="col-auto">
+            <div class="col-md-auto">
-            % param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
+                <%= $lets_data->{OneDomainsCheck} %>
-            %= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
             </div>
+            <div class="col-md-auto">
+                %# param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
+                %#= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
+
+            </div>
+
+
         </div>
 
         <br>
@@ -67,8 +78,8 @@
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-                <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
+                <!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
-
+                <a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
             </div>
         </div>
 

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

@@ -29,46 +29,70 @@
     %# param 'trt' => $lets_data->{trt} unless param 'trt';
     %#= hidden_field 'trt' => $lets_data->{trt}
 
-        % my $linkbtn = l ('MODIFY');
+    % my $modifybtn = l ('MODIFY');
+    % my $checkbtn = l ('lets_CHECK');
 
-        %# Inputs etc in here.
-        %# reetp Needs some language translations?
     <div class="row g-3 align-items-center">
-            <div class="col-md-1">
+        <div class="col-md-2">
             <%= l('lets_CONFIG') %>
         </div>
-            <div class="col-auto">
+        <div class="col-md-1 text-center">
-                <a href='letsencryptd?trt=PARAMS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
+            <a href='letsencryptd?trt=PARAMS' class="btn btn-primary btn-sm" role="button"><%= $modifybtn %></a>
         </div>
     </div>
 
     <br>
 
-        %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
-
     <div class="row g-3 align-items-center">
-            <div class="col-md-1">
+        <div class="col-md-2">
             <%= l ('lets_CHECK_ALL_DOMAINS') %>
         </div>
-            <div class="col-auto">
+        <div class="col-md-1 text-center">
-                <a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
+            <a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
         </div>
     </div>
 
-        %#= 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">
+        <div class="col-md-2">
             <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
         </div>
-            <div class="col-auto">
+        <div class="col-md-1 text-center">
-                <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
+            <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
+        </div>
+
+    <div>
+
+<br>
+
+<!--
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1 border text-center">
+            <%= l('lets_CONFIG') %>
+        </div>
+        <div class="col-md-2 border text-center">
+            <%= l ('lets_CHECK_ALL_DOMAINS') %>
+        </div>
+        <div class="col-md-2 border text-center">
+            <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
+        </div>
+    <div>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-1 border text-center">
+            <a href='letsencryptd?trt=PARAMS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
+        </div>
+        <div class="col-md-2 border text-center">
+            <a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
+        </div>
+        <div class="col-md-2 border text-center">
+            <a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
         </div>
     </div>
 
-        %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
+-->
 
 
     <!-- </form>  -->
@@ -82,11 +106,12 @@
 
     <div class="row g-3 align-items-center">
         <div class="col-md-1">
-                    <%= l ('lets_Internal_IP') %>
+            <label for="inputInternalIP" class="col-form-label"><%= l ('lets_Internal_IP') %></label>
         </div>
         <div class="col-auto">
             % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
-                    %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
+            <input type="text" name="InternalIP" id="inputInternalIP" class="form-control" aria-describedby="Disabled Internal IP" value="<%=$lets_data->{InternalIP}%>" disabled readonly>
+            %#= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
         </div>
     </div>
 
@@ -94,11 +119,12 @@
 
     <div class="row g-3 align-items-center">
         <div class="col-md-1">
-                    <%= l ('lets_External_Interface_IP') %>
+            <label for="inputExternalIP" class="col-form-label"><%= l ('lets_External_Interface_IP') %></label>
         </div>
         <div class="col-auto">
             % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
-                    %= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
+            <input type="text" name="ExternalIP" id="inputExternalIP" class="form-control" aria-describedby="Disabled External Interface IP" value="<%=$lets_data->{ExternalIP}%>" disabled readonly>
+            %#= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
         </div>
     </div>
 
@@ -106,11 +132,12 @@
 
     <div class="row g-3 align-items-center">
         <div class="col-md-1">
-                    <%= l ('lets_Internet_IP') %>
+            <label for="inputInternetIP" class="col-form-label"><%= l ('lets_Internet_IP') %></label>
         </div>
         <div class="col-auto">
             % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
-                    %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
+            <input type="text" name="InternetIP" id="inputInternetIP" class="form-control" aria-describedby="Disabled Internet IP" value="<%=$lets_data->{InternetIP}%>" disabled readonly>
+            %#= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
         </div>
     </div>
 
@@ -122,11 +149,12 @@
 
     <div class="row g-3 align-items-center">
         <div class="col-md-1">
-                <%= l ('lets_Issuer') %>
+           <label for="inputIssuer" class="col-form-label"><%= l ('lets_Issuer') %></label>
         </div>
         <div class="col-auto">
             % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
-                    %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
+            <input type="text" name="Issuer" id="inputIssuer" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Issuer}%>" disabled readonly>
+            %#= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
         </div>
     </div>
 
@@ -134,11 +162,12 @@
 
     <div class="row g-3 align-items-center">
         <div class="col-md-1">
-                    <%= l ('lets_Expiry') %>
+            <label for="inputExpiry" class="col-form-label"><%= l ('lets_Expiry') %></label>
         </div>
         <div class="col-auto">
             % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
-                    %= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
+            <input type="text" name="Expiry" id="inputExpiry" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Expiry}%>" disabled readonly>
+            %#= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
         </div>
     </div>
 
@@ -146,11 +175,12 @@
 
     <div class="row g-3 align-items-center">
         <div class="col-md-1">
-                    <%= l ('lets_Not_Before') %>
+            <label for="inputNotBefore" class="col-form-label"><%= l ('lets_Not_Before') %></label>
         </div>
         <div class="col-auto">
             % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
-                    %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
+            <input type="text" name="NotBefore" id="inputNotBefore" class="form-control" aria-describedby="Disabled Not before" value="<%=$lets_data->{NotBefore}%>" disabled readonly>
+            %#= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
         </div>
     </div>
 
@@ -160,19 +190,17 @@
 
     <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 class="text-center"><%= l ('lets_Content') %></th>
-                        <th><%= l ('lets_LABEL_NAMESERVERS') %></th>
+                <th class="text-center"><%= l ('lets_LABEL_NAMESERVERS') %></th>
-                        <th><%= l ('lets_LABEL_POINT') %></th>
+                <th class="text-center"><%= l ('lets_LABEL_POINT') %></th>
-                        <th><%= l ('lets_LABEL_LECERT') %></th>
+                <th class="text-center"><%= l ('lets_LABEL_LECERT') %></th>
-                        <th><%= l ('lets_IS_IN_CERT') %></th>
+                <th class="text-center"><%= l ('lets_IS_IN_CERT') %></th>
-                        <th><%= l ('lets_CHECK') %></th>
+                <th class="text-center"><%= l ('lets_CHECK') %></th>
             </tr>
         </thead>
         <tbody>
@@ -189,14 +217,14 @@
                     % }
 
                     <td ><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %></td>
-                            <td><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
-                            <td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
-                            <td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
-                            <td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
+                    <td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
-                            <td><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %></td>
+                    <td class="text-center"><%=$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>
+                    <td class="text-center"><a href= "<%= $link %>" class="btn btn-primary btn-sm" role="button" > <%= $checkbtn %></a></td>
                     % } else {
                         <td>&nbsp</td>
                     % }

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

@@ -11,6 +11,7 @@
     };
     </script>
 -->
+
     % if (config->{debug} == 1) {
         <pre>
             <%= dumper $lets_data %>