From c5f8ed2f50b0d1bdd531a58e0ad238ac13eb830b Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Tue, 15 Sep 2020 20:17:58 +0200
Subject: [PATCH] shorten names, rename Period to Interval

---
 interface/src/mqtt/MqttSettingsForm.tsx | 40 ++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/interface/src/mqtt/MqttSettingsForm.tsx b/interface/src/mqtt/MqttSettingsForm.tsx
index 818c3954f..ab31e46f1 100644
--- a/interface/src/mqtt/MqttSettingsForm.tsx
+++ b/interface/src/mqtt/MqttSettingsForm.tsx
@@ -124,10 +124,10 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
               value="system_heartbeat"
             />
           }
-          label="MQTT Heartbeat"
+          label="Heartbeat"
         />
         <SelectValidator name="mqtt_format"
-          label="MQTT Format"
+          label="Format"
           value={data.mqtt_format}
           fullWidth
           variant="outlined"
@@ -139,7 +139,7 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
           <MenuItem value={4}>Custom</MenuItem>
         </SelectValidator>
         <SelectValidator name="mqtt_qos"
-          label="MQTT QoS"
+          label="QoS"
           value={data.mqtt_qos}
           fullWidth
           variant="outlined"
@@ -153,7 +153,7 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
           validators={['required', 'isNumber', 'minNumber:0', 'maxNumber:65535']}
           errorMessages={['Publish time is required', "Must be a number", "Must be 0 or greater", "Max value is 65535"]}
           name="publish_time_boiler"
-          label="MQTT Boiler Publish Period (seconds, 0=on change)"
+          label="Boiler Publish Interval (seconds, 0=on change)"
           fullWidth
           variant="outlined"
           value={data.publish_time_boiler}
@@ -165,7 +165,7 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
           validators={['required', 'isNumber', 'minNumber:0', 'maxNumber:65535']}
           errorMessages={['Publish time is required', "Must be a number", "Must be 0 or greater", "Max value is 65535"]}
           name="publish_time_thermostat"
-          label="MQTT Thermostat Publish Period (seconds, 0=on change)"
+          label="Thermostat Publish Interval (seconds, 0=on change)"
           fullWidth
           variant="outlined"
           value={data.publish_time_thermostat}
@@ -177,7 +177,7 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
           validators={['required', 'isNumber', 'minNumber:0', 'maxNumber:65535']}
           errorMessages={['Publish time is required', "Must be a number", "Must be 0 or greater", "Max value is 65535"]}
           name="publish_time_solar"
-          label="MQTT Solar Publish Period (seconds, 0=on change)"
+          label="Solar Publish Interval (seconds, 0=on change)"
           fullWidth
           variant="outlined"
           value={data.publish_time_solar}
@@ -189,7 +189,7 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
           validators={['required', 'isNumber', 'minNumber:0', 'maxNumber:65535']}
           errorMessages={['Publish time is required', "Must be a number", "Must be 0 or greater", "Max value is 65535"]}
           name="publish_time_mixing"
-          label="MQTT Mixer Publish Period (seconds, 0=on change)"
+          label="Mixer Publish Interval (seconds, 0=on change)"
           fullWidth
           variant="outlined"
           value={data.publish_time_mixing}
@@ -197,23 +197,11 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
           onChange={handleValueChange('publish_time_mixing')}
           margin="normal"
         />
-        <TextValidator
-          validators={['required', 'isNumber', 'minNumber:0', 'maxNumber:65535']}
-          errorMessages={['Publish time is required', "Must be a number", "Must be 0 or greater", "Max value is 65535"]}
-          name="publish_time_other"
-          label="MQTT other Modules Publish Period (seconds, 0=on change)"
-          fullWidth
-          variant="outlined"
-          value={data.publish_time_other}
-          type="number"
-          onChange={handleValueChange('publish_time_other')}
-          margin="normal"
-        />
         <TextValidator
           validators={['required', 'isNumber', 'minNumber:0', 'maxNumber:65535']}
           errorMessages={['Publish time is required', "Must be a number", "Must be 0 or greater", "Max value is 65535"]}
           name="publish_time_sensor"
-          label="MQTT Sensors Publish Period (seconds, 0=on change)"
+          label="Sensors Publish Interval (seconds, 0=on change)"
           fullWidth
           variant="outlined"
           value={data.publish_time_sensor}
@@ -221,6 +209,18 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
           onChange={handleValueChange('publish_time_sensor')}
           margin="normal"
         />
+        <TextValidator
+          validators={['required', 'isNumber', 'minNumber:0', 'maxNumber:65535']}
+          errorMessages={['Publish time is required', "Must be a number", "Must be 0 or greater", "Max value is 65535"]}
+          name="publish_time_other"
+          label="All other Modules Publish Interval (seconds, 0=on change)"
+          fullWidth
+          variant="outlined"
+          value={data.publish_time_other}
+          type="number"
+          onChange={handleValueChange('publish_time_other')}
+          margin="normal"
+        />
         <FormActions>
           <FormButton startIcon={<SaveIcon />} variant="contained" color="primary" type="submit">
             Save