11.0.0-42.sme Update Nut Letsenc Datetime

This commit is contained in:
John Crisp 2025-06-19 17:58:31 +02:00
parent 4d47e099a6
commit 4204273b79
21 changed files with 754 additions and 828 deletions

View File

@ -111,6 +111,6 @@ html {
.user-table-max-width {
.user-table-max-wdith {
max-width: 50%;
}

View File

@ -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
});

View File

@ -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() {

View File

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

View File

@ -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>
<div class="text-danger">
%= $c->render_to_string(inline => stash 'error')
% if ($c->stash('first')) {
<div>
<%= $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
<% 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') {
<%= $modul %>
<div>
You can manually set your server time here (static string for testing)<br><br>
% if ($dat_data->{ntpstatus} eq 'disabled') {
<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 class="col-md-1">
<%= l 'dat_NEW_H/M/S' %>
</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 id='ntp_section'>
<div>
<%= $c->l('dat_NTP_CONFIGURE_DESC') %>
</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';
%= select_field 'Ampm' => ['AM', 'PM'], class => "form-select"
</div>
<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>
% my $server_check = '^([a-zA-Z0-9][a-zA-Z0-9\.\-]{0,253}[a-zA-Z0-9]|(\d{1,3}\.){3}\d{1,3})$';
% param 'ntpserver' => $dat_data->{ntpserver} unless param 'ntpserver';
<input type="text" name="ntpserver" id="inputNTPServerURL" class="form-control" aria-describedby="NTP Server URL" pattern="<%= $server_check %>" value="<%= $dat_data->{ntpserver} %>">
</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>
<%= l 'dat_NTP_DISABLE_DESC' %>
</div>
<div id='manual_section'>
<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">
<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 class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'dat_TZ' %>
</div>
<div class="col-auto">
% param 'Timezone' => $c->getTimezone() unless param 'Timezone';
<%= select_field 'Timezone' => $c->getZone_list(), class => "form-select" %>
</div>
</div>
<%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %>
<%#= hidden_field 'Old_ntpstatus' => 'disabled' %>
% }
</div>
<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;

View File

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

View File

@ -9,52 +9,59 @@
<div class="card-body">
% if (config->{debug} == 1) {
<pre>
%= dumper $c->current_route
%= dumper $nut_data->{trt}
</pre>
<pre>
%= dumper $c->current_route
%= dumper $nut_data->{trt}
</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="">
<h2><%=$c->l('nut_Status_Report') %></h2><p>
%= $c->l($c->stash('success'));
</p>
<div class="text-success">
<h2><%=$c->l('nut_Status_Report') %></h2>
<div>
<%= $c->l($c->stash('success')); %>
</div>
</div>
<br />
<br>
%} elsif ($c->stash('error')) {
<div class="">
<h2><%=$c->l('nut_Error_Status_Report') %></h2><p>
%= $c->l($c->stash('error'));
</p>
<div class="text-danger">
<h2><%=$c->l('nut_Error_Status_Report') %></h2>
<div>
<%= $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

View File

@ -2,63 +2,46 @@
%# 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>
% }
<!-- <form action="/smanager/letsencryptu" method="POST"> -->
% my $btn = l('lets_APPLY');
%= form_for "letsencryptu" => (method => 'POST') => begin
% param 'trt' => $lets_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $lets_data->{trt}
%# Inputs etc in here.
<h1><%=l('lets_Check_all_domains')%></h1>
<h1 class=""><%=l('lets_Check_all_domains')%></h1>
<br>
<h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
<h2><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
<span class="">
%=l('lets_All_domains_check_result')
</span>
<span class="">
% param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
%= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</span><br>
<br>
<!-- results box-->
<div class="row g-3 align-items-center">
<div class="col-md-1">
%=l('lets_All_domains_check_result')
</div>
<div class="col-auto">
% param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
%= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</div>
</div>
<br>
%# my $btn = l('lets_APPLY');
%# param 'trt' => $lets_data->{trt} unless param 'trt';
%#= hidden_field 'trt' => $lets_data->{trt}
% my $back_text = l('lets_Back'); # Localized text
<div class="row g-3 align-items-center">
<div class="col-md-2">
<!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
<a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
</div>
</div>
<!-- </form> -->
<span class="">
%my $back_text = l('lets_Back'); # Localized text
%my $actionBack = qq{
% <a href="letsencryptd">
% <input class="" type='submit' value='$back_text'>
% </a>
%};
<%= $c->render_to_string(inline => $actionBack) %>
</span>
%# Probably finally by a submit.
%end
</div>

View File

@ -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='letsencrypt' 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>
</div>
</div>

View File

@ -3,8 +3,6 @@
%#
<div>
<!-- reetp this isn't required? -->
<!--
<script>
window.onload = function() {
@ -13,9 +11,9 @@
</script>
-->
% if (config->{debug} == 0) {
% if (config->{debug} == 1) {
<pre>
<%= dumper $lets_data %>
%= dumper $lets_data
</pre>
% }
@ -41,11 +39,8 @@
<%= l ('lets_Domains_name') %>
</div>
<div class="col-auto">
<%= $lets_data->{OneDomainToCheck} %>
%# param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
%#= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
% param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
%= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
</div>
</div>
@ -55,18 +50,12 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_One_domain_check_result') %>
<%= l ('lets_One_domain_check_result') %>
</div>
<div class="col-md-auto">
<%= $lets_data->{OneDomainsCheck} %>
<div class="col-auto">
% param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param '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>
@ -78,8 +67,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='letsencrypt' 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>
</div>
</div>

View File

@ -25,212 +25,184 @@
<!-- <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 $btn = l('lets_APPLY');
%# param 'trt' => $lets_data->{trt} unless param 'trt';
%#= hidden_field 'trt' => $lets_data->{trt}
% my $modifybtn = l ('MODIFY');
% my $checkbtn = l ('lets_CHECK');
% my $linkbtn = l ('MODIFY');
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l('lets_CONFIG') %>
</div>
<div class="col-md-1 text-center">
<a href='letsencryptd?trt=PARAMS' class="btn btn-primary btn-sm" role="button"><%= $modifybtn %></a>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l ('lets_CHECK_ALL_DOMAINS') %>
</div>
<div class="col-md-1 text-center">
<a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
</div>
<div class="col-md-1 text-center">
<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
%# 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>
<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">
<%= 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>
<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>
%#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3'
<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>
<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>
%#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
<!-- </form> -->
<br><br>
<br><br>
<h2><%=l('lets_For_this_Server') %></h2>
<h2><%=l('lets_For_this_Server') %></h2>
<br>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputInternalIP" class="col-form-label"><%= l ('lets_Internal_IP') %></label>
</div>
<div class="col-auto">
% param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
<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>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_Internal_IP') %>
</div>
<div class="col-auto">
% param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
%= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
</div>
</div>
<br>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputExternalIP" class="col-form-label"><%= l ('lets_External_Interface_IP') %></label>
</div>
<div class="col-auto">
% param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
<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>
<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>
<br>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputInternetIP" class="col-form-label"><%= l ('lets_Internet_IP') %></label>
</div>
<div class="col-auto">
% param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
<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>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_Internet_IP') %>
</div>
<div class="col-auto">
% param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
%= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
</div>
</div>
<br><br>
<br><br>
<h2><%=l('lets_Current_certificate_details') %></h2>
<h2><%=l('lets_Current_certificate_details') %></h2>
<br>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputIssuer" class="col-form-label"><%= l ('lets_Issuer') %></label>
</div>
<div class="col-auto">
% param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
<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>
<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>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputExpiry" class="col-form-label"><%= l ('lets_Expiry') %></label>
</div>
<div class="col-auto">
% param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
<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>
<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>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNotBefore" class="col-form-label"><%= l ('lets_Not_Before') %></label>
</div>
<div class="col-auto">
% param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
<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>
<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>
<br><br>
<h2 class=""><%=l('lets_List_of_Domains_and_Hosts') %></h2>
<h2 class=""><%=l('lets_List_of_Domains_and_Hosts') %></h2>
<br>
<br>
<table class="table table-bordered">
<thead>
<tr table-head-row>
<th><%= l ('lets_Domain_name_/_HOSTNAME') %></th>
<th><%= l ('lets_Brief_description') %></th>
<th class="text-center"><%= l ('lets_Content') %></th>
<th class="text-center"><%= l ('lets_LABEL_NAMESERVERS') %></th>
<th class="text-center"><%= l ('lets_LABEL_POINT') %></th>
<th class="text-center"><%= l ('lets_LABEL_LECERT') %></th>
<th class="text-center"><%= l ('lets_IS_IN_CERT') %></th>
<th class="text-center"><%= l ('lets_CHECK') %></th>
</tr>
</thead>
<tbody>
% my $control_data = $c->stash('DomainList');
% foreach my $row (@$control_data) {
% my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'});
% my $type = $c->render_to_string(inline=>$row->{'Table1-TYPE'});
<tr>
% if ($type eq "Domain\n"){
<td><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
% $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>
% }
% if ($type eq "Host\n") {
<td><i class="bi bi-arrow-return-right"> </i><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
% }
<td ><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %></td>
% if ($link ne "") {
<td class="text-center"><a href= "<%= $link %>" class="btn btn-primary btn-sm" role="button" > <%= $checkbtn %></a></td>
% } else {
<td>&nbsp</td>
% }
</tr>
% }
</tbody>
</table>
</tbody>
</table>
</div>

View File

@ -11,7 +11,6 @@
};
</script>
-->
% if (config->{debug} == 1) {
<pre>
<%= dumper $lets_data %>
@ -132,7 +131,6 @@
<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';

View File

@ -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
% param 'trt' => $nut_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $nut_data->{trt}
<form action="/smanager/nutupsu" method="POST">
%# Inputs etc in here.
<h2 class=""><%=l('nut_Manage_Nutups-config_settings:')%></h2>
<!-- reetp - autocomplete="off" ? -->
<p>
<span class="">
%=l('nut_Nut_status')
</span>
<span class="">
<h2><%=l('nut_Manage_Nutups-config_settings:')%></h2>
<br>
<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});
%= select_field 'status' => @status_options, class => "", id => ""
% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
<%= select_field 'status' => @status_options, class => "form-select" %>
</div>
</div>
<br>
</span>
</p>
<p>
<span class="">
%=l('nut_Nut_mode')
</span>
<span class="">
% my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
% param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
%= select_field 'Nutmode' => @Nutmode_options, class => "", id => ""
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('nut_Nut_mode') %>
</div>
<div class="col-auto">
% my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
% param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
<%= select_field 'Nutmode' => @Nutmode_options, class => "form-select" %>
</div>
</div>
<br><br>
<h2><%=l('nut_if_Net_Server')%></h2>
<br>
</span>
</p>
<div class="">
<h2 class=""><%=l('nut_if_Net_Server')%></h2>
<p>
<span class="">
%=l('nut_MasterUPS_UPSNAME@IP')
</span>
<span class="">
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputMasterUPSName" class="col-form-label"><%= l ('nut_MasterUPS_UPSNAME@IP') %></label>
</div>
<div class="col-auto">
% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
%= text_field 'MasterUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'ups@localhost'
<br>
</span>
</p>
<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} %>" >
</div>
</div>
<p>
<span class="">
%=l('nut_MasterUPS_Password')
</span>
<span class="">
<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';
%=password_field 'MasterUPS_Password', class => ""
</span>
</p>
<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>
<p>
<span class="">
%=l('nut_UPS_Model')
</span>
<span class="">
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= 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 => ""
<br>
</span></p>
%= select_field 'UPS_Model' => \@UPS_Model_options, class => "form-select"
</div>
</div>
<p><span class="">
%=l('nut_UPS_Device')
</span><span class="">
<br>
<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)'
<br></span></p>
<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} %>" >
</div>
</div>
<div class="">
<h2 class=""><%=l('nut_if_Net_Client')%></h2>
<p>
<span class="">
%=l('nut_SlaveUPS_UPSNAME@IP')
</span>
<span class="">
<br><br>
<h2><%=l('nut_if_Net_Client')%></h2>
<br>
<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'
<br>
</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>
<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} %>" >
</div>
</div>
<div class="">
` <h2 class=""><%=l('nut_if_genericups')%></h2>
<p>
<span class="">
%=l('nut_UPS_Generic_Type')
</span>
<span class="">
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="SlaveUPSPassword" class="col-form-label"><%= l ('nut_SlaveUPS_Password') %></label>
</div>
<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'
<br>
</span>
</p>
<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} %>" >
</div>
</div>
<p>
<span class="">
%=l('nut_UPS_Generic_Manufacturer')
</span>
<span class="">
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<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'
<br>
</span>
</p>
<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} %>" >
</div>
</div>
<p>
<span class="">
%=l('nut_UPS_Generic_Model')
</span>
<span class="">
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<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'
<br>
</span>
</p>
` </div>
<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} %>" >
</div>
</div>
<span class="">
%= submit_button l('nut_Save'), class => ""
</span>
<br>
% 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>

