diff --git a/root/usr/share/smanager/themes/default/templates/partials/_nut_CONFIG.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_nut_CONFIG.html.ep index 6365ab1..3054f7e 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_nut_CONFIG.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_nut_CONFIG.html.ep @@ -1,139 +1,136 @@ %# -%# 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') => (autocomplete => "off" ) => begin - % param 'trt' => $nut_data->{trt} unless param 'trt'; - %= hidden_field 'trt' => $nut_data->{trt} - %# Inputs etc in here. + + % if (config->{debug} == 1) { + 
+            %= dumper $nut_data
+
+ % } + % my $btn = l('nut_APPLY'); + %= form_for "nutupsu" => (method => 'POST') => (autocomplete => "off" ) => 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') - - %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']]; - %# param 'status' => $nut_data->{status} unless param 'status'; +

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

- % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status}); - %= select_field 'status' => @status_options, class => 'input', id => 'status_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 => 'input', id => 'Nutmode_select' -

- -
- -
-

<%=l('nut_if_Net_Server')%>

-

- %=l('nut_MasterUPS_UPSNAME@IP') - - % param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name'; - %= 'ups@'. $nut_data->{'localip'} -

+

+ %=l('nut_Nut_status') + + %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']]; + %# param 'status' => $nut_data->{status} unless param 'status'; -

- %=l('nut_SlaveUPS_User') - - %= 'upssecondary' -

+ % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status}); + %= select_field 'status' => @status_options, class => 'input', id => 'status_select' +

- -

- %=l('nut_SlaveUPS_Password') - - <%= $nut_data->{'SlaveUPS_Pass'}%> -

-
- -

- %=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 => 'input', id => 'UPS_Model_select' -

- -

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

-
- -
-

<%=l('nut_if_Net_Client')%>

-

- %=l('nut_SlaveUPS_UPSNAME@IP') - - % param 'ClientUPS_Name' => $nut_data->{ClientUPS_Name} unless param 'ClientUPS_Name'; - %= text_field 'ClientUPS_Name', size => '50', class => 'textinput ClientUPS_Name' , pattern=>'.*' , placeholder=>'upsname@IP[:port]' -

- -

- %=l('nut_ClientUPS_Username') - - % param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User'; - %=text_field 'ClientUPS_User', class => 'textinput' -

+

+ %=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 => 'input', id => 'Nutmode_select' +

-

- %=l('nut_ClientUPS_Password') - - % param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass'; - %=password_field 'ClientUPS_Pass', class => 'pass4 sme-password', autocomplete => 'off' -

-
- -
-`

<%=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 => 'textinput UPS_gen_Type' , 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 => 'textinput UPS_gen_Mfr' , 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 => 'textinput UPS_gen_Model' , pattern=>'.*' , placeholder=>'UPS_gen_Model' -

-`
- - - %= submit_button l('nut_Save'), class => 'action subm12' - - +
+
+

<%=l('nut_if_Net_Server')%>

+

+ %=l('nut_MasterUPS_UPSNAME@IP') + + % param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name'; + %= 'ups@'. $nut_data->{'localip'} +

- - - %# Probably finally by a submit. - %end +

+ %=l('nut_SlaveUPS_User') + + %= 'upssecondary' +

+ +

+ %=l('nut_SlaveUPS_Password') + + <%= $nut_data->{'SlaveUPS_Pass'}%> +

+
+
+

<%= l ('nut_UPS_Device') %>

+

+ %=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 => 'input', id => 'UPS_Model_select' +

+ +

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

+
+
+ +
+

<%=l('nut_if_Net_Client')%>

+

+ %=l('nut_SlaveUPS_UPSNAME@IP') + + % param 'ClientUPS_Name' => $nut_data->{ClientUPS_Name} unless param 'ClientUPS_Name'; + %= text_field 'ClientUPS_Name', size => '50', class => 'textinput ClientUPS_Name' , pattern=>'.*' , placeholder=>'upsname@IP[:port]' +

+ +

+ %=l('nut_ClientUPS_Username') + + % param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User'; + %=text_field 'ClientUPS_User', class => 'textinput' +

+ +

+ %=l('nut_ClientUPS_Password') + + % param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass'; + %=password_field 'ClientUPS_Pass', class => 'pass4 sme-password', autocomplete => 'off' +

+
+ +
+

<%=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 => 'textinput UPS_gen_Type' , 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 => 'textinput UPS_gen_Mfr' , 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 => 'textinput UPS_gen_Model' , pattern=>'.*' , placeholder=>'UPS_gen_Model' +

+
+ + + %= submit_button l('nut_Save'), class => 'action subm12' + + + %# Probably finally by a submit. + %end
\ No newline at end of file diff --git a/smeserver-nutUPS.spec b/smeserver-nutUPS.spec index 620946e..d87baeb 100644 --- a/smeserver-nutUPS.spec +++ b/smeserver-nutUPS.spec @@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module %define name smeserver-nutUPS Name: %{name} %define version 11.0.0 -%define release 19 +%define release 20 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -26,6 +26,10 @@ A module which configures the Network UPS Tools suite for operation with the SME server software. %changelog +* Mon Jul 07 2025 John Crisp 11.0.0-20.sme +- Remove errant backticks +- Add div to section to enhance formatting in Net Server mode + * Mon Jul 07 2025 Brian Read 11.0.0-19.sme - Changes from JC (thanks) and also make sure descriptions fit in with Master->Primary and Slave->Secondary [SME: 13069] Also write descriptive paragraph as no-one else has!