diff --git a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css index 61bacae..c9c891e 100644 --- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css +++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css @@ -111,6 +111,6 @@ html { -.user-table-max-width { +.user-table-max-wdith { max-width: 50%; } diff --git a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/datetime.js b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/datetime.js new file mode 100644 index 0000000..0f75a5b --- /dev/null +++ b/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 +}); \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/nutups.js b/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/nutups.js index b511924..4f96db8 100644 --- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/js/nutups.js +++ b/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() { @@ -25,4 +29,4 @@ $(document).ready(function() { // Set the initial state based on current selections toggleGenerics(); toggleUPSClasses(); -}); \ No newline at end of file +}); diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/common_js.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/common_js.html.ep index 3f3f9b7..7ee40fa 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/common_js.html.ep +++ b/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' diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep index b0c5114..1058372 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep @@ -4,205 +4,216 @@
- % if (config->{debug} == 0) { + % if (config->{debug} == 1) { 
             <%= dumper $c->current_route %>
-            <%= dumper $dat_datas %>
+            <%= dumper $dat_data %>
% } - % if ( stash 'error' ) { -
-
- %= $c->render_to_string(inline => stash 'error') + + % if ($c->stash('first')) { +
+ <%= $c->render_to_string(inline =>$c->l($c->stash('first'))) %>
- %} + % } elsif ($c->stash('success')) { +
+ <%= $c->l($c->stash('success')); %> +
+ % } elsif ($c->stash('error')) { +
+ <%= $c->l($c->stash('error')); %> +
+ % } +

<%= $title %>


- %= $modul - <% my $btn = l('SAVE'); %> - -
- -
- - % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus'; - % param 'Ntpserver' => 'smeserver.pool.ntp.org' unless param 'Ntpserver'; - -
- - % if ($dat_datas->{ntpstatus} eq 'disabled') { + <%= $modul %> -
- You can manually set your server time here (static string for testing)

+ % if ($dat_data->{ntpstatus} eq 'disabled') { +
+ <%= l 'dat_NTP_ENABLE_DESC' %> +
+ % } 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' ] + % ]; + +

+ +

<%= $c->l('Time Configuration') %>

+ + + + +
+ +
+
+ <%= label_for time_mode => $c->l('Time Setting Mode:') %> +
+
+ % param 'time_mode' => $dat_data->{time_mode} unless param 'time_mode'; + <%= select_field time_mode => ($mode_options, id => 'time_mode_select'), class => "form-select" %> +

-
-
- -
-
- <%= l 'dat_CURRENT_SETTING' %> -
-
- <%= $dat_datas->{now_string} %> -
-
- -
-
-
- <%= l 'dat_NEW_M/D/Y' %> -
-
- % param 'Month' => $dat_datas->{month} unless param 'Month'; - %= select_field 'Month' => $c->getMonth_list(), class => "form-select" -
- -
- % param 'Day' => $dat_datas->{day} unless param 'Day'; - %= text_field 'Day', size => '2', class => "" -
-
- % param 'Year' => $dat_datas->{year} unless param 'Year'; - %= text_field 'Year', size => '4', class => "" -
- -
- -
-
-
- <%= l 'dat_NEW_H/M/S' %> -
-
- % param 'Hour' => $dat_datas->{hour} unless param 'Hour'; - %= text_field 'Hour', size => '2', class => "" -
-
- % param 'Minute' => $dat_datas->{minute} unless param 'Minute'; - %= text_field 'Minute', size => '2', class => "" -
-
- % param 'Second' => $dat_datas->{second} unless param 'Second'; - %= text_field 'Second', size => '2', class => "" -
+
+
+ <%= $c->l('dat_NTP_CONFIGURE_DESC') %>

- <%= l 'dat_AM/PM_AND_TZ' %> +
- % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm'; - %= select_field 'Ampm' => ['AM', 'PM'], class => "form-select" -
- -
- % param 'Timezone' => $c->getTimezone() unless param 'Timezone'; - %= select_field 'Timezone' => $c->getZone_list(), class => "form-select" -
- -
- -
- -
- - -
-
- - <%#= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %> - - <%= hidden_field 'Old_ntpstatus' => 'disabled' %> - - % } else { - - - -
- <%= l 'dat_NTP_ENABLE_DESC' %> -
- -
- -
-
- <%= l 'dat_CURRENT_SETTING' %> -
-
- <%= $dat_datas->{now_string} %> + % 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'; +
- -
- -
- - -
-
- -
-
- -
-
- -
-
-

-
- <%= l 'dat_NTP_DISABLE_DESC' %> -
+
+ +
+ <%= $c->l('dat_NTP_DISABLE_DESC') %> +
+ +
+ +
+

<%= $c->l('dat_set_manually') %>

+
+ +
+ +
+ +
+ <%= $c->l('Date') %> +
+ +
+ <%= $c->l('Year:') %> +
+ +
+ % param 'year' => ($dat_data->{year}) unless param 'year'; + <%= select_field year => ($year_options, id => 'year'), required => 'required', class=> "form-select" %> +
+ +
+ <%= $c->l('Month:') %> +
+ +
+ % param 'month' => ($dat_data->{month}) unless param 'month'; + <%= select_field month => ($month_options, id => 'month'), required => 'required', class=> "form-select" %> +
+ +
+ +
+ +
+ % param 'day' => ($dat_data->{day}) unless param 'day'; + +
+ +
+ +
+ +
+ +
+ <%= $c->l('Time') %> +
+ +
+ <%= $c->l('Hour:') %> +
+
+ % param 'hour' => ($dat_data->{hour}) unless param 'hour'; + %= select_field hour => ($hour_options, id => 'hour'), required => 'required', class=> "form-select" +
+ +
+ %= label_for minute => $c->l('Minute:') +
+
+ % 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' +
+ +
+ %= label_for second => $c->l('Second:') +
+
+ % param 'second' => ($dat_data->{second}) unless param 'second'; + %= select_field minute => ($second_options, id => 'minute'), required => 'required', class=> "form-select" , inputmode => 'numeric' + +
+ +
+ + + + +
-
- - +
+
+ <%= l 'dat_TZ' %> +
+
+ % param 'Timezone' => $c->getTimezone() unless param 'Timezone'; + <%= select_field 'Timezone' => $c->getZone_list(), class => "form-select" %> +
- - <%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %> - <%#= hidden_field 'Old_ntpstatus' => 'disabled' %> - - % } - - +

+ <%= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus}; %> + <%= hidden_field 'trt' => $dat_data->{trt}; %> - + <% my $btn = l('SAVE'); %>
- - + % } +
-%end \ No newline at end of file +% end +1; \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep.old b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep.old deleted file mode 100644 index aef3bb4..0000000 --- a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep.old +++ /dev/null @@ -1,172 +0,0 @@ -% layout 'AdminLTE', title => "Sme server 2 - datetime"; - -% content_for 'module' => begin - -
- - % if (config->{debug} == 1) { - 
-            <%= dumper $c->current_route %>
-            <%= dumper $dat_datas %>
-
- % } - - % if ( stash 'error' ) { -
-
- %= $c->render_to_string(inline => stash 'error') -
- %} - -

<%= $title %>

-
- %= $modul - <% my $btn = l('SAVE'); %> - -
- -
- - % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus'; - -
- - -
- -
- - <%= radio_button Ntpstatus => 'enabled' %> - <%=l 'dat_NTP_CONFIGURE_TITLE' %> - -
- - % if ($dat_datas->{ntpstatus} eq 'disabled') { - -
- Status disabled - <%= l 'dat_NTP_ENABLE_DESC' %> -
-
- - % } else { - -
- -
-
- <%= l 'dat_CURRENT_SETTING' %> -
-
- <%= $dat_datas->{now_string} %> -
-
- -
- -
-
- -
-
- -
-
- -
- % } - - - <%= radio_button Ntpstatus => 'disabled' %> - <%= l 'dat_NTP_DISABLE_TITLE' %> - -
- - -
- - - - - % if ($dat_datas->{ntpstatus} eq 'enabled') { - -

-
- <%= l 'dat_NTP_DISABLE_DESC' %> -
- - % } else { - -
-
- - <%= l 'dat_CURRENT_SETTING' %> - - <%= $dat_datas->{now_string} %> - -
- - <%= l 'dat_NEW_M/D/Y' %> - - - % param 'Month' => $dat_datas->{month} unless param 'Month'; - %= select_field 'Month' => $c->getMonth_list(), class => "" - - - % param 'Day' => $dat_datas->{day} unless param 'Day'; - %= text_field 'Day', size => '2', class => "" - - - % param 'Year' => $dat_datas->{year} unless param 'Year'; - %= text_field 'Year', size => '4', class => "" - -
- - <%= l 'dat_NEW_H/M/S' %> - - - % param 'Hour' => $dat_datas->{hour} unless param 'Hour'; - %= text_field 'Hour', size => '2', class => "" - - - % param 'Minute' => $dat_datas->{minute} unless param 'Minute'; - %= text_field 'Minute', size => '2', class => "" - - - % param 'Second' => $dat_datas->{second} unless param 'Second'; - %= text_field 'Second', size => '2', class => "" - -
- - <%= l 'dat_AM/PM_AND_TZ' %> - - - % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm'; - %= select_field 'Ampm' => ['AM', 'PM'], class => "" - - - % param 'Timezone' => $c->getTimezone() unless param 'Timezone'; - %= select_field 'Timezone' => $c->getZone_list(), class => "" - -

-
- % } - -
- <%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %> - -
-
- -
-
- - -
- -
-%end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/nutups.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/nutups.html.ep index 4ffbc61..11b0813 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/nutups.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/nutups.html.ep @@ -1,5 +1,5 @@ %# -%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 +%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 %# % layout 'AdminLTE', title => "Sme server 2 - NutUPS configuration", share_dir => './'; %# css specific to this panel: @@ -9,52 +9,59 @@
% if (config->{debug} == 1) { - 
-        %= dumper $c->current_route
-        %= dumper $nut_data->{trt}
-
+ 
+            %= dumper $c->current_route
+            %= dumper $nut_data->{trt}
+
% } - +

<%=$title%>

% if ( stash('modul')) { - %= $c->render_to_string(inline => stash('modul') ); + <%= $c->render_to_string(inline => stash('modul') ); %> % } %if ($c->stash('first')) {

- %=$c->render_to_string(inline =>$c->l($c->stash('first'))) + <%=$c->render_to_string(inline =>$c->l($c->stash('first'))) %>

%} elsif ($c->stash('success')) { -
-

<%=$c->l('nut_Status_Report') %>

- %= $c->l($c->stash('success')); -

+
+

<%=$c->l('nut_Status_Report') %>

+
+ <%= $c->l($c->stash('success')); %> +
-
+
- %} elsif ($c->stash('error')) { -
-

<%=$c->l('nut_Error_Status_Report') %>

- %= $c->l($c->stash('error')); -

+ %} elsif ($c->stash('error')) { +
+

<%=$c->l('nut_Error_Status_Report') %>

+
+ <%= $c->l($c->stash('error')); %> +
-
+
%} %#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 ($nut_data->{trt} eq "STATUS") { - %= include 'partials/_nut_STATUS' + <%= include 'partials/_nut_STATUS' %> %} - + +
+ % if ($nut_data->{trt} eq "CONFIG") { - %= include 'partials/_nut_CONFIG' + + <%= include 'partials/_nut_CONFIG' %> %} -
+ %end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep index 85d605d..8628567 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep @@ -1,64 +1,47 @@ %# -%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 +%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 %#
- - - % if (config->{debug} == 1) { 
-            <%= dumper $lets_data %>
+            %= dumper $lets_data
% } - - - + % 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. -

<%=l('lets_Check_all_domains')%>

- -
- -

<%=l('lets_Loop_through_checking_the_letsencrypt')%>

- -
- - - -
-
- %=l('lets_All_domains_check_result') -
-
- % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck'; - %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true' -
-
- -
- - %# 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 - -
-
- - <%= $back_text %> -
-
- - +

<%=l('lets_Check_all_domains')%>

+ +

<%=l('lets_Loop_through_checking_the_letsencrypt')%>

+ + + %=l('lets_All_domains_check_result') + + + % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck'; + %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true' +
+ + + %my $back_text = l('lets_Back'); # Localized text + %my $actionBack = qq{ + % + % + % + %}; + <%= $c->render_to_string(inline => $actionBack) %> + + %# Probably finally by a submit. + %end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep index b897839..a6b928c 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep @@ -56,8 +56,8 @@
- - <%= $back_text %> + <%= $back_text %> +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep index 820c92b..5866d44 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep @@ -3,8 +3,6 @@ %#
- - - % if (config->{debug} == 0) { + % if (config->{debug} == 1) { 
-            <%= dumper $lets_data %>
+            %= dumper $lets_data
% } @@ -41,11 +39,8 @@ <%= l ('lets_Domains_name') %>
- - <%= $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'
@@ -55,18 +50,12 @@
- <%= l ('lets_One_domain_check_result') %> + <%= l ('lets_One_domain_check_result') %>
-
- <%= $lets_data->{OneDomainsCheck} %> +
+ % param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck'; + %= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-
- %# param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck'; - %#= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true' - -
- -

@@ -78,8 +67,8 @@
- - <%= $back_text %> + <%= $back_text %> +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep index 8d7011e..dfd925f 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep @@ -25,212 +25,184 @@ - %# 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'); -
-
- <%= l('lets_CONFIG') %> -
-
- <%= $modifybtn %> -
-
- -
- -
-
- <%= l ('lets_CHECK_ALL_DOMAINS') %> -
-
- <%= $checkbtn %> -
-
- -
- -
-
- <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %> -
-
- <%= $checkbtn %> + %# Inputs etc in here. + %# reetp Needs some language translations? +
+
+ <%= l('lets_CONFIG') %> +
+
+ <%= $linkbtn %> +
-
+
-
+ %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2' - +
+
+ <%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %> +
+
+ <%= $linkbtn %> +
+
+ + %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4' -

+

-

<%=l('lets_For_this_Server') %>

+

<%=l('lets_For_this_Server') %>

-
+
-
-
- -
-
- % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP'; - - %#= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true' -
-
+
+
+ <%= l ('lets_Internal_IP') %> +
+
+ % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP'; + %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true' +
+
-
+
-
-
- -
-
- % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP'; - - %#= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true' -
-
+
+
+ <%= l ('lets_External_Interface_IP') %> +
+
+ % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP'; + %= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true' +
+
-
+
-
-
- -
-
- % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP'; - - %#= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true' -
-
+
+
+ <%= l ('lets_Internet_IP') %> +
+
+ % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP'; + %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true' +
+
-

+

-

<%=l('lets_Current_certificate_details') %>

+

<%=l('lets_Current_certificate_details') %>

-
+
-
-
- -
-
- % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer'; - - %#= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true' -
-
+
+
+ <%= l ('lets_Issuer') %> +
+
+ % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer'; + %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true' +
+
-
+
-
-
- -
-
- % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry'; - - %#= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true' -
-
+
+
+ <%= l ('lets_Expiry') %> +
+
+ % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry'; + %= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true' +
+
-
+
-
-
- -
-
- % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore'; - - %#= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true' -
-
+
+
+ <%= l ('lets_Not_Before') %> +
+
+ % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore'; + %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true' +
+
-

+

-

<%=l('lets_List_of_Domains_and_Hosts') %>

+

<%=l('lets_List_of_Domains_and_Hosts') %>

-
+
- - - - - - - - - - - - - - - % 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'}); - - % if ($type eq "Domain\n"){ - + % $linkbtn = l 'lets_CHECK'; + +
<%= l ('lets_Domain_name_/_HOSTNAME') %><%= l ('lets_Brief_description') %><%= l ('lets_Content') %><%= l ('lets_LABEL_NAMESERVERS') %><%= l ('lets_LABEL_POINT') %><%= l ('lets_LABEL_LECERT') %><%= l ('lets_IS_IN_CERT') %><%= l ('lets_CHECK') %>
<%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %>
+ + + + + + + + + + + + + + % 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'}); + + % if ($type eq "Domain\n"){ + + % } + % if ($type eq "Host\n") { + + % } + + + + + + + + + % if ($link ne "") { + + % } else { + + % } + % } - % if ($type eq "Host\n") { - - % } - - - - - - - - - % if ($link ne "") { - - % } else { - - % } - - % } - -
<%= l ('lets_Domain_name_/_HOSTNAME') %><%= l ('lets_Brief_description') %><%= l ('lets_Content') %><%= l ('lets_LABEL_NAMESERVERS') %><%= l ('lets_LABEL_POINT') %><%= l ('lets_LABEL_LECERT') %><%= l ('lets_IS_IN_CERT') %><%= l ('lets_CHECK') %>
<%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %> <%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %> <%= $linkbtn %> 
<%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %> <%= $checkbtn %> 
+ +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep index 5e2322e..4e56362 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep @@ -11,7 +11,6 @@ }; --> - % if (config->{debug} == 1) { 
             <%= dumper $lets_data %>
@@ -132,7 +131,6 @@
         

             

                 
-
             

             

                 % param 'email' => $lets_data->{email} unless param 'email';
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep
index 2d88b1c..51bb14e 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep
@@ -1,163 +1,206 @@
 %#
-%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
 %#
 

+
+
+
+
+    % if (config->{debug} == 0) {
         
             %= dumper $nut_data
         

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

+
         %# Inputs etc in here.
 
-        
<%=l('nut_Manage_Nutups-config_settings:')%>

-    
-        

-        
-            %=l('nut_Nut_status')
-        
-        
+        
+
+        
<%=l('nut_Manage_Nutups-config_settings:')%>

+
+        

+
+        

+            

+                <%= l ('nut_Nut_status') %>
+            

+            

             %# 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"  %>
+            

+        

+
         

-        
-        

-    
-        

-        
-            %=l('nut_Nut_mode')
-        
-        
-            % 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 => ""
+
+        

+            

+                <%= l ('nut_Nut_mode') %>
+            

+            

+                % 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" %>
+            

+        

+
+        


+
+        
<%=l('nut_if_Net_Server')%>

+
         

-        
-        

-    
-        

-            
<%=l('nut_if_Net_Server')%>

-        
-            

-            
-                %=l('nut_MasterUPS_UPSNAME@IP')
-            
-            
+
+        

+            

+                
+            

+            

                 % param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
-                %= text_field 'MasterUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'ups@localhost'
-            

-            
-            

+                
+            

+        

 
-            

-            
-                %=l('nut_MasterUPS_Password')
-            
-            
+        

+
+        

+            

+                
+            

+            

                 % param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password';
-                %=password_field 'MasterUPS_Password', class => ""
-            
-            

+                
+            

+            
+            
+        

 
-            

-            
-                %=l('nut_UPS_Model')
-            
-            
+        

+
+        

+            

+                <%= l ('nut_UPS_Model') %>
+            

+            

                 % 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"
+            

+        

 
-            

-                %=l('nut_UPS_Device')
-            
+        

+
+        

+            

+                
+            

+            

                 % param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device';
-                %= text_field 'UPS_Device', size => '50', class => "" , pattern=>'.*' , placeholder=>'auto (for usb)'
-            

+                
+            

+        

+
+        


+
+        
<%=l('nut_if_Net_Client')%>

+
+        

+
+        

+            

+                
+            

+            

+                % param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name';
+                
+            

+        

+
+        

+
+        

+            

+                
+            

+            

+                % param 'SlaveUPS_Pass' => $nut_data->{SlaveUPS_Pass} unless param 'SlaveUPS_Pass';
+                
+            

+            
+            
+        

+
+        


+
+        
<%=l('nut_if_genericups')%>

+
+        

+
+        

+            

+                
+            

+            

+                % param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
+                
+            

+        

+
+        

+
+        

+            

+                
+            

+            

+                % param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
+                
+            

+        

+
+        

+
+        

+            

+                
+            

+            

+                % param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
+                
+            

+        

+
+        

+
+        % param 'trt' => $nut_data->{trt} unless param 'trt';
+        <%= hidden_field 'trt' => $nut_data->{trt} %>
+
+        % my $btn = l ('nut_Save');
+
+        

+            

+                
+            

         

-        
-        

-            
<%=l('nut_if_Net_Client')%>

-            

-            
-                %=l('nut_SlaveUPS_UPSNAME@IP')
-            
-            
-                % param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name';
-                %= text_field 'SlaveUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'upsname@IP'
-            

-            
-            

-        
-            

-            
-                %=l('nut_SlaveUPS_Password')
-            
-            
-                % param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password';
-                %=password_field 'SlaveUPS_Password', class => ""
-            
-            

-        

-    
-        

-`           
<%=l('nut_if_genericups')%>

-            

-            
-                %=l('nut_UPS_Generic_Type')
-            
-            
-                % 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'
-            

-            
-            

-        
-            

-            
-                %=l('nut_UPS_Generic_Manufacturer')
-            
-            
-                % 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'
-            

-            
-            

-        
-            

-            
-                %=l('nut_UPS_Generic_Model')
-            
-            
-                % 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'
-            

-            
-            

-`       

-            
-        
-            %= submit_button l('nut_Save'), class => ""
-        
-    
 
-        
-    
         %# Probably finally by a submit.
-    %end    
+    
+    

+
 

\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep
index 05eb971..1c44526 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep
@@ -1,19 +1,22 @@
 %#
-%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
 %#
 

+
+
+
     % if (config->{debug} == 1) {
         
             %= dumper $nut_data
         

     % }
-    
+
     % my $btn = l('nut_APPLY');
     %= form_for "nutupsu" => (method => 'POST') => begin
         % param 'trt' => $nut_data->{trt} unless param 'trt';
@@ -21,22 +24,22 @@
         %# Inputs etc in here.
 
         

-        
-    
+
+
         
             %= l('nut_Configure_NutUPS')
         
         %#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=> 'link link1'
-    
-    
+
+
+        

+
+
+        
<%= l ('nut_Status_of_the_controlled_UPS')%>

+
+        

+            <%= l ('nut_Descriptive_paragraph') %>
         

-        
-    
-        
<%=l('nut_Status_of_the_controlled_UPS')%>

-    
-        

-            %=l('nut_Descriptive_paragraph')
-        

 
 
-        
+
         %= include 'partials/_nut_UPS_STATUS'
-    
+
         %# Probably finally by a submit.
-    %end    
+    %end
 

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_UPS_STATUS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_UPS_STATUS.html.ep
index 30ff1d5..043bf06 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_UPS_STATUS.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_UPS_STATUS.html.ep
@@ -1,45 +1,107 @@
 
UPS Status

+
 %= stylesheet '/css/nut_ups-status-page.css'
+
 

-        

-            
Device Information

-            
-                
-                
-                
-                
-            
Manufacturer:<%= $nut_data->{'ups_data'}->{'device.mfr'} %>
Model:<%= $nut_data->{'ups_data'}->{'device.model'} %>
Serial:<%= $nut_data->{'ups_data'}->{'device.serial'} %>
Type:<%= $nut_data->{'ups_data'}->{'device.type'} %>

-        

-        
-        

-            
Battery Status

-            
-                
-                
-                
-                
-            
Charge:<%= $nut_data->{'ups_data'}->{'battery.charge'} %>%
Runtime:<%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes
Voltage:<%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V
Type:<%= $nut_data->{'ups_data'}->{'battery.type'} %>

-        

-        
-        

-            
Input Power

-            
-                
-                
-                
-                
-                
-            
Voltage:<%= $nut_data->{'ups_data'}->{'input.voltage'} %>V
Nominal Voltage:<%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V
Sensitivity:<%= $nut_data->{'ups_data'}->{'input.sensitivity'} %>
Transfer High:<%= $nut_data->{'ups_data'}->{'input.transfer.high'} %>V
Transfer Low:<%= $nut_data->{'ups_data'}->{'input.transfer.low'} %>V

-        

-        
-        

-            
UPS Status

-            
-                
-                
-                
-                
-                
-            
Status:<%= $nut_data->{'ups_data'}->{'ups.status'} %>
Load:<%= $nut_data->{'ups_data'}->{'ups.load'} %>%
Beeper:<%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %>
Firmware:<%= $nut_data->{'ups_data'}->{'ups.firmware'} %>
Test Result:<%= $nut_data->{'ups_data'}->{'ups.test.result'} %>

-        

+    

+        
Device Information

+        
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+        
Manufacturer:<%= $nut_data->{'ups_data'}->{'device.mfr'} %>
Model:<%= $nut_data->{'ups_data'}->{'device.model'} %>
Serial:<%= $nut_data->{'ups_data'}->{'device.serial'} %>
Type:<%= $nut_data->{'ups_data'}->{'device.type'} %>

+    

+
+    

+
+    

+        
Battery Status

+        
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+        
Charge:<%= $nut_data->{'ups_data'}->{'battery.charge'} %>%
Runtime:<%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes
Voltage:<%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V
Type:<%= $nut_data->{'ups_data'}->{'battery.type'} %>

+    

+
+    

+
+    

+        
Input Power

+        
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+        
Voltage:<%= $nut_data->{'ups_data'}->{'input.voltage'} %>V
Nominal Voltage:<%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V
Sensitivity:<%= $nut_data->{'ups_data'}->{'input.sensitivity'} %>
Transfer High:<%= $nut_data->{'ups_data'}->{'input.transfer.high'} %>V
Transfer Low:<%= $nut_data->{'ups_data'}->{'input.transfer.low'} %>V

+    

+
+    

+
+    

+        
UPS Status

+        
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+        
Status:<%= $nut_data->{'ups_data'}->{'ups.status'} %>
Load:<%= $nut_data->{'ups_data'}->{'ups.load'} %>%
Beeper:<%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %>
Firmware:<%= $nut_data->{'ups_data'}->{'ups.firmware'} %>
Test Result:<%= $nut_data->{'ups_data'}->{'ups.test.result'} %>

+    

 

\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_sidebar_main_menu.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_sidebar_main_menu.html.ep
index 85fbdf8..dd1ecb6 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_sidebar_main_menu.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_sidebar_main_menu.html.ep
@@ -19,7 +19,7 @@
 
  • ADMINISTRATION
    • 
 
     %    my $cc = 100;
-    %    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) {
 
     % # Retrieve the icon based on the value of $h
@@ -33,10 +33,10 @@
                 
             
             
      
-    
+
             %   my ($classNew, $target, $href) = '';
             %   foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
-            %       next if ($_->{'MENUCAT'} ne 'A' );  # menu Admin 
+            %       next if ($_->{'MENUCAT'} ne 'A' );  # menu Admin
             %       if ( $_->{'FILENAME'} =~ m/^2\// ) {
             %       $target = '_self';
             %           (my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
@@ -45,7 +45,7 @@
             %       $target = 'main';
             %           my $host = $c->req->url->to_abs->host;
             %           $href = "/smanager/legacypanel?url=https://$host/server-manager" . $_->{'FILENAME'};
-            % 
+            %
             %       }
 
             
    • 
@@ -54,12 +54,12 @@
                  <%= $_->{'DESCRIPTION'} %>
                  
             
      • 
-    
-    
+
+
             
             %           $cc++;
             %   }
-            
+
             
    
         
     % }
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep
index 24cea44..fdc0b64 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep
@@ -16,7 +16,7 @@
 
         

    
 
-        
+        
    
             
                 
    
                     
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep
index 0a89554..a0b238d 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep
@@ -1,11 +1,11 @@
 
    
 
     %   my $btn = l('usr_LOCK');
-
+    
     
    
 
     %#= form_for '/useraccountsd' => (method => 'POST') => begin
-
+    
     
    
     
    <%= l 'usr_LOCK_ACCOUNT_TITLE' %>
    
     
    
@@ -13,12 +13,12 @@
     
    
     Needs a text change in the Lex files
     
    
-    <%= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} ) %>
+    <%= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} ) %> 
     
    
 
     

    
 
