Tidy Nut UPS more and general formatting

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

@@ -17,10 +17,12 @@
     %}
     <h1> Embedded - <%=$title %></h1>
     <br>
-    <p>If the legacy panel does not appear, then you may not be logged into the original Server manager.<br />You can log in by clicking <a href="/server-manager" target='_blank'>here</a>. Or by clicking on the "Legacy SM" button at the top of the window.</p>
+    <div>If the legacy panel does not appear, then you may not be logged into the original Server manager.<br />You can log in by clicking <a href="/server-manager" target='_blank'>here</a>. Or by clicking on the "Legacy SM" button at the top of the window.</div>
+
     % my $height = $c->stash('height') | '600px';
     % if ($height !~ /px$/) { $height = $height.'px';}
-    <object id="" class="" data="<%=$c->stash('modul') %>" style="width:99%;height:<%= $height %>;" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
+
+    <object class="" data="<%=$c->stash('modul') %>" style="width:99%;height:<%= $height %>;" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
 </div>
 
 %end

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

@@ -1,25 +1,42 @@
-<%     use POSIX qw(strftime); %>
+% use POSIX qw(strftime);
-<div id="">
+
-    <% if (! $c->session->{PwdSet} ) { %>
+<div>
-    <div class=""><h5>
+    % if (! $c->session->{PwdSet} ) {
-        Warning: you have not yet changed the default system password.</h5></div>
+        <div>
-    <% } %>
+            <h5 class="text-danger">
-    <% if ( $c->is_unsafe ) { %>
+                Warning: you have not yet changed the default system password.
-    <div class=""><h5>
+            </h5>
-        Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
+        </div>
-        may leave your system in an unknown state!</h5></div>
+    % }
-    <% } %>
+
-    <% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { %>
+    % if ( $c->is_unsafe ) {
-    <div class=""><h5>
+        <div>
-        Warning: Development or debug mode enabled AND public access is offered !
+            <h5 class="text-danger">
-        </h5></div>
+                Warning: a reconfigure and reboot is required before proceeding!<br>
-    <% } %>
+                Failure to do so now may leave your system in an unknown state!
-    <% my $curdate = strftime '%Y%m%d', localtime; %>
+            </h5>
-    <% if ( "$curdate"  >= "20290531" ) { %>
+        </div>
-    <div class=""><h5>
+    % }
-      URGENT NOTICE: As per May 31st 2029, SME Server 11 is obsolete, and potentially INSECURE. NO support will be offered for any issue found with this installed version.
+
-      Please migrate IMMEDIATELY to Koozali SME Server 12 or higher version. Failure to upgrade may lead to the compromise of this server.
+    % if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) {
-      <br>Please, consult <a href="https://wiki.koozali.org/SME_Server:Download" target="_blank">https://wiki.koozali.org/SME_Server:Download</a> to get the latest version
+        <div>
-     </h5></div>
+            <h5 class="text-danger">
-    <% } %>
+                Warning: Development or debug mode enabled AND public access is offered !
+            </h5>
+        </div>
+    % }
+
+    <% my $curdate = strftime '%Y%m%d', localtime; %>
+
+    % if ( "$curdate"  >= "20290531" ) {
+        <div>
+            <h5>
+              URGENT NOTICE: As per May 31st 2029, SME Server 11 is obsolete, and potentially INSECURE.<br>
+              NO support will be offered for any issue found with this installed version.<br>
+              Please migrate IMMEDIATELY to Koozali SME Server 12 or higher version.<br>
+              Failure to upgrade may lead to the compromise of this server.<br>
+              Please, consult <a href="https://wiki.koozali.org/SME_Server:Download" target="_blank">https://wiki.koozali.org/SME_Server:Download</a> to get the latest version
+            </h5>
+        </div>
+    % }
 </div>

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

@@ -1,3 +1,5 @@
+
+<!-- Not used -->
 <div class="login-page bg-body-secondary app-loaded">
       <!-- /.login-logo -->
   <br>

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

@@ -22,13 +22,14 @@
 % end
 
 % content_for 'end' => begin
-    <div id="" class="">
+    <div>
         content_end
     </div>
 % end
 
-<div id="">
+<div>
     <p> < %= $title % ></p><br>
+
     <%= $modul %><br>
     Et eu humo modo paratus quadrum turpis validus. Abico appellatio augue qui refero valetudo vereor. Augue diam eu genitus ille letalis nobis typicus veniam.
 
@@ -36,6 +37,7 @@ Dignissim dolus loquor lucidus probo proprius tation torqueo. Abluo luptatum qui
 
     Aliquam autem blandit decet in jus loquor quidne saluto te. Eu meus voco wisi. Abico defui euismod huic jumentum lobortis mos vulpes. Causa eros feugiat hendrerit illum luctus nimis quidem valetudo. Elit ex obruo tation usitas vero. Abigo dolus hendrerit huic iriure jumentum letalis lobortis melior nulla. Blandit causa immitto iriure metuo nutus pagus ut voco.
     <br>
+
     <p>
         %= link_to Welcome => '/'
     </p>

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

@@ -63,39 +63,43 @@
                     </div>
                     <div class="col-auto">
                         % param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
-                        <input type="text" name="MasterUPS_Name" pattern=".*" size="50" id="inputMasterUPSName" class="form-control" aria-describedby="Master UPS Name" placeholder="<%= 'ups@'. $nut_data->{'localip'} %>" value="<%= $nut_data->{MasterUPS_Name} %>" >
+                        <%= 'ups@'. $nut_data->{'localip'} %>
+                    </div>
+                </div>
+
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-1">
+                        <%= l ('nut_SlaveUPS_User') %>
+                    </div>
+                    <div class="col-auto">
+                        <%= 'upssecondary' %>
+                    </div>
+                </div>
+
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-1">
+                        %=l('nut_SlaveUPS_Password')
+                    </div>
+                    <div class="col-auto">
+                        <%= $nut_data->{'SlaveUPS_Pass'}%>
                     </div>
                 </div>
 
                 <br>
 
-                <div class="row g-3 align-items-center">
-                    <div class="col-md-1">
-                        <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';
-                        <input type="password" name="MasterUPS_Password" id="MasterUPSPassword" class="form-control" aria-describedby="Master UPS Password" value="<%= $nut_data->{MasterUPS_Password} %>">
-                    </div>
-                    <!-- reetp fix toggle password -->
-                    <!-- <div class="col-auto">
-                        <span id="togglePassword" class="bi bi-eye"></span>
-                    </div>
-                    -->
-                </div>
             </div>
 
             <br>
 
             <div>
 
-                <h2>UPS Model</h2>
+                <h2><%= l ('nut_UPS_Device') %></h2>
 
                 <br>
 
                 <div class="row g-3 align-items-center">
                     <div class="col-md-1">
-                        <%= l ('nut_UPS_Model') %>
+                        <label for="UPS_Model_select" class="col-form-label"><%= l ('nut_UPS_Model') %></label>
                     </div>
                     <div class="col-auto">
                         % my @UPS_Model_options = $c->get_model_options();
@@ -143,7 +147,7 @@
                 </div>
                 <div class="col-auto">
                     % param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User';
-                    <input type="password" name="ClientUPS_User" id="ClientUPSUsername" class="form-control" aria-describedby="Client UPS Username" value="<%= $nut_data->{ClientUPS_User} %>" >
+                    <input type="text" name="ClientUPS_User" id="ClientUPSUsername" class="form-control" aria-describedby="Client UPS Username" placeholder="Client username" value="<%= $nut_data->{ClientUPS_User} %>" >
                 </div>
             </div>
 
@@ -151,13 +155,12 @@
 
             <div class="row g-3 align-items-center">
                 <div class="col-md-1">
-                    <label for="ClientUPSPassword" class="col-form-label"><%= l ('nut_ClientUPS_Password') %></label>
+                    <label for="password" class="col-form-label"><%= l ('nut_ClientUPS_Password') %></label>
                 </div>
                 <div class="col-auto">
                     % param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass';
-                    <input type="password" name="ClientUPS_Pass" id="ClientUPSPassword" class="form-control" aria-describedby="Client UPS Password" value="<%= $nut_data->{ClientUPS_Pass} %>" >
+                    <input type="password" name="ClientUPS_Pass" id="password" class="form-control" aria-describedby="Client UPS Password" placeholder="Client password" value="<%= $nut_data->{ClientUPS_Pass} %>" >
                 </div>
-                <!-- reetp fix toggle password -->
                 <div class="col-auto">
                     <span id="togglePassword" class="bi bi-eye"></span>
                 </div>

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

@@ -12,7 +12,7 @@
     <li class="nav-header">USER</li>
 
     <li class="nav-item">
-        <a href='#' id="" class="nav-link">
+        <a href='#' class="nav-link">
         <i class="nav-icon bi bi-person-fill"></i>Current User: <%= session 'username' %>
         </a>
     </li>

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

@@ -47,7 +47,7 @@
             <button class="" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %>
             </button>
         </a>
-        <object id="" data="<%=$url %>" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
+        <object data="<%=$url %>" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
     </div>
 </div>
 

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

@@ -4,10 +4,9 @@
 
 <div  class="card-body">
 
-    <p>Index on line - Welcome page
+    <div>Index on line - Welcome page<br></div>
-    <br>
+
-    </p>
+    <div>
-    <p>
         Cogo diam enim ibidem paulatim pertineo velit. Comis patria pertineo secundum. Aliquip laoreet quibus zelus. Gravis incassum interdico iustum lucidus neo os paratus. Autem causa haero pneum similis sudo vindico. Iusto molior neque oppeto. Ideo minim nibh refoveo veniam vereor virtus. Appellatio pala scisco.
 
         Caecus esse exputo ideo laoreet valde. Appellatio feugiat haero jus lucidus tum valetudo vulputate. Amet illum imputo volutpat. Acsi adipiscing brevitas facilisi illum laoreet lobortis lucidus sagaciter uxor. Defui dolor hos luptatum quadrum saluto verto vicis wisi.
@@ -17,21 +16,26 @@ Acsi ideo pagus ymo. Ea jugis lobortis nimis utrum veniam vereor. Aliquip amet a
         Abdo abico damnum dolor et facilisi incassum melior populus saepius. Commodo conventio ex exputo pagus quae valetudo. Eligo jumentum lobortis suscipit tamen torqueo validus venio voco. Letalis molior tego tincidunt tum. Bene iriure melior natu obruo os te voco. Ea oppeto refoveo tum. Consectetuer dolus ut.
 
         Abdo abigo aptent commoveo inhibeo molior nibh plaga pneum zelus. Conventio genitus neo nulla patria pneum saluto velit voco. Abigo defui dolore humo nulla nunc. Autem commodo erat gemino nisl olim pecus ratis tego. Fere luctus nunc sit. Bene humo imputo paulatim suscipit. Aliquam diam dolor feugiat gravis imputo lucidus modo nulla obruo. Ea macto melior neo qui ratis velit.
-    </p>
+    </div>
-    %= l ('MESS_TEST','toto')
+
-    <p>
+    <%= l ('MESS_TEST','toto') %>
-    %= link_to Initial => '/'
+
-    </p>
+    <div>
-    <p>
+    <%= link_to Initial => '/' %>
-    %= link_to Manual => '/manual'
+    </div>
-    </p>
+
-    <p>
+    <div>
-    %= link_to Welcome => '/welcome'
+    <%= link_to Manual => '/manual' %>
-    <a href="<%= url_for 'index' %>">Accueil</a -->.
+    </div>
-    </p>
+
+    <div>
+    <%= link_to Welcome => '/welcome' %>
+    <a href="<%= url_for 'index' %>">Accueil</a>
+    </div>
 
     % use SrvMngr::Navigation2;
     % my %nav = %{SrvMngr::navigation2->getNavigation( $c->languages() )};
+
     <!-- % = dumper %nav -->
 
     <div>
@@ -40,7 +44,8 @@ Abdo abigo aptent commoveo inhibeo molior nibh plaga pneum zelus. Conventio geni
     </div>
 
     <div>
-    %= $h
+
+        <%= $h %>
 
         % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
             % my ($target, $classNew) = ( $_->{'FILENAME'} =~ m/^2\// ) ?
@@ -52,7 +57,7 @@ Abdo abigo aptent commoveo inhibeo molior nibh plaga pneum zelus. Conventio geni
                 %= $target
                 ' onclick=\"swapClasses('sme
                 %= $c
-            ')\" id="" href='
+                ')\" href='
                 %= $href
                 '>
                 %= $_->{'DESCRIPTION'}
@@ -66,7 +71,6 @@ Abdo abigo aptent commoveo inhibeo molior nibh plaga pneum zelus. Conventio geni
 
     </div>
 
-    
 </div>
 
 % end

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 44
+%define release 45
 
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
@@ -29,6 +29,10 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Mon Jul 07 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-45.sme
+- Tidy up Nut panels more
+- other general formatting
+
 * Sun Jul 06 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-44.sme
 - Tidy up Nut panels