From 9851c26781165982d8522a520e6a8121a12ce2a5 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 15 Apr 2021 20:21:51 +0200
Subject: [PATCH 1/4] Fix for #11680

Using file from https://github.com/arendst/Tasmota/issues/11680#issuecomment-818844390
---
 tasmota/xsns_53_sml.ino | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino
index c29cd29a5..5288e2dc3 100755
--- a/tasmota/xsns_53_sml.ino
+++ b/tasmota/xsns_53_sml.ino
@@ -1915,14 +1915,14 @@ void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex) {
 
 // web + json interface
 void SML_Show(boolean json) {
-  int8_t count,mindex,cindex=0;
+  int8_t count, mindex, cindex = 0;
   char tpowstr[32];
   char name[24];
   char unit[8];
   char jname[24];
   int8_t index=0,mid=0;
   char *mp=(char*)meter_p;
-  char *cp,nojson=0;
+  char *cp, nojson = 0;
   //char b_mqtt_data[MESSZ];
   //b_mqtt_data[0]=0;
 
@@ -1937,9 +1937,9 @@ void SML_Show(boolean json) {
 
         if (mindex<0 || mindex>=meters_used) mindex=0;
         if (meter_desc_p[mindex].prefix[0]=='*' && meter_desc_p[mindex].prefix[1]==0) {
-          nojson=1;
+          nojson = 1;
         } else {
-          nojson=0;
+          nojson = 0;
         }
         mp+=2;
         if (*mp=='=' && *(mp+1)=='h') {
@@ -2032,27 +2032,35 @@ void SML_Show(boolean json) {
             }
 
             if (json) {
-              if (!dvalid[index]) {
-                nojson = 1;
+              //if (dvalid[index]) {
+
                 //AddLog(LOG_LEVEL_INFO, PSTR("not yet valid line %d"), index);
-              }
+              //}
               // json export
               if (index==0) {
                   //snprintf_P(b_mqtt_data, sizeof(b_mqtt_data), "%s,\"%s\":{\"%s\":%s", b_mqtt_data,meter_desc_p[mindex].prefix,jname,tpowstr);
-                  if (!nojson) ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
+                  if (!nojson) {
+                    ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
+                  }
               }
               else {
                 if (lastmind!=mindex) {
                   // meter changed, close mqtt
                   //snprintf_P(b_mqtt_data, sizeof(b_mqtt_data), "%s}", b_mqtt_data);
-                  if (!nojson) ResponseAppend_P(PSTR("}"));
+                  if (!nojson) {
+                     ResponseAppend_P(PSTR("}"));
+                   }
                     // and open new
                     //snprintf_P(b_mqtt_data, sizeof(b_mqtt_data), "%s,\"%s\":{\"%s\":%s", b_mqtt_data,meter_desc_p[mindex].prefix,jname,tpowstr);
-                  if (!nojson) ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
+                  if (!nojson) {
+                    ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
+                  }
                   lastmind=mindex;
                 } else {
                   //snprintf_P(b_mqtt_data, sizeof(b_mqtt_data), "%s,\"%s\":%s", b_mqtt_data,jname,tpowstr);
-                  if (!nojson) ResponseAppend_P(PSTR(",\"%s\":%s"),jname,tpowstr);
+                  if (!nojson) {
+                    ResponseAppend_P(PSTR(",\"%s\":%s"),jname,tpowstr);
+                  }
                 }
               }
 
@@ -2073,7 +2081,9 @@ void SML_Show(boolean json) {
     if (json) {
      //snprintf_P(b_mqtt_data, sizeof(b_mqtt_data), "%s}", b_mqtt_data);
      //ResponseAppend_P(PSTR("%s"),b_mqtt_data);
-     if (!nojson) ResponseAppend_P(PSTR("}"));
+     if (!nojson) {
+       ResponseAppend_P(PSTR("}"));
+     }
    } else {
      //WSContentSend_PD(PSTR("%s"),b_mqtt_data);
    }

From 2ff5de0b2fba7f44a4decb20054f0e2087d61ce9 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 16 Apr 2021 11:25:49 +0200
Subject: [PATCH 2/4] Change SPIFFS partions

---
 esp32_partition_app1856k_spiffs320k.csv          |   6 ++++++
 esp32_partition_app2944k_spiffs10M.csv           |   6 ++++++
 platformio_tasmota32.ini                         |   2 +-
 platformio_tasmota_env32.ini                     |   4 ++--
 .../Odroid_go_and_core2/Core2_flash_10M.bat      |   1 +
 .../{Core2_flash.bat => Core2_flash_12M.bat}     |   0
 .../Odroid_go_and_core2/Odroid_flash_10M.bat     |   1 +
 .../{Odroid_flash.bat => Odroid_flash_12M.bat}   |   0
 .../partitions_spiffs_10M.bin                    | Bin 0 -> 3072 bytes
 9 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 esp32_partition_app1856k_spiffs320k.csv
 create mode 100644 esp32_partition_app2944k_spiffs10M.csv
 create mode 100644 tools/Esptool/Odroid_go_and_core2/Core2_flash_10M.bat
 rename tools/Esptool/Odroid_go_and_core2/{Core2_flash.bat => Core2_flash_12M.bat} (100%)
 create mode 100644 tools/Esptool/Odroid_go_and_core2/Odroid_flash_10M.bat
 rename tools/Esptool/Odroid_go_and_core2/{Odroid_flash.bat => Odroid_flash_12M.bat} (100%)
 create mode 100644 tools/Esptool/Odroid_go_and_core2/partitions_spiffs_10M.bin

diff --git a/esp32_partition_app1856k_spiffs320k.csv b/esp32_partition_app1856k_spiffs320k.csv
new file mode 100644
index 000000000..09659603f
--- /dev/null
+++ b/esp32_partition_app1856k_spiffs320k.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x1D0000,
+app1,     app,  ota_1,   0x1E0000, 0x1D0000,
+spiffs,   data, spiffs,  0x3B0000,0x50000,
diff --git a/esp32_partition_app2944k_spiffs10M.csv b/esp32_partition_app2944k_spiffs10M.csv
new file mode 100644
index 000000000..f87b84a9c
--- /dev/null
+++ b/esp32_partition_app2944k_spiffs10M.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x2F0000,
+app1,     app,  ota_1,   0x300000, 0x2F0000,
+spiffs,   data, spiffs,  0x5F0000,0xA10000,
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index abf1d0199..3a8c42192 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -10,7 +10,7 @@ board                       = esp32dev
 board_build.filesystem      = ${common.board_build.filesystem}
 custom_unpack_dir           = ${common.custom_unpack_dir}
 board_build.ldscript        = esp32_out.ld
-board_build.partitions      = esp32_partition_app1984k_spiffs64k.csv
+board_build.partitions      = esp32_partition_app1856k_spiffs320k.csv
 board_build.flash_mode      = ${common.board_build.flash_mode}
 board_build.f_flash         = ${common.board_build.f_flash}
 board_build.f_cpu           = ${common.board_build.f_cpu}
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index f0b85e60b..54722290c 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -50,7 +50,7 @@ board_build.f_cpu       = 240000000L
 board_build.flash_mode  = qio
 board_build.f_flash     = 80000000L
 upload_speed            = 2000000
-board_build.partitions  = esp32_partition_app1984k_spiffs12M.csv
+board_build.partitions  = esp32_partition_app2944k_spiffs10M.csv
 build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_ODROID_GO
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display
 
@@ -61,7 +61,7 @@ board_build.f_cpu       = 240000000L
 board_build.flash_mode  = qio
 board_build.f_flash     = 80000000L
 upload_speed            = 2000000
-board_build.partitions  = esp32_partition_app1984k_spiffs12M.csv
+board_build.partitions  = esp32_partition_app2944k_spiffs10M.csv
 build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_M5STACK_CORE2
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio
 
diff --git a/tools/Esptool/Odroid_go_and_core2/Core2_flash_10M.bat b/tools/Esptool/Odroid_go_and_core2/Core2_flash_10M.bat
new file mode 100644
index 000000000..7f978acb2
--- /dev/null
+++ b/tools/Esptool/Odroid_go_and_core2/Core2_flash_10M.bat
@@ -0,0 +1 @@
+esptool.py --chip esp32 --baud 2000000 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0x1000 bootloader_qio_80m.bin 0x8000 partitions_spiffs_10M.bin 0xe000 boot_app0.bin 0x10000 tasmota32-core2.bin
diff --git a/tools/Esptool/Odroid_go_and_core2/Core2_flash.bat b/tools/Esptool/Odroid_go_and_core2/Core2_flash_12M.bat
similarity index 100%
rename from tools/Esptool/Odroid_go_and_core2/Core2_flash.bat
rename to tools/Esptool/Odroid_go_and_core2/Core2_flash_12M.bat
diff --git a/tools/Esptool/Odroid_go_and_core2/Odroid_flash_10M.bat b/tools/Esptool/Odroid_go_and_core2/Odroid_flash_10M.bat
new file mode 100644
index 000000000..fde9850e0
--- /dev/null
+++ b/tools/Esptool/Odroid_go_and_core2/Odroid_flash_10M.bat
@@ -0,0 +1 @@
+esptool.py --chip esp32 --baud 2000000 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0x1000 bootloader_qio_80m.bin 0x8000 partitions_spiffs_10M.bin 0xe000 boot_app0.bin 0x10000 tasmota32-odroid.bin
diff --git a/tools/Esptool/Odroid_go_and_core2/Odroid_flash.bat b/tools/Esptool/Odroid_go_and_core2/Odroid_flash_12M.bat
similarity index 100%
rename from tools/Esptool/Odroid_go_and_core2/Odroid_flash.bat
rename to tools/Esptool/Odroid_go_and_core2/Odroid_flash_12M.bat
diff --git a/tools/Esptool/Odroid_go_and_core2/partitions_spiffs_10M.bin b/tools/Esptool/Odroid_go_and_core2/partitions_spiffs_10M.bin
new file mode 100644
index 0000000000000000000000000000000000000000..08781f13a1eb77b9c5bdeea885dcbd80c2236418
GIT binary patch
literal 3072
zcmZ1#z{tcffq{V`fPo>etQg2Z1*-xW85kY_#S|DA@=Fp^5=#<M6s!th5MW>cs$tM)
zNGvEYK#>G;fbxP23?N~!ydkDMV-o{IJWzNcLvcZ7S{j-YUcdg20<z}u{x7T%f9ZSv
qHdpnTqdX{*qnyzY7!85Z5Eu=C(GVC7fzc2c4S~@R7!3iuApihz#$V(B

literal 0
HcmV?d00001


From f7b45ffddbdbe94322080fc743e0b9e05642cecd Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 16 Apr 2021 11:40:38 +0200
Subject: [PATCH 3/4] Redesigned GUI

Redesigned GUI by moving non-configuration buttons from ``Configuration`` to new submenu ``Consoles``
---
 CHANGELOG.md                           |  1 +
 RELEASENOTES.md                        |  1 +
 tasmota/tasmota.h                      |  2 +-
 tasmota/tasmota_configurations_ESP32.h |  1 +
 tasmota/xdrv_01_webserver.ino          | 63 +++++++++++++++++++++-----
 tasmota/xdrv_10_scripter.ino           | 10 ++--
 tasmota/xdrv_50_filesystem.ino         |  8 +++-
 tasmota/xdrv_52_9_berry.ino            | 12 +++--
 8 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41ec5a960..7b5b9e848 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 - In tasmota-sensors.bin enabled support for VL53L0X and disabled TSL2561 (#11711)
 - Add HLW8012/BL0937 average pulse calculation by Alex Lovett (#11722)
 - Redesigned initial GUI wifi configuration by Adrian Scillato (#11693)
+- Redesigned GUI by moving non-configuration buttons from ``Configuration`` to new submenu ``Consoles``
 
 ### Fixed
 - Telegram chat id incorrect size (#11660)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 921800545..4a7ba03a6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -120,6 +120,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - ADC range result from int to float using command ``FreqRes`` for decimal resolution selection [#11545](https://github.com/arendst/Tasmota/issues/11545)
 - Removed overtemp detection on external energy monitoring devices [#11628](https://github.com/arendst/Tasmota/issues/11628)
 - Redesigned initial GUI wifi configuration by Adrian Scillato [#11693](https://github.com/arendst/Tasmota/issues/11693)
+- Redesigned GUI by moving non-configuration buttons from ``Configuration`` to new submenu ``Consoles``
 - In tasmota-sensors.bin enabled support for VL53L0X and disabled TSL2561 [#11711](https://github.com/arendst/Tasmota/issues/11711)
 - Add HLW8012/BL0937 average pulse calculation by Alex Lovett [#11722](https://github.com/arendst/Tasmota/issues/11722)
 
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index c9d58fd05..bd8c392ee 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -310,7 +310,7 @@ enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_PIN_STATE, FUNC_MODULE_INIT, FU
                     FUNC_SET_POWER, FUNC_SET_DEVICE_POWER, FUNC_SHOW_SENSOR, FUNC_ANY_KEY,
                     FUNC_ENERGY_EVERY_SECOND, FUNC_ENERGY_RESET,
                     FUNC_RULES_PROCESS, FUNC_SERIAL, FUNC_FREE_MEM, FUNC_BUTTON_PRESSED,
-                    FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_MANAGEMENT_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON,
+                    FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_CONSOLE_BUTTON, FUNC_WEB_ADD_MANAGEMENT_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON,
                     FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME, FUNC_HOTPLUG_SCAN,
                     FUNC_DEVICE_GROUP_ITEM };
 
diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h
index 20723fd69..daa2b43f8 100644
--- a/tasmota/tasmota_configurations_ESP32.h
+++ b/tasmota/tasmota_configurations_ESP32.h
@@ -128,6 +128,7 @@
   #define USE_SCRIPT_GLOBVARS
   #define USE_SCRIPT_SUB_COMMAND
   #define USE_ANGLE_FUNC
+  #define USE_SCRIPT_WEB_DISPLAY
   #define SCRIPT_FULL_WEBPAGE
   #define SCRIPT_GET_HTTPS_JP
   #define USE_GOOGLE_CHARTS
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 5b97d04db..f18cc0b4b 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -361,16 +361,19 @@ const char HTTP_DEVICE_STATE[] PROGMEM = "<td style='width:%d%%;text-align:cente
 
 enum ButtonTitle {
   BUTTON_RESTART, BUTTON_RESET_CONFIGURATION,
-  BUTTON_MAIN, BUTTON_CONFIGURATION, BUTTON_INFORMATION, BUTTON_FIRMWARE_UPGRADE, BUTTON_CONSOLE,
-  BUTTON_MODULE, BUTTON_WIFI, BUTTON_LOGGING, BUTTON_OTHER, BUTTON_TEMPLATE, BUTTON_BACKUP, BUTTON_RESTORE };
+  BUTTON_MAIN, BUTTON_CONFIGURATION, BUTTON_INFORMATION, BUTTON_FIRMWARE_UPGRADE, BUTTON_MANAGEMENT,
+  BUTTON_MODULE, BUTTON_WIFI, BUTTON_LOGGING, BUTTON_OTHER, BUTTON_TEMPLATE, BUTTON_BACKUP, BUTTON_RESTORE,
+  BUTTON_CONSOLE };
 const char kButtonTitle[] PROGMEM =
   D_RESTART "|" D_RESET_CONFIGURATION "|"
-  D_MAIN_MENU "|" D_CONFIGURATION "|" D_INFORMATION "|" D_FIRMWARE_UPGRADE "|" D_CONSOLE "|"
-  D_CONFIGURE_MODULE "|" D_CONFIGURE_WIFI"|" D_CONFIGURE_LOGGING "|" D_CONFIGURE_OTHER "|" D_CONFIGURE_TEMPLATE "|" D_BACKUP_CONFIGURATION "|" D_RESTORE_CONFIGURATION;
+  D_MAIN_MENU "|" D_CONFIGURATION "|" D_INFORMATION "|" D_FIRMWARE_UPGRADE "|" D_MANAGEMENT "|"
+  D_CONFIGURE_MODULE "|" D_CONFIGURE_WIFI"|" D_CONFIGURE_LOGGING "|" D_CONFIGURE_OTHER "|" D_CONFIGURE_TEMPLATE "|" D_BACKUP_CONFIGURATION "|" D_RESTORE_CONFIGURATION "|"
+  D_CONSOLE;
 const char kButtonAction[] PROGMEM =
   ".|rt|"
-  ".|cn|in|up|cs|"
-  "md|wi|lg|co|tp|dl|rs";
+  ".|cn|in|up|mn|"
+  "md|wi|lg|co|tp|dl|rs|"
+  "cs";
 const char kButtonConfirm[] PROGMEM = D_CONFIRM_RESTART "|" D_CONFIRM_RESET_CONFIGURATION;
 
 enum CTypes { CT_HTML, CT_PLAIN, CT_XML, CT_STREAM, CT_APP_JSON, CT_APP_STREAM };
@@ -452,6 +455,7 @@ const WebServerDispatch_t WebServerDispatch[] PROGMEM = {
   { "u1", HTTP_ANY, HandleUpgradeFirmwareStart },   // OTA
   { "u2", HTTP_OPTIONS, HandlePreflightRequest },
   { "u3", HTTP_ANY, HandleUploadDone },
+  { "mn", HTTP_GET, HandleManagement },
   { "cs", HTTP_GET, HandleConsole },
   { "cs", HTTP_OPTIONS, HandlePreflightRequest },
   { "cm", HTTP_ANY, HandleHttpCommand },
@@ -952,6 +956,19 @@ void HandleWifiLogin(void)
   WSContentStop();
 }
 
+uint32_t WebUseManagementSubmenu(void) {
+  static uint32_t management_count = 0;
+
+  if (!management_count) {
+    XdrvMailbox.index = 1;
+    XdrvCall(FUNC_WEB_ADD_CONSOLE_BUTTON);
+    XsnsCall(FUNC_WEB_ADD_CONSOLE_BUTTON);
+    XdrvCall(FUNC_WEB_ADD_MANAGEMENT_BUTTON);
+    management_count = XdrvMailbox.index;
+  }
+  return management_count -1;
+}
+
 uint32_t WebDeviceColumns(void) {
   const uint32_t max_columns = 8;
 
@@ -1185,12 +1202,17 @@ void HandleRoot(void)
   if (HTTP_ADMIN == Web.state) {
 #ifdef FIRMWARE_MINIMAL
     WSContentSpaceButton(BUTTON_FIRMWARE_UPGRADE);
+    WSContentButton(BUTTON_CONSOLE);
 #else
     WSContentSpaceButton(BUTTON_CONFIGURATION);
     WSContentButton(BUTTON_INFORMATION);
     WSContentButton(BUTTON_FIRMWARE_UPGRADE);
+    if (!WebUseManagementSubmenu()) {
+      WSContentButton(BUTTON_CONSOLE);
+    } else {
+      WSContentButton(BUTTON_MANAGEMENT);
+    }
 #endif  // Not FIRMWARE_MINIMAL
-    WSContentButton(BUTTON_CONSOLE);
     WSContentButton(BUTTON_RESTART);
   }
   WSContentStop();
@@ -1412,9 +1434,6 @@ void HandleConfiguration(void)
   WSContentButton(BUTTON_BACKUP);
   WSContentButton(BUTTON_RESTORE);
 
-  WSContentSend_P(PSTR("<div></div>"));            // 5px padding
-  XdrvCall(FUNC_WEB_ADD_MANAGEMENT_BUTTON);
-
   WSContentSpaceButton(BUTTON_MAIN);
   WSContentStop();
 }
@@ -2888,6 +2907,28 @@ void HandleHttpCommand(void)
 
 /*-------------------------------------------------------------------------------------------*/
 
+void HandleManagement(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_MANAGEMENT));
+
+  WSContentStart_P(PSTR(D_MANAGEMENT));
+  WSContentSendStyle();
+
+  WSContentButton(BUTTON_CONSOLE);
+
+  XdrvMailbox.index = 0;
+  XdrvCall(FUNC_WEB_ADD_CONSOLE_BUTTON);
+  XsnsCall(FUNC_WEB_ADD_CONSOLE_BUTTON);
+
+  WSContentSend_P(PSTR("<div></div>"));            // 5px padding
+  XdrvCall(FUNC_WEB_ADD_MANAGEMENT_BUTTON);
+
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+}
+
 void HandleConsole(void)
 {
   if (!HttpCheckPriviledgedAccess()) { return; }
@@ -2903,7 +2944,7 @@ void HandleConsole(void)
   WSContentSend_P(HTTP_SCRIPT_CONSOL, Settings.web_refresh);
   WSContentSendStyle();
   WSContentSend_P(HTTP_FORM_CMND);
-  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentSpaceButton((WebUseManagementSubmenu()) ? BUTTON_MANAGEMENT : BUTTON_MAIN);
   WSContentStop();
 }
 
diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino
index c3097fc64..372cfa994 100755
--- a/tasmota/xdrv_10_scripter.ino
+++ b/tasmota/xdrv_10_scripter.ino
@@ -5249,7 +5249,7 @@ void HandleScriptConfiguration(void) {
 #endif //USE_SCRIPT_FATFS
 
     WSContentSend_P(HTTP_SCRIPT_FORM_END);
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
+    WSContentSpaceButton(BUTTON_MANAGEMENT);
     WSContentStop();
 }
 
@@ -7897,8 +7897,12 @@ bool Xdrv10(uint8_t function)
       }
       break;
 #ifdef USE_WEBSERVER
-    case FUNC_WEB_ADD_BUTTON:
-      WSContentSend_P(HTTP_BTN_MENU_RULES);
+    case FUNC_WEB_ADD_CONSOLE_BUTTON:
+      if (XdrvMailbox.index) {
+        XdrvMailbox.index++;
+      } else {
+        WSContentSend_P(HTTP_BTN_MENU_RULES);
+      }
       break;
 #ifdef USE_SCRIPT_WEB_DISPLAY
     case FUNC_WEB_ADD_MAIN_BUTTON:
diff --git a/tasmota/xdrv_50_filesystem.ino b/tasmota/xdrv_50_filesystem.ino
index b745d8594..6f3289145 100644
--- a/tasmota/xdrv_50_filesystem.ino
+++ b/tasmota/xdrv_50_filesystem.ino
@@ -661,7 +661,7 @@ void UfsDirectory(void) {
   }
   WSContentSend_P(UFS_FORM_SDC_DIRc);
   WSContentSend_P(UFS_FORM_FILE_UPGb);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentSpaceButton(BUTTON_MANAGEMENT);
   WSContentStop();
 
   Web.upload_file_type = UPL_UFSFILE;
@@ -1045,7 +1045,11 @@ bool Xdrv50(uint8_t function) {
 #ifdef USE_WEBSERVER
     case FUNC_WEB_ADD_MANAGEMENT_BUTTON:
       if (ufs_type) {
-        WSContentSend_PD(UFS_WEB_DIR, PSTR(D_MANAGE_FILE_SYSTEM));
+        if (XdrvMailbox.index) {
+          XdrvMailbox.index++;
+        } else {
+          WSContentSend_PD(UFS_WEB_DIR, PSTR(D_MANAGE_FILE_SYSTEM));
+        }
       }
       break;
     case FUNC_WEB_ADD_HANDLER:
diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino
index f9994f271..de0681cf9 100644
--- a/tasmota/xdrv_52_9_berry.ino
+++ b/tasmota/xdrv_52_9_berry.ino
@@ -636,7 +636,7 @@ void HandleBerryConsole(void)
   WSContentFlush();
   _WSContentSend(HTTP_BERRY_STYLE_CMND);
   _WSContentSend(HTTP_BERRY_FORM_CMND);
-  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentSpaceButton(BUTTON_MANAGEMENT);
   WSContentStop();
 }
 
@@ -721,9 +721,13 @@ bool Xdrv52(uint8_t function)
     // case FUNC_SET_POWER:
     //   break;
 #ifdef USE_WEBSERVER
-    case FUNC_WEB_ADD_BUTTON:
-      WSContentSend_P(HTTP_BTN_BERRY_CONSOLE);
-      callBerryEventDispatcher(PSTR("web_add_button"), nullptr, 0, nullptr);
+    case FUNC_WEB_ADD_CONSOLE_BUTTON:
+      if (XdrvMailbox.index) {
+        XdrvMailbox.index++;
+      } else {
+        WSContentSend_P(HTTP_BTN_BERRY_CONSOLE);
+        callBerryEventDispatcher(PSTR("web_add_button"), nullptr, 0, nullptr);
+      }
       break;
     case FUNC_WEB_ADD_MAIN_BUTTON:
       callBerryEventDispatcher(PSTR("web_add_main_button"), nullptr, 0, nullptr);

From 90422bc3071bf39b6dfcca4680cc9cce4ab66b8d Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 16 Apr 2021 11:43:26 +0200
Subject: [PATCH 4/4] Oops I did it again

---
 tasmota/language/af_AF.h | 1 +
 tasmota/language/bg_BG.h | 1 +
 tasmota/language/cs_CZ.h | 1 +
 tasmota/language/de_DE.h | 1 +
 tasmota/language/el_GR.h | 1 +
 tasmota/language/en_GB.h | 1 +
 tasmota/language/es_ES.h | 1 +
 tasmota/language/fr_FR.h | 1 +
 tasmota/language/fy_NL.h | 1 +
 tasmota/language/he_HE.h | 1 +
 tasmota/language/hu_HU.h | 1 +
 tasmota/language/it_IT.h | 5 +++--
 tasmota/language/ko_KO.h | 1 +
 tasmota/language/nl_NL.h | 1 +
 tasmota/language/pl_PL.h | 1 +
 tasmota/language/pt_BR.h | 1 +
 tasmota/language/pt_PT.h | 1 +
 tasmota/language/ro_RO.h | 1 +
 tasmota/language/ru_RU.h | 1 +
 tasmota/language/sk_SK.h | 1 +
 tasmota/language/sv_SE.h | 1 +
 tasmota/language/tr_TR.h | 1 +
 tasmota/language/uk_UA.h | 1 +
 tasmota/language/vi_VN.h | 1 +
 tasmota/language/zh_CN.h | 1 +
 tasmota/language/zh_TW.h | 1 +
 26 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
index 297ca7de0..6c6c9ba54 100644
--- a/tasmota/language/af_AF.h
+++ b/tasmota/language/af_AF.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Konfigurasie"
 #define D_INFORMATION "Inligting"
 #define D_FIRMWARE_UPGRADE "Firmware-opgradering"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Konsole"
 #define D_CONFIRM_RESTART "Bevestig weer te begin"
 
diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
index 589503792..0a8e606ee 100644
--- a/tasmota/language/bg_BG.h
+++ b/tasmota/language/bg_BG.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Конфигурация"
 #define D_INFORMATION "Информация"
 #define D_FIRMWARE_UPGRADE "Обновяване на фърмуера"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Конзола"
 #define D_CONFIRM_RESTART "Потвърдете рестартирането"
 
diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
index 9694301ee..84f022a50 100644
--- a/tasmota/language/cs_CZ.h
+++ b/tasmota/language/cs_CZ.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Nastavení"
 #define D_INFORMATION "Informace"
 #define D_FIRMWARE_UPGRADE "Aktualizace firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Konzole"
 #define D_CONFIRM_RESTART "Potvrzení restartu"
 
diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
index 5e57ebff9..42498308e 100644
--- a/tasmota/language/de_DE.h
+++ b/tasmota/language/de_DE.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Einstellungen"
 #define D_INFORMATION "Informationen"
 #define D_FIRMWARE_UPGRADE "Firmware Update"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Konsole"
 #define D_CONFIRM_RESTART "Wirklich neustarten?"
 
diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
index 27e4b332b..55e3a99de 100644
--- a/tasmota/language/el_GR.h
+++ b/tasmota/language/el_GR.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Ρυθμίσεις"
 #define D_INFORMATION "Πληροφορίες"
 #define D_FIRMWARE_UPGRADE "Αναβάθμιση"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Κονσόλα"
 #define D_CONFIRM_RESTART "Επιβεβαίωση επανεκκίνησης"
 
diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
index b592fc826..5ea16fdf3 100644
--- a/tasmota/language/en_GB.h
+++ b/tasmota/language/en_GB.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Configuration"
 #define D_INFORMATION "Information"
 #define D_FIRMWARE_UPGRADE "Firmware Upgrade"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Console"
 #define D_CONFIRM_RESTART "Confirm Restart"
 
diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
index acc823221..bac302306 100644
--- a/tasmota/language/es_ES.h
+++ b/tasmota/language/es_ES.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Configuración"
 #define D_INFORMATION "Información"
 #define D_FIRMWARE_UPGRADE "Actualizar Firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Consola"
 #define D_CONFIRM_RESTART "Confirmar Reinicio"
 
diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h
index aa74db5dd..dd590b905 100644
--- a/tasmota/language/fr_FR.h
+++ b/tasmota/language/fr_FR.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Configuration"
 #define D_INFORMATION "Informations"
 #define D_FIRMWARE_UPGRADE "Mise à jour du Firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Console"
 #define D_CONFIRM_RESTART "Confirmer redémarrage"
 
diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h
index d76bf3fb9..2e87da726 100644
--- a/tasmota/language/fy_NL.h
+++ b/tasmota/language/fy_NL.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Konfiguraasje"
 #define D_INFORMATION "Ynformaasje"
 #define D_FIRMWARE_UPGRADE "Opwurdearje"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Konsole"
 #define D_CONFIRM_RESTART "Befestigje opnij starte"
 
diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
index 7d360e060..c58d58571 100644
--- a/tasmota/language/he_HE.h
+++ b/tasmota/language/he_HE.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "הגדרות"
 #define D_INFORMATION "מידע"
 #define D_FIRMWARE_UPGRADE "שדרוג קושחה"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "קונסול"
 #define D_CONFIRM_RESTART "אישור הפעלה מחדש"
 
diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
index eb6f6b41b..fd143a725 100644
--- a/tasmota/language/hu_HU.h
+++ b/tasmota/language/hu_HU.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Beállítások"
 #define D_INFORMATION "Információ"
 #define D_FIRMWARE_UPGRADE "Firmware frissítés"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Konzol"
 #define D_CONFIRM_RESTART "Biztosan újraindítsam a modult?"
 
diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
index 0c27874f2..96eb91ee0 100644
--- a/tasmota/language/it_IT.h
+++ b/tasmota/language/it_IT.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION        "Impostazioni"
 #define D_INFORMATION          "Informazioni"
 #define D_FIRMWARE_UPGRADE     "Aggiorna firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE              "Console"
 #define D_CONFIRM_RESTART      "Conferma riavvio"
 
@@ -267,8 +268,8 @@
 #define D_CONFIGURE_OTHER              "Altre impostazioni"
 #define D_CONFIRM_RESET_CONFIGURATION  "Conferma ripristino impostazioni"
 #define D_RESET_CONFIGURATION          "Impostazioni predefinite"
-#define D_BACKUP_CONFIGURATION         "Salva impostazioni"
-#define D_RESTORE_CONFIGURATION        "Carica impostazioni"
+#define D_BACKUP_CONFIGURATION         "Backup impostazioni"
+#define D_RESTORE_CONFIGURATION        "Ripristino impostazioni"
 #define D_MAIN_MENU                    "Menu principale"
 
 #define D_MODULE_PARAMETERS  "Parametri modulo"
diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
index 9cce3e4ad..963c784cc 100644
--- a/tasmota/language/ko_KO.h
+++ b/tasmota/language/ko_KO.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "설정 메뉴"
 #define D_INFORMATION "정보"
 #define D_FIRMWARE_UPGRADE "펌웨어 업그레이드"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "콘솔"
 #define D_CONFIRM_RESTART "재시작"
 
diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
index 7917a6dd7..6d1b78244 100644
--- a/tasmota/language/nl_NL.h
+++ b/tasmota/language/nl_NL.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Configuratie"
 #define D_INFORMATION "Informatie"
 #define D_FIRMWARE_UPGRADE "Opwaarderen"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Console"
 #define D_CONFIRM_RESTART "Bevestig herstart"
 
diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
index ee345765b..354fb9df4 100644
--- a/tasmota/language/pl_PL.h
+++ b/tasmota/language/pl_PL.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Konfiguracja"
 #define D_INFORMATION "Informacje"
 #define D_FIRMWARE_UPGRADE "Aktualizacja oprogramowania"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Konsola"
 #define D_CONFIRM_RESTART "Potwierdź restart"
 
diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
index 3be3dbc04..242fdb38b 100644
--- a/tasmota/language/pt_BR.h
+++ b/tasmota/language/pt_BR.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Configuração"
 #define D_INFORMATION "Informação"
 #define D_FIRMWARE_UPGRADE "Atualização de firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Console"
 #define D_CONFIRM_RESTART "Confirmar o reinicio"
 
diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
index 245532523..958adaed0 100644
--- a/tasmota/language/pt_PT.h
+++ b/tasmota/language/pt_PT.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Configuração"
 #define D_INFORMATION "Informação"
 #define D_FIRMWARE_UPGRADE "Atualização de Firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Consola"
 #define D_CONFIRM_RESTART "Confirmar o reinício"
 
diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
index 6c62d0c98..3b39b5162 100644
--- a/tasmota/language/ro_RO.h
+++ b/tasmota/language/ro_RO.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Configurație"
 #define D_INFORMATION "Informație"
 #define D_FIRMWARE_UPGRADE "Actualizare Firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Consolă"
 #define D_CONFIRM_RESTART "Confirmare Restart"
 
diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h
index 4ef363376..b8c86c53d 100644
--- a/tasmota/language/ru_RU.h
+++ b/tasmota/language/ru_RU.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Конфигурация"
 #define D_INFORMATION "Информация"
 #define D_FIRMWARE_UPGRADE "Обновление прошивки"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Консоль"
 #define D_CONFIRM_RESTART "Подтвердить перезагрузку"
 
diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h
index 6570bccdd..774c41113 100644
--- a/tasmota/language/sk_SK.h
+++ b/tasmota/language/sk_SK.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Nastavenia"
 #define D_INFORMATION "Informácie"
 #define D_FIRMWARE_UPGRADE "Aktualizácia firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Konzola"
 #define D_CONFIRM_RESTART "Potvrdenie reštartu"
 
diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h
index c195d4735..d5994fa4a 100644
--- a/tasmota/language/sv_SE.h
+++ b/tasmota/language/sv_SE.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Konfigurering"
 #define D_INFORMATION "Information"
 #define D_FIRMWARE_UPGRADE "Uppgradera firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Konsol"
 #define D_CONFIRM_RESTART "Bekräfta omstart"
 
diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h
index 8064479c7..722fd5bf3 100644
--- a/tasmota/language/tr_TR.h
+++ b/tasmota/language/tr_TR.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Konfigürasyon"
 #define D_INFORMATION "Bilgi"
 #define D_FIRMWARE_UPGRADE "Cihaz yazılımını Güncelle"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Konsol"
 #define D_CONFIRM_RESTART "Yeniden Başlatmayı Onayla"
 
diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h
index 2f18836f1..d71faaa7e 100644
--- a/tasmota/language/uk_UA.h
+++ b/tasmota/language/uk_UA.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Конфігурація"
 #define D_INFORMATION "Інформація"
 #define D_FIRMWARE_UPGRADE "Оновлення прошивки"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Консоль"
 #define D_CONFIRM_RESTART "Підтвердити перезавантаження"
 
diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h
index 5b0c3a247..c35ef7f3d 100644
--- a/tasmota/language/vi_VN.h
+++ b/tasmota/language/vi_VN.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "Cấu hình"
 #define D_INFORMATION "Thông tin"
 #define D_FIRMWARE_UPGRADE "Nâng cấp Firmware"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "Dòng Lệnh"
 #define D_CONFIRM_RESTART "Xác nhận khởi động lại"
 
diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h
index 22580ed43..fe73764c5 100644
--- a/tasmota/language/zh_CN.h
+++ b/tasmota/language/zh_CN.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "设置"
 #define D_INFORMATION "信息"
 #define D_FIRMWARE_UPGRADE "固件升级"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "控制台"
 #define D_CONFIRM_RESTART "确认重启"
 
diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h
index c84fe4607..edb11e329 100644
--- a/tasmota/language/zh_TW.h
+++ b/tasmota/language/zh_TW.h
@@ -256,6 +256,7 @@
 #define D_CONFIGURATION "設定"
 #define D_INFORMATION "資訊"
 #define D_FIRMWARE_UPGRADE "韌體升級"
+#define D_MANAGEMENT "Consoles"
 #define D_CONSOLE "控制台"
 #define D_CONFIRM_RESTART "確認重新啟動"