From 1962b616ec13e16b8cc09a9edb9da917d7690962 Mon Sep 17 00:00:00 2001
From: Brian Read
Date: Mon, 7 Jul 2025 09:21:35 +0100
Subject: [PATCH] * 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! Also also, incorporate newly
auditted lex file
---
.../SrvMngr/I18N/Modules/Nutups/nutups_en.lex | 43 +++++++++----------
.../templates/partials/_nut_CONFIG.html.ep | 10 ++---
.../templates/partials/_nut_STATUS.html.ep | 4 +-
smeserver-nutUPS.spec | 7 ++-
4 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Nutups/nutups_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Nutups/nutups_en.lex
index 995a9b2..ef46656 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Nutups/nutups_en.lex
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Nutups/nutups_en.lex
@@ -1,30 +1,29 @@
-#
-# 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_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_APPLY' => 'Apply',
+'nut_ClientUPS_Password' => 'Client UPS password',
+'nut_ClientUPS_Username' => 'Client UPS username',
'nut_CONFIG_panel_action_was_successful' => 'CONFIG panel action was successful',
-'nut_UPS_Generic_Type' => 'UPS Generic Type',
-'nut_Status_(from_upsc)' => 'Status (from running upsc)',
+'nut_Configure_NutUPS' => 'Configure NutUPS',
+'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_Save' => 'Save',
-'nut_status_is_disabled' => 'Nut disabled',
\ No newline at end of file
+'nut_UPS_Generic_Model' => 'UPS Generic Model',
+'nut_UPS_Generic_Type' => 'UPS Generic Type',
+'nut_UPS_Model' => 'UPS Model',
\ No newline at end of file
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 e6551b5..6365ab1 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
@@ -38,10 +38,10 @@
%= select_field 'Nutmode' => @Nutmode_options, class => 'input', id => 'Nutmode_select'
-
-
<%=l('nut_if_Net_Server')%>
-
-
+
+
+
+
<%=l('nut_if_Net_Server')%>
%=l('nut_MasterUPS_UPSNAME@IP')
@@ -136,4 +136,4 @@
%# Probably finally by a submit.
%end
-
+
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/partials/_nut_STATUS.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_nut_STATUS.html.ep
index 0ef52b8..134be85 100644
--- a/root/usr/share/smanager/themes/default/templates/partials/_nut_STATUS.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_nut_STATUS.html.ep
@@ -35,6 +35,8 @@
%=l('nut_Descriptive_paragraph')
+
+