View File

@ -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="">
%=l('nut_Descriptive_paragraph')
</p>
<div >
<%= l ('nut_Descriptive_paragraph') %>
</div>
<!--
<span class="">

View File

@ -1,45 +1,107 @@
<h1>UPS Status</h1>
%= stylesheet '/css/nut_ups-status-page.css'
<div class="container-md">
<div>
<h2>Device Information</h2>
<table class="table table-bordered">
<tr><td>Manufacturer:</td><td><%= $nut_data->{'ups_data'}->{'device.mfr'} %></td></tr>
<tr><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>
<h2>Device Information</h2>
<table class="table table-bordered">
<tr>
<td>Manufacturer:</td>
<td><%= $nut_data->{'ups_data'}->{'device.mfr'} %></td>
</tr>
<tr>
<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>
<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>
<br>
<div>
<h2>Input Power</h2>
<table class="table table-bordered">
<tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'input.voltage'} %>V</td></tr>
<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>
<div>
<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>
<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>
<br>
<div>
<h2>Input Power</h2>
<table class="table table-bordered">
<tr>
<td>Voltage:</td>
<td><%= $nut_data->{'ups_data'}->{'input.voltage'} %>V</td>
</tr>
<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>

View File

@ -16,7 +16,7 @@
<br><br>
<table class="table table-bordered user-table-max-width">
<table class="table table-bordered user-table-max-wdith">
<thead>
<tr>
<th class="col-sm">

View File

@ -18,7 +18,7 @@
<br><br>
<table class="table table-bordered user-table-max-width">
<table class="table table-bordered user-table-max-wdith">
<thead>
<tr>
<th class="col-sm">

View File

@ -18,7 +18,7 @@
<br>
<table class="table table-bordered user-table-max-width">
<table class="table table-bordered user-table-max-wdith">
<thead>
<tr>
<th class="col-sm">

View File

@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE
%define version 11.0.0
%define release 40
%define release 41
Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
Name: %{name}
Version: %{version}
@ -28,6 +28,12 @@ AdminLTE is an html framework for admin consoles
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
%changelog
* 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