Merge branch 'webui/switch-typo' of https://github.com/mcspr/espurna …

…into mcspr-webui/switch-typo
Bluebunny · Mar 25, 2019 · 9c3a6e6 · 9c3a6e6
2 parents 8f47981 + 920c205
commit 9c3a6e6
Show file tree

Hide file tree

Showing 19 changed files with 4,227 additions and 4,224 deletions.
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8285/ESP8266 based smar
 It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.
 
 [![version](https://img.shields.io/badge/version-1.13.6--dev-brightgreen.svg)](CHANGELOG.md)
-[![branch](https://img.shields.io/badge/branch-foxel--sync_first-orange.svg)](https://github.com/xoseperez/espurna/tree/foxel-sync_first/)
+[![branch](https://img.shields.io/badge/branch-mcspr--webui/switch--typo-orange.svg)](https://github.com/xoseperez/espurna/tree/mcspr-webui/switch-typo/)
 [![license](https://img.shields.io/github/license/xoseperez/espurna.svg)](LICENSE)
-[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=foxel-sync_first)](https://travis-ci.org/xoseperez/espurna)
+[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=mcspr-webui/switch-typo)](https://travis-ci.org/xoseperez/espurna)
 [![codacy](https://api.codacy.com/project/badge/Grade/c9496e25cf07434cba786b462cb15f49)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
 [![downloads](https://img.shields.io/github/downloads/xoseperez/espurna/total.svg)](https://github.com/xoseperez/espurna/releases)
 <br />

diff --git a/code/espurna/data/index.all.html.gz b/code/espurna/data/index.all.html.gz
diff --git a/code/espurna/data/index.light.html.gz b/code/espurna/data/index.light.html.gz
diff --git a/code/espurna/data/index.lightfox.html.gz b/code/espurna/data/index.lightfox.html.gz
diff --git a/code/espurna/data/index.rfbridge.html.gz b/code/espurna/data/index.rfbridge.html.gz
diff --git a/code/espurna/data/index.rfm69.html.gz b/code/espurna/data/index.rfm69.html.gz
diff --git a/code/espurna/data/index.sensor.html.gz b/code/espurna/data/index.sensor.html.gz
diff --git a/code/espurna/data/index.small.html.gz b/code/espurna/data/index.small.html.gz
diff --git a/code/espurna/data/index.thermostat.html.gz b/code/espurna/data/index.thermostat.html.gz
diff --git a/code/espurna/static/index.all.html.gz.h b/code/espurna/static/index.all.html.gz.h
diff --git a/code/espurna/static/index.light.html.gz.h b/code/espurna/static/index.light.html.gz.h
diff --git a/code/espurna/static/index.lightfox.html.gz.h b/code/espurna/static/index.lightfox.html.gz.h
diff --git a/code/espurna/static/index.rfbridge.html.gz.h b/code/espurna/static/index.rfbridge.html.gz.h
diff --git a/code/espurna/static/index.rfm69.html.gz.h b/code/espurna/static/index.rfm69.html.gz.h
diff --git a/code/espurna/static/index.sensor.html.gz.h b/code/espurna/static/index.sensor.html.gz.h
diff --git a/code/espurna/static/index.small.html.gz.h b/code/espurna/static/index.small.html.gz.h
diff --git a/code/espurna/static/index.thermostat.html.gz.h b/code/espurna/static/index.thermostat.html.gz.h
diff --git a/code/html/custom.js b/code/html/custom.js
@@ -984,10 +984,10 @@ function initRelayConfig(data) {
             $("input[name='mqttGroup']", line).val(data.group[i]);
         }
         if ("group_sync" in data) {
-            $("input[name='mqttGroupSync']", line).val(data.group_sync[i]);
+            $("select[name='mqttGroupSync']", line).val(data.group_sync[i]);
         }
         if ("on_disc" in data) {
-            $("input[name='relayOnDisc']", line).val(data.on_disc[i]);
+            $("select[name='relayOnDisc']", line).val(data.on_disc[i]);
         }
 
         line.appendTo("#relayConfig");

diff --git a/code/html/index.html b/code/html/index.html
@@ -123,7 +123,7 @@ <h2>Before using this device you have to change the default password for the use
                         <li class="pure-menu-item module module-led">
                             <a href="#" class="pure-menu-link" data="panel-led">LED</a>
                         </li>
-    
+
                         <!-- removeIf(!light) -->
                         <li class="pure-menu-item module module-color">
                             <a href="#" class="pure-menu-link" data="panel-color">LIGHTS</a>
@@ -427,7 +427,7 @@ <h2>Notification LED configuration</h2>
                         </div>
                     </div>
                 </form>
-                
+
                 <form id="form-relay" class="pure-form form-settings">
                     <div class="panel" id="panel-relay">