formatting

interface/src/mqtt/MqttSettingsForm.tsx

@@ -159,7 +159,7 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
               value="clean_session"
             />
           }
-          label="Clean Session"
+          label="Set Clean Session"
         />
         <BlockFormControlLabel
           control={
@@ -169,7 +169,7 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
               value="mqtt_retain"
             />
           }
-          label="Retain Flag"
+          label="Use Retain Flag"
         />
         <br></br>
         <Typography variant="h6" color="primary">
@@ -184,8 +184,8 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
           onChange={handleValueChange('nested_format')}
           margin="normal"
         >
-          <MenuItem value={1}>nested on a single topic</MenuItem>
-          <MenuItem value={2}>as individual topics</MenuItem>
+          <MenuItem value={1}>Nested on a single topic</MenuItem>
+          <MenuItem value={2}>As individual topics</MenuItem>
         </SelectValidator>
         <SelectValidator
           name="subscribe_format"
@@ -196,9 +196,9 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
           onChange={handleValueChange('subscribe_format')}
           margin="normal"
         >
-          <MenuItem value={0}>general device topic</MenuItem>
-          <MenuItem value={1}>individual topics, main heating circuit</MenuItem>
-          <MenuItem value={2}>individual topics, all heating circuits</MenuItem>
+          <MenuItem value={0}>General device topic</MenuItem>
+          <MenuItem value={1}>Individual topics, main heating circuit</MenuItem>
+          <MenuItem value={2}>Individual topics, all heating circuits</MenuItem>
         </SelectValidator>
         <BlockFormControlLabel
           control={
@@ -220,9 +220,9 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
             onChange={handleValueChange('ha_climate_format')}
             margin="normal"
           >
-            <MenuItem value={1}>use Current temperature (default)</MenuItem>
-            <MenuItem value={2}>use Setpoint temperature</MenuItem>
-            <MenuItem value={3}>Fix to 0</MenuItem>
+            <MenuItem value={1}>Use Current temperature (default)</MenuItem>
+            <MenuItem value={2}>Use Setpoint temperature</MenuItem>
+            <MenuItem value={3}>Always set to 0</MenuItem>
           </SelectValidator>
         )}
         <br></br>

interface/src/network/NetworkSettingsForm.tsx

@@ -174,7 +174,7 @@ class NetworkSettingsForm extends React.Component<NetworkStatusFormProps> {
               onChange={handleValueChange('enableIPv6')}
             />
           }
-          label="Enable IPv6"
+          label="Enable IPv6 support"
         />
         <BlockFormControlLabel
           control={
@@ -184,7 +184,7 @@ class NetworkSettingsForm extends React.Component<NetworkStatusFormProps> {
               onChange={handleValueChange('bandwidth20')}
             />
           }
-          label="WiFi Low Bandwidth"
+          label="Use Lower WiFi Bandwidth"
         />
         <BlockFormControlLabel
           control={
@@ -194,7 +194,7 @@ class NetworkSettingsForm extends React.Component<NetworkStatusFormProps> {
               onChange={handleValueChange('nosleep')}
             />
           }
-          label="Disable Wifi Sleepmode"
+          label="Disable WiFi Sleep Mode"
         />
         <BlockFormControlLabel
           control={
@@ -204,7 +204,7 @@ class NetworkSettingsForm extends React.Component<NetworkStatusFormProps> {
               onChange={handleValueChange('static_ip_config')}
             />
           }
-          label="Static IP Config"
+          label="Use Static IPs"
         />
         {data.static_ip_config && (
           <Fragment>

interface/src/project/EMSESPSettingsForm.tsx

@@ -365,7 +365,7 @@ class EMSESPSettingsForm extends Component<EMSESPSettingsFormProps> {
 
         <br></br>
         <Typography variant="h6" color="primary">
-          Options
+          General Options
         </Typography>
 
         {data.led_gpio !== 0 && (
@@ -390,7 +390,7 @@ class EMSESPSettingsForm extends Component<EMSESPSettingsFormProps> {
                 value="dallas_parasite"
               />
             }
-            label="Enable Dallas parasite mode"
+            label="Use Dallas Sensor parasite power"
           />
         )}
 
@@ -412,7 +412,17 @@ class EMSESPSettingsForm extends Component<EMSESPSettingsFormProps> {
               value="low_clock"
             />
           }
-          label="Low Clockrate (160MHz, changed on next reboot)"
+          label="Use lower CPU clock speed (only applied after restart)"
+        />
+        <BlockFormControlLabel
+          control={
+            <Checkbox
+              checked={data.notoken_api}
+              onChange={handleValueChange('notoken_api')}
+              value="notoken_api"
+            />
+          }
+          label="Bypass Access Token authorization on API calls"
         />
         <Grid
           container
@@ -445,19 +455,9 @@ class EMSESPSettingsForm extends Component<EMSESPSettingsFormProps> {
 
         <br></br>
         <Typography variant="h6" color="primary">
-          API and MQTT Options
+          Formatting Options
         </Typography>
 
-        <BlockFormControlLabel
-          control={
-            <Checkbox
-              checked={data.notoken_api}
-              onChange={handleValueChange('notoken_api')}
-              value="notoken_api"
-            />
-          }
-          label="Bypass Access Token authorization on API calls"
-        />
         <Grid
           container
           spacing={1}
@@ -498,14 +498,14 @@ class EMSESPSettingsForm extends Component<EMSESPSettingsFormProps> {
           <Grid item xs={4}>
             <SelectValidator
               name="dallas_format"
-              label="Sensor Publishing"
+              label="Dallas Sensor Format"
               value={data.dallas_format}
               fullWidth
               variant="outlined"
               onChange={handleValueChange('dallas_format')}
               margin="normal"
             >
-              <MenuItem value={1}>by Sensor ID</MenuItem>
+              <MenuItem value={1}>by ID</MenuItem>
               <MenuItem value={2}>by Number</MenuItem>
               <MenuItem value={3}>by Name</MenuItem>
             </SelectValidator>