Remove errant backticks

- 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 also, incorporate newly auditted lex file

root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm

@@ -116,7 +116,7 @@ our $cdb;
 		my $c = shift;
 		my $selected = shift; #Parameter is name of selected row.
 		my $is_new_record = shift; #Indicates new record required (defaults)
-		my %ret = {};
+		my %ret = ();
 		return %ret;
 	}
 
@@ -124,7 +124,7 @@ our $cdb;
 		my $c = shift;
 		my $selected = shift; #Parameter is name of selected row.
 		my $is_new_record = shift; #Indicates new record required (defaults)
-		my %ret = {};
+		my %ret = ();
 		return %ret;
 	}
 

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Nutups/nutups_en.lex

@@ -1,30 +1,29 @@
-#
+'nut_APPLY' => 'Apply',
-# Generated by SM2Gen version: SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
+'nut_ClientUPS_Password' => 'Client UPS password',
-#
+'nut_ClientUPS_Username' => 'Client UPS username',
-'nut_UPS_Generic_Model' => 'UPS Generic Model',
-'nut_UPS_Model' => 'UPS Model',
-'nut_Manage_Nutups-config_settings:' => 'Manage Nutups-config settings',
-'nut_Descriptive_paragraph' => 'Descriptive paragraph',
-'nut_MasterUPS_UPSNAME@IP' => 'UPS name@localhost',
-'nut_SlaveUPS_UPSNAME@IP' => 'Slave->Master UPSNAME@IP',
-'nut_MasterUPS_Password' => 'Local server password',
-'nut_SlaveUPS_Password' => 'Slaves Password ->Server',
-'nut_Nut_status' => 'Nut status',
-'nut_Configure_NutUPS' => 'Configure NutUPS',
 'nut_CONFIG_panel_action_was_successful' => 'CONFIG panel action was successful',
-'nut_UPS_Generic_Type' => 'UPS Generic Type',
+'nut_Configure_NutUPS' => 'Configure NutUPS',
-'nut_Status_(from_upsc)' => 'Status (from running upsc)',
+'nut_Descriptive_paragraph' => 'You can use your UPS connected directly to your server in a standalone mode or you can act as a Primary whereby other servers can also react to the status of your connected UPS, or you can connect to another server as a Secondary and react to the status of the UPS connected to that server.',
 'nut_Error_Status_Report' => 'Error Status Report',
-'nut_if_Net_Server' => 'Net Server details',
 'nut_if_genericups' => 'Generic UPS details',
 'nut_if_Net_Client' => 'Net Client details',
-'nut_STATUS_panel_action_was_successful' => 'STATUS panel action was successful',
+'nut_if_Net_Server' => 'Net Server details',
+'nut_Manage_Nutups-config_settings:' => 'Manage Nutups configuration settings',
+'nut_MasterUPS_Password' => 'Local server password',
+'nut_MasterUPS_UPSNAME@IP' => 'UPS name@localhost',
 'nut_Nut_mode' => 'Nut mode',
-'nut_Status_Report' => 'Status Report',
+'nut_Nut_status' => 'Nut status',
 'nut_NutUPS_configuration' => 'NutUPS configuration',
-'nut_APPLY' => 'Apply',
+'nut_Save' => 'Save',
+'nut_SlaveUPS_Password' => 'Secondary->Primary ->Server',
+'nut_SlaveUPS_UPSNAME@IP' => 'Secondary->Primary UPSNAME@IP',
+'nut_SlaveUPS_User' => 'Secondary UPS user',
+'nut_Status_(from_upsc)' => 'Status (from running upsc)',
+'nut_Status_of_the_controlled_UPS' => 'Status of the controlled UPS',
+'nut_STATUS_panel_action_was_successful' => 'STATUS panel action was successful',
+'nut_Status_Report' => 'Status Report',
 'nut_UPS_Device' => 'UPS Device',
 'nut_UPS_Generic_Manufacturer' => 'UPS Generic Manufacturer',
-'nut_Status_of_the_controlled_UPS' => 'Status of the controlled UPS',
+'nut_UPS_Generic_Model' => 'UPS Generic Model',
-'nut_Save' => 'Save',
+'nut_UPS_Generic_Type' => 'UPS Generic Type',
-'nut_status_is_disabled' => 'Nut disabled',
+'nut_UPS_Model' => 'UPS Model',

root/usr/share/smanager/themes/default/templates/partials/_nut_CONFIG.html.ep

@@ -39,9 +39,8 @@
         <br></span>	</p>
 
         <div class=masterups>
-			<h2 class='subh3'><%=l('nut_if_Net_Server')%></h2>
-		   
             <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>
@@ -55,14 +54,14 @@
                         %=  'upssecondary'
                     </span></p>
 
-			
                     <p><span class='label'>
                         %=l('nut_SlaveUPS_Password')
                     </span><span class=data>
                         <%= $nut_data->{'SlaveUPS_Pass'}%>
                     </span></p>
             </div>
-			
+            <div>
+                <h2><%= l ('nut_UPS_Device') %></h2>
                 <p><span class=label>
                     %=l('nut_UPS_Model')
                 </span><span class=data>
@@ -78,6 +77,7 @@
                     %= text_field 'UPS_Device', size => '50', class => 'textinput UPS_Device' , pattern=>'.*' , placeholder=>'auto (for usb)'
                 <br></span></p>
             </div>
+        </div>
 
         <div class=slaveups>
             <h2 class='subh4'><%=l('nut_if_Net_Client')%></h2>
@@ -104,7 +104,7 @@
         </div>
 
         <div class=generics>
-`			<h2 class='subh5'><%=l('nut_if_genericups')%></h2>
+            <h2 class='subh5'><%=l('nut_if_genericups')%></h2>
             <p><span class=label>
                 %=l('nut_UPS_Generic_Type')
             </span><span class=data>
@@ -125,15 +125,12 @@
                 % 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>
+        </div>
 
         <span class='data'>
             %= submit_button l('nut_Save'), class => 'action subm12'
         </span>
 
-
-		
-	
         %# Probably finally by a submit.
     %end
 </div>

root/usr/share/smanager/themes/default/templates/partials/_nut_STATUS.html.ep

@@ -35,6 +35,8 @@
 		<p class='paragraph para1'>
 			%=l('nut_Descriptive_paragraph')
 		</p>
+		<br />
+
 
 <!--
 		<span class=label>

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 17
+%define release 20
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -26,9 +26,21 @@ A module which configures the Network UPS Tools suite for operation with
 the SME server software.
 
 %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
+- 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 also, incorporate newly auditted lex file
+
+* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-18.sme
+- Adjust call from Custom to be emtpy hash not hashref [SME: 13042]
+
 * Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-17.sme
 - Fix return from function in Nutups-custom [SME: 13042]
-- Check Seconds left for zero before dividing by 60
+- Check Seconds left for zero before dividing by 60 [SME: 13042]
 
 * Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-16.sme
 - Change Navigation weighting for SM2 [SME: 12996]
@@ -127,9 +139,9 @@ the SME server software.
 
 * Thu Jan 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-3.sme
 - Remove obsolete directives {ACL,ACCEPT,REJECT} and switch to LISTEN 
-- in /etc/ups/upsd.conf
+ in /etc/ups/upsd.conf
 - Allow NUT in /etc/hosts.allow and in /etc/services [SME: 8793]
-- Code change from  Daniel B.<daniel@firewall-services.com>
+ Code change from  Daniel B.<daniel@firewall-services.com>
 
 * Thu Jan 31 2013 Shad L. Lords <slords@mail.com> 2.4.0-2.sme
 - Obsolete el5 packages that used to be required [SME: 7273]