-    
+    
    
         
             
    
                 
@@ -50,8 +50,8 @@
     %= hidden_field 'trt' => $usr_datas->{trt}
     %= hidden_field 'user' => $usr_datas->{user}
     %= hidden_field 'name' => $usr_datas->{name}
-
+    
     
-    %# end
+    %# end    
 
 
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep
index db41f1c..6676c25 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep
@@ -18,7 +18,7 @@
 
     
    
 
-    
+    
    
         
             
    
                 
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep
index 3395736..84ec2b7 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep
@@ -3,75 +3,75 @@
     % my $btn = l('SAVE');
     
    
     %#= form_for '/useraccountsd' => (method => 'POST') => begin
-
+    
         
    
         
    <%= l 'PASSWORD_RESET' %>
    
         
    
-
+        
         
    
-
+    
         
    
         <%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' %>
         
    
-
+    
         
    
-
+    
         
    
         <%=l 'usr_CURRENT_SYSTEM_PASSWORD' %>
         
    
-
+        
         
    
-
+    
        
    
             
    
             
             
    
-        
    
-
+          
+    
         
    
-
+    
         
    
         <%= l 'usr_NEW_SYSTEM_PASSWORD' %>
         
    
-
+        
         
    
-
+    
          
    
             
    
             
             
    
-        
    
-
-
+          
+    
+    
         
    
-
-
+    
+    
         
    
         <%= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY' %>
         
    
-
+    
         
    
-
+        
         
    
             
    
             
             
    
-        
    
-
+          
+    
         
    
-
+    
         
    
-
+    
         
    
             
    
                 
             
    
         
    
-
+    
         %= hidden_field 'trt' => $usr_datas->{trt}
         %= hidden_field 'user' => $usr_datas->{user}
         %= hidden_field 'name' => $usr_datas->{name}
-
+    
     %# end
     
    
 
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec
index f077b74..9426c0e 100644
--- a/smeserver-manager-AdminLTE.spec
+++ b/smeserver-manager-AdminLTE.spec
@@ -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  11.0.0-41.sme
+- Work on NutUPS
+- Work on DateTime
+- Work on Letsencrypt
+- Fix usr panel typo
+
 * Wed Jun 18 2025 John Crisp  11.0.0-40.sme
 - Finish Letsencrypt panels
 - fix CSS and _usr files typo