Clean web UI

code/espurna/config/general.h

@@ -451,23 +451,10 @@ PROGMEM const char* const custom_reset_string[] = {
 #define MQTT_TOPIC_INTERVAL     "interval"
 #define MQTT_TOPIC_HOSTNAME     "host"
 #define MQTT_TOPIC_TIME         "time"
-#define MQTT_TOPIC_ANALOG       "analog"
-#define MQTT_TOPIC_COUNTER      "counter"
 #define MQTT_TOPIC_RFOUT        "rfout"
 #define MQTT_TOPIC_RFIN         "rfin"
 #define MQTT_TOPIC_RFLEARN      "rflearn"
 
-// Power module
-#define MQTT_TOPIC_CURRENT          "current"
-#define MQTT_TOPIC_VOLTAGE          "voltage"
-#define MQTT_TOPIC_POWER_ACTIVE     "power"
-#define MQTT_TOPIC_POWER_APPARENT   "apparent"
-#define MQTT_TOPIC_POWER_REACTIVE   "reactive"
-#define MQTT_TOPIC_MAX_POWER        "max_power"
-#define MQTT_TOPIC_POWER_FACTOR     "factor"
-#define MQTT_TOPIC_ENERGY_DELTA     "energy_delta"
-#define MQTT_TOPIC_ENERGY_TOTAL     "energy_total"
-
 // Light module
 #define MQTT_TOPIC_CHANNEL      "channel"
 #define MQTT_TOPIC_COLOR        "color"     // DEPRECATED, use RGB instead

code/espurna/migrate.ino

@@ -8,7 +8,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 void _cmpMoveIndexDown(const char * key, int offset = 0) {
     if (hasSetting(key, 0)) return;
-    for (unsigned char index = 1; index < 10; index++) {
+    for (unsigned char index = 1; index < SETTINGS_MAX_LIST_COUNT; index++) {
         if (hasSetting(key, index)) {
             setSetting(key, index - 1, getSetting(key, index).toInt() + offset);
         } else {

code/html/checkboxes.css

@@ -4,6 +4,7 @@
     height: 27px;
     cursor: pointer;
     overflow: hidden;
+    margin-bottom: 10px;
 }
 
 .iPhoneCheckContainer input {

code/html/custom.css

@@ -25,7 +25,7 @@
     margin: 0px;
 }
 .page {
-    margin-top: 40px;
+    margin-top: 10px;
 }
 .pure-button {
     color: white;
@@ -67,6 +67,7 @@
 }
 .button-del-network {
     background: rgb(202, 60, 60);
+    letter-spacing: 0px;
 }
 .button-more-network,
 .button-rfb-send {
@@ -75,37 +76,39 @@
 .button-settings-backup,
 .button-settings-restore {
     background: rgb(0, 202, 0);
+    margin-bottom: 10px;
 }
 .pure-g {
-    margin-bottom: 20px;
+    margin-bottom: 0px;
 }
 .pure-form legend {
     font-weight: bold;
     letter-spacing: 0;
-    margin-bottom: 1em;
+    margin: 10px 0 1em 0;
 }
 .l-box {
     padding-right: 1px;
 }
+.pure-form input {
+    margin-bottom: 10px;
+}
 .pure-form input[type=text][disabled] {
     color: #777777;
 }
 div.hint {
     font-size: 80%;
     color: #ccc;
-}
-div.hint.inline {
-    margin-top: 6px;
+    margin: -10px 0 10px 0;
 }
 .break {
     margin-top: 5px;
 }
 #networks .pure-g {
-    padding-bottom: 10px;
+    padding: 10px 0 10px 0;
     margin-bottom: 5px;
     border-bottom: 2px dashed #e5e5e5;
 }
-#networks div.more {
+#networks .more {
     display: none;
 }
 legend.module,
@@ -124,8 +127,11 @@ input[name=upgrade] {
     height: 20px;
     margin-top: 10px;
 }
-.pure-form .center {
-    margin: .5em 0 .2em;
+input.center {
+    margin-bottom: 0px;
+}
+div.center {
+    margin: .5em 0 1em;
 }
 .webmode {
     display: none;
@@ -190,4 +196,5 @@ span.slider {
 }
 select {
     width: 100%;
+    margin-bottom: 10px;
 }

code/html/custom.js

@@ -133,6 +133,7 @@ function getData(form) {
 
     // Delete unwanted fields
     delete(data["filename"]);
+    delete(data["rfbcode"]);
 
     return data;
 
@@ -452,7 +453,7 @@ function delNetwork() {
 
 function moreNetwork() {
     var parent = $(this).parents(".pure-g");
-    $("div.more", parent).toggle();
+    $(".more", parent).toggle();
 }
 
 // -----------------------------------------------------------------------------
@@ -631,7 +632,7 @@ function initChannels(num) {
 
 function addRfbNode() {
 
-    var numNodes = $("#rfbNodes > fieldset").length;
+    var numNodes = $("#rfbNodes > legend").length;
 
     var template = $("#rfbNodeTemplate").children();
     var line = $(template).clone();
@@ -1021,7 +1022,7 @@ $(function() {
         $("input[name='filename']").val(fileName.replace(/^.*[\\\/]/, ''));
     });
     $(".button-add-network").on('click', function() {
-        $("div.more", addNetwork()).toggle();
+        $(".more", addNetwork()).toggle();
     });
 
     $(document).on('change', 'input', hasChanged);