Remove errant backticks
This commit is contained in:
John Crisp
parent
1962b616ec
commit
848f2bbfc0
@ -2,138 +2,135 @@
|
|||||||
%# 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
|
||||||
%#
|
%#
|
||||||
<div id="Nutups-CONFIG" class="partial Nutups-CONFIG">
|
<div id="Nutups-CONFIG" class="partial Nutups-CONFIG">
|
||||||
<script>
|
<script>
|
||||||
window.onload = function() {
|
window.onload = function() {
|
||||||
SelectInput();
|
SelectInput();
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
% if (config->{debug} == 1) {
|
% if (config->{debug} == 1) {
|
||||||
<pre>
|
<pre>
|
||||||
%= dumper $nut_data
|
%= dumper $nut_data
|
||||||
</pre>
|
</pre>
|
||||||
% }
|
% }
|
||||||
% my $btn = l('nut_APPLY');
|
% my $btn = l('nut_APPLY');
|
||||||
%= form_for "nutupsu" => (method => 'POST') => (autocomplete => "off" ) => begin
|
%= form_for "nutupsu" => (method => 'POST') => (autocomplete => "off" ) => begin
|
||||||
% param 'trt' => $nut_data->{trt} unless param 'trt';
|
% param 'trt' => $nut_data->{trt} unless param 'trt';
|
||||||
%= hidden_field 'trt' => $nut_data->{trt}
|
%= hidden_field 'trt' => $nut_data->{trt}
|
||||||
%# Inputs etc in here.
|
%# Inputs etc in here.
|
||||||
|
|
||||||
<h2 class='subh2'><%=l('nut_Manage_Nutups-config_settings:')%></h2>
|
<h2 class='subh2'><%=l('nut_Manage_Nutups-config_settings:')%></h2>
|
||||||
|
|
||||||
<p><span class=label>
|
<p><span class=label>
|
||||||
%=l('nut_Nut_status')
|
%=l('nut_Nut_status')
|
||||||
</span><span class=data>
|
</span><span class=data>
|
||||||
%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
|
%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
|
||||||
%# param 'status' => $nut_data->{status} unless param 'status';
|
%# param 'status' => $nut_data->{status} unless param 'status';
|
||||||
|
|
||||||
% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
|
% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
|
||||||
%= select_field 'status' => @status_options, class => 'input', id => 'status_select'
|
%= select_field 'status' => @status_options, class => 'input', id => 'status_select'
|
||||||
<br></span> </p>
|
<br></span> </p>
|
||||||
|
|
||||||
<p><span class=label>
|
<p><span class=label>
|
||||||
%=l('nut_Nut_mode')
|
%=l('nut_Nut_mode')
|
||||||
</span><span class=data>
|
</span><span class=data>
|
||||||
% my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
|
% my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
|
||||||
% param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
|
% param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
|
||||||
%= select_field 'Nutmode' => @Nutmode_options, class => 'input', id => 'Nutmode_select'
|
%= select_field 'Nutmode' => @Nutmode_options, class => 'input', id => 'Nutmode_select'
|
||||||
<br></span> </p>
|
<br></span> </p>
|
||||||
|
|
||||||
<div class=masterups>
|
<div class=masterups>
|
||||||
|
<div class=secondaryups>
|
||||||
|
<h2 class='subh3'><%=l('nut_if_Net_Server')%></h2>
|
||||||
|
<p><span class=label>
|
||||||
|
%=l('nut_MasterUPS_UPSNAME@IP')
|
||||||
|
</span><span class=data>
|
||||||
|
% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
|
||||||
|
%= 'ups@'. $nut_data->{'localip'}
|
||||||
|
<br></span></p>
|
||||||
|
|
||||||
<div class=secondaryups>
|
<p><span class='label'>
|
||||||
<h2 class='subh3'><%=l('nut_if_Net_Server')%></h2>
|
%=l('nut_SlaveUPS_User')
|
||||||
<p><span class=label>
|
</span><span class=data>
|
||||||
%=l('nut_MasterUPS_UPSNAME@IP')
|
%= 'upssecondary'
|
||||||
</span><span class=data>
|
</span></p>
|
||||||
% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
|
|
||||||
%= 'ups@'. $nut_data->{'localip'}
|
|
||||||
<br></span></p>
|
|
||||||
|
|
||||||
<p><span class='label'>
|
<p><span class='label'>
|
||||||
%=l('nut_SlaveUPS_User')
|
%=l('nut_SlaveUPS_Password')
|
||||||
</span><span class=data>
|
</span><span class=data>
|
||||||
%= 'upssecondary'
|
<%= $nut_data->{'SlaveUPS_Pass'}%>
|
||||||
</span></p>
|
</span></p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h2><%= l ('nut_UPS_Device') %></h2>
|
||||||
|
<p><span class=label>
|
||||||
|
%=l('nut_UPS_Model')
|
||||||
|
</span><span class=data>
|
||||||
|
% 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'
|
||||||
|
<br></span> </p>
|
||||||
|
|
||||||
|
<p><span class=label>
|
||||||
|
%=l('nut_UPS_Device')
|
||||||
|
</span><span class=data>
|
||||||
|
% 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)'
|
||||||
|
<br></span></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<p><span class='label'>
|
<div class=slaveups>
|
||||||
%=l('nut_SlaveUPS_Password')
|
<h2 class='subh4'><%=l('nut_if_Net_Client')%></h2>
|
||||||
</span><span class=data>
|
<p><span class=label>
|
||||||
<%= $nut_data->{'SlaveUPS_Pass'}%>
|
%=l('nut_SlaveUPS_UPSNAME@IP')
|
||||||
</span></p>
|
</span><span class=data>
|
||||||
</div>
|
% 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]'
|
||||||
|
<br></span></p>
|
||||||
|
|
||||||
<p><span class=label>
|
<p><span class='label'>
|
||||||
%=l('nut_UPS_Model')
|
%=l('nut_ClientUPS_Username')
|
||||||
</span><span class=data>
|
</span><span class=data>
|
||||||
% my @UPS_Model_options = $c->get_model_options();
|
% param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User';
|
||||||
% param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model';
|
%=text_field 'ClientUPS_User', class => 'textinput'
|
||||||
%= select_field 'UPS_Model' => \@UPS_Model_options, class => 'input', id => 'UPS_Model_select'
|
</span></p>
|
||||||
<br></span> </p>
|
|
||||||
|
|
||||||
<p><span class=label>
|
<p><span class='label'>
|
||||||
%=l('nut_UPS_Device')
|
%=l('nut_ClientUPS_Password')
|
||||||
</span><span class=data>
|
</span><span class=data>
|
||||||
% param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device';
|
% param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass';
|
||||||
%= text_field 'UPS_Device', size => '50', class => 'textinput UPS_Device' , pattern=>'.*' , placeholder=>'auto (for usb)'
|
%=password_field 'ClientUPS_Pass', class => 'pass4 sme-password', autocomplete => 'off'
|
||||||
<br></span></p>
|
</span></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class=slaveups>
|
<div class=generics>
|
||||||
<h2 class='subh4'><%=l('nut_if_Net_Client')%></h2>
|
<h2 class='subh5'><%=l('nut_if_genericups')%></h2>
|
||||||
<p><span class=label>
|
<p><span class=label>
|
||||||
%=l('nut_SlaveUPS_UPSNAME@IP')
|
%=l('nut_UPS_Generic_Type')
|
||||||
</span><span class=data>
|
</span><span class=data>
|
||||||
% param 'ClientUPS_Name' => $nut_data->{ClientUPS_Name} unless param 'ClientUPS_Name';
|
% param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
|
||||||
%= text_field 'ClientUPS_Name', size => '50', class => 'textinput ClientUPS_Name' , pattern=>'.*' , placeholder=>'upsname@IP[:port]'
|
%= text_field 'UPS_gen_Type', size => '50', class => 'textinput UPS_gen_Type' , pattern=>'.*' , placeholder=>'UPS_gen_Type'
|
||||||
<br></span></p>
|
<br></span></p>
|
||||||
|
|
||||||
<p><span class='label'>
|
<p><span class=label>
|
||||||
%=l('nut_ClientUPS_Username')
|
%=l('nut_UPS_Generic_Manufacturer')
|
||||||
</span><span class=data>
|
</span><span class=data>
|
||||||
% param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User';
|
% param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
|
||||||
%=text_field 'ClientUPS_User', class => 'textinput'
|
%= text_field 'UPS_gen_Mfr', size => '50', class => 'textinput UPS_gen_Mfr' , pattern=>'.*' , placeholder=>'UPS_gen_Mfr'
|
||||||
</span></p>
|
<br></span></p>
|
||||||
|
|
||||||
<p><span class='label'>
|
<p><span class=label>
|
||||||
%=l('nut_ClientUPS_Password')
|
%=l('nut_UPS_Generic_Model')
|
||||||
</span><span class=data>
|
</span><span class=data>
|
||||||
% param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass';
|
% param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
|
||||||
%=password_field 'ClientUPS_Pass', class => 'pass4 sme-password', autocomplete => 'off'
|
%= text_field 'UPS_gen_Model', size => '50', class => 'textinput UPS_gen_Model' , pattern=>'.*' , placeholder=>'UPS_gen_Model'
|
||||||
</span></p>
|
<br></span></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class=generics>
|
<span class='data'>
|
||||||
` <h2 class='subh5'><%=l('nut_if_genericups')%></h2>
|
%= submit_button l('nut_Save'), class => 'action subm12'
|
||||||
<p><span class=label>
|
</span>
|
||||||
%=l('nut_UPS_Generic_Type')
|
|
||||||
</span><span class=data>
|
|
||||||
% 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'
|
|
||||||
<br></span></p>
|
|
||||||
|
|
||||||
<p><span class=label>
|
%# Probably finally by a submit.
|
||||||
%=l('nut_UPS_Generic_Manufacturer')
|
%end
|
||||||
</span><span class=data>
|
|
||||||
% 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'
|
|
||||||
<br></span></p>
|
|
||||||
|
|
||||||
<p><span class=label>
|
|
||||||
%=l('nut_UPS_Generic_Model')
|
|
||||||
</span><span class=data>
|
|
||||||
% 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'
|
|
||||||
<br></span></p>
|
|
||||||
` </div>
|
|
||||||
|
|
||||||
<span class='data'>
|
|
||||||
%= submit_button l('nut_Save'), class => 'action subm12'
|
|
||||||
</span>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%# Probably finally by a submit.
|
|
||||||
%end
|
|
||||||
</div>
|
</div>
|
||||||
@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module
|
|||||||
%define name smeserver-nutUPS
|
%define name smeserver-nutUPS
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
%define version 11.0.0
|
%define version 11.0.0
|
||||||
%define release 19
|
%define release 20
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
Release: %{release}%{?dist}
|
Release: %{release}%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
@ -26,6 +26,10 @@ A module which configures the Network UPS Tools suite for operation with
|
|||||||
the SME server software.
|
the SME server software.
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 07 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 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 <brianr@koozali.org> 11.0.0-19.sme
|
* Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-19.sme
|
||||||
- Changes from JC (thanks) and also make sure descriptions fit in with Master->Primary and Slave->Secondary [SME: 13069]
|
- 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!
|
Also write descriptive paragraph as no-one else has!
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user