Skip to content
Permalink
Browse files

Manual merge

  • Loading branch information...
directman66 committed Jul 7, 2019
1 parent 740fd2f commit a4e67b54b0a1bd6073f56e603888f7e6e9be7f17
Showing with 4 additions and 5 deletions.
  1. +4 −5 templates/zigbee2mqtt/settings.html
@@ -5,19 +5,19 @@ <h3 class="controls" style="padding-top:0.5em">MQTT settings</h3>
</div>

<div class="form-group">
<label class="col-sm-3 control-label" [#if ERR_MQTT_CLIENT#] style="color:red;font-weight:bold"[#endif#]>Client name:</label>
<label class="col-sm-3 control-label" [#if ERR_MQTT_CLIENT#] style="color:red;font-weight:bold"[#endif#]><#LANG_SYSTEM_NAME#>:</label>
<div class="col-sm-9">
<input class="form-control" type="text" name="mqtt_client" value="<#MQTT_CLIENT#>">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" [#if ERR_MQTT_HOST#] style="color:red;font-weight:bold"[#endif#]>Hostname: (*)</label>
<label class="col-sm-3 control-label" [#if ERR_MQTT_HOST#] style="color:red;font-weight:bold"[#endif#]><#LANG_HOSTNAME#>: (*)</label>
<div class="col-sm-9">
<input class="form-control" type="text" name="mqtt_host" value="<#MQTT_HOST#>">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" [#if ERR_MQTT_PORT#] style="color:red;font-weight:bold"[#endif#]>Port: (*)</label>
<label class="col-sm-3 control-label" [#if ERR_MQTT_PORT#] style="color:red;font-weight:bold"[#endif#]><#LANG_PORT#>: (*)</label>
<div class="col-sm-9">
<input class="form-control" type="text" name="mqtt_port" value="<#MQTT_PORT#>">
</div>
@@ -31,7 +31,7 @@ <h3 class="controls" style="padding-top:0.5em">MQTT settings</h3>

<div class="form-group">
<div class="controls">
<label><input type="checkbox" name="mqtt_auth" value="1"[#if MQTT_AUTH="1"#] checked[#endif#]> authorization required</label>
<label><input type="checkbox" name="mqtt_auth" value="1"[#if MQTT_AUTH="1"#] checked[#endif#]> <#LANG_AUTHORIZATION_REQUIRED#></label>
</div>
</div>

@@ -98,4 +98,3 @@ <h3 class="controls">Zigbee2MQTT settings</h3>
</div>
</fieldset>
</form>

0 comments on commit a4e67b5

Please sign in to comment.
You can’t perform that action at this time.