smeserver/smeserver-manager-AdminLTE
6
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy Nut UPS more and general formatting

Browse Source
This commit is contained in:
John Crisp
2025-07-07 17:24:24 +02:00
parent 5b7e0a4d94
commit f571879414
9 changed files with 141 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,25 +1,42 @@
<% use POSIX qw(strftime); %>
<div id="">
<% if (! $c->session->{PwdSet} ) { %>
<div class=""><h5>
Warning: you have not yet changed the default system password.</h5></div>
<% } %>
<% if ( $c->is_unsafe ) { %>
<div class=""><h5>
Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
may leave your system in an unknown state!</h5></div>
<% } %>
<% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { %>
<div class=""><h5>
Warning: Development or debug mode enabled AND public access is offered !
</h5></div>
<% } %>
% use POSIX qw(strftime);
<div>
% if (! $c->session->{PwdSet} ) {
<div>
<h5 class="text-danger">
Warning: you have not yet changed the default system password.
</h5>
</div>
% }
% if ( $c->is_unsafe ) {
<div>
<h5 class="text-danger">
Warning: a reconfigure and reboot is required before proceeding!<br>
Failure to do so now may leave your system in an unknown state!
</h5>
</div>
% }
% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) {
<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 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.
<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>
<% } %>
% 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>

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

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

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

@@ -22,20 +22,22 @@
% end
% content_for 'end' => begin
<div id="" class="">
content_end
<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.
Et eu humo modo paratus quadrum turpis validus. Abico appellatio augue qui refero valetudo vereor. Augue diam eu genitus ille letalis nobis typicus veniam.
Dignissim dolus loquor lucidus probo proprius tation torqueo. Abluo luptatum quidem. Acsi aliquip eu ex iaceo natu populus quae scisco si.
Dignissim dolus loquor lucidus probo proprius tation torqueo. Abluo luptatum quidem. Acsi aliquip eu ex iaceo natu populus quae scisco si.
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.
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>

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

@@ -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>

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

@@ -12,18 +12,18 @@
<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>
% my $cc = 300;
% foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'})
% foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'})
% <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
% my ($classNew, $target, $href) = '';
% foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) {
% next if ($_->{'MENUCAT'} ne 'U' ); # menu User
% next if ($_->{'MENUCAT'} ne 'U' ); # menu User
% if ( $_->{'FILENAME'} =~ m/^2\// ) {
% $target = '_self';
% (my $file2 = $_->{'FILENAME'}) =~ s|^2/||;