mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shorten menus and add submenu headers (#22592)

This commit is contained in:
Theo Arends 2024-12-06 17:02:44 +01:00
parent f341f8d35a
commit 4ffc53b465
5 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -36,6 +36,7 @@ All notable changes to this project will be documented in this file.
- Shutter wrong power ON state (#22548) - Shutter wrong power ON state (#22548)
- ESP32-C2 TasmotaLED from not present I2S to SPI (#22575) - ESP32-C2 TasmotaLED from not present I2S to SPI (#22575)
- KNX Scenes index change regression from v14.2.0.4 (#22405) - KNX Scenes index change regression from v14.2.0.4 (#22405)
- Add GUI submenu headers and refresh configuration button text (#22592)
### Removed ### Removed

1
RELEASENOTES.md
View File

@ -157,6 +157,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
- ESP32 LVGL library from v9.2.0 to v9.2.2 [#22385](https://github.com/arendst/Tasmota/issues/22385) - ESP32 LVGL library from v9.2.0 to v9.2.2 [#22385](https://github.com/arendst/Tasmota/issues/22385)
- ESP32 replaced NeoPixelBus with TasmotaLED [#22556](https://github.com/arendst/Tasmota/issues/22556) - ESP32 replaced NeoPixelBus with TasmotaLED [#22556](https://github.com/arendst/Tasmota/issues/22556)
- Redesign GUI adding feedback to buttons, shutters and lights - Redesign GUI adding feedback to buttons, shutters and lights
- Add GUI submenu headers and refresh configuration button text (#22592)
- Use command `WebButton1` to change GUI shutter 1 name - Use command `WebButton1` to change GUI shutter 1 name
- Unit (k)VAr(h) to (k)var(h) [#22435](https://github.com/arendst/Tasmota/issues/22435) - Unit (k)VAr(h) to (k)var(h) [#22435](https://github.com/arendst/Tasmota/issues/22435)
- AHT1X/AHT2X/AHT3X ready for virtual I2C [#22427](https://github.com/arendst/Tasmota/issues/22427) - AHT1X/AHT2X/AHT3X ready for virtual I2C [#22427](https://github.com/arendst/Tasmota/issues/22427)

34
tasmota/language/af_AF.h
View File

@ -280,16 +280,16 @@
#define D_CONSOLE "Konsole" #define D_CONSOLE "Konsole"
#define D_CONFIRM_RESTART "Bevestig weer te begin" #define D_CONFIRM_RESTART "Bevestig weer te begin"
#define D_CONFIGURE_MODULE "Stel Module in" #define D_CONFIGURE_MODULE "Module"
#define D_CONFIGURE_WIFI "Stel WiFi in" #define D_CONFIGURE_WIFI "WiFi"
#define D_CONFIGURE_MQTT "Stel MQTT in" #define D_CONFIGURE_MQTT "MQTT"
#define D_CONFIGURE_DOMOTICZ "Stel Domoticz in" #define D_CONFIGURE_DOMOTICZ "Domoticz"
#define D_CONFIGURE_LOGGING "Stel Logging in" #define D_CONFIGURE_LOGGING "Logging"
#define D_CONFIGURE_OTHER "Stel Ander in" #define D_CONFIGURE_OTHER "Ander"
#define D_CONFIRM_RESET_CONFIGURATION "Bevestig die herstel van die konfigurasie" #define D_CONFIRM_RESET_CONFIGURATION "Bevestig die herstel van die konfigurasie"
#define D_RESET_CONFIGURATION "Stel die konfigurasie terug" #define D_RESET_CONFIGURATION "Stel terug"
#define D_BACKUP_CONFIGURATION "Rugsteun die konfigurasie" #define D_BACKUP_CONFIGURATION "Rugsteun"
#define D_RESTORE_CONFIGURATION "Herstel die konfigurasie" #define D_RESTORE_CONFIGURATION "Herstel"
#define D_START_RESTORE "Start restore" #define D_START_RESTORE "Start restore"
#define D_MAIN_MENU "Hoofkieslys" #define D_MAIN_MENU "Hoofkieslys"
@ -356,7 +356,7 @@
#define D_SINGLE_DEVICE "enkele toestel" #define D_SINGLE_DEVICE "enkele toestel"
#define D_MULTI_DEVICE "multi toestel" #define D_MULTI_DEVICE "multi toestel"
#define D_CONFIGURE_TEMPLATE "Konfigureer sjabloon" #define D_CONFIGURE_TEMPLATE "sjabloon"
#define D_TEMPLATE_PARAMETERS "Sjabloon parameters" #define D_TEMPLATE_PARAMETERS "Sjabloon parameters"
#define D_TEMPLATE_NAME "Naam" #define D_TEMPLATE_NAME "Naam"
#define D_BASE_TYPE "Gebaseer op" #define D_BASE_TYPE "Gebaseer op"
@ -386,10 +386,10 @@
#define D_FLASH_CHIP_SIZE "Flash Size" #define D_FLASH_CHIP_SIZE "Flash Size"
#define D_FREE_PROGRAM_SPACE "Vrye program grootte" #define D_FREE_PROGRAM_SPACE "Vrye program grootte"
#define D_UPGRADE_BY_WEBSERVER "Opgradeer per webbediener" #define D_UPGRADE_BY_WEBSERVER "Per webbediener"
#define D_OTA_URL "OTA Url" #define D_OTA_URL "OTA Url"
#define D_START_UPGRADE "Begin opgradering" #define D_START_UPGRADE "Begin opgradering"
#define D_UPGRADE_BY_FILE_UPLOAD "Gradeer op volgens lêeroplaai" #define D_UPGRADE_BY_FILE_UPLOAD "Volgens lêeroplaai"
#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_FACTORY "Switching to safeboot partition"
#define D_UPLOAD_STARTED "Oplaai begin" #define D_UPLOAD_STARTED "Oplaai begin"
#define D_UPGRADE_STARTED "Opgradering is begin" #define D_UPGRADE_STARTED "Opgradering is begin"
@ -463,7 +463,7 @@
#define D_DOMOTICZ_UPDATE_TIMER "Dateer tydopdatering op" #define D_DOMOTICZ_UPDATE_TIMER "Dateer tydopdatering op"
// xdrv_09_timers.ino // xdrv_09_timers.ino
#define D_CONFIGURE_TIMER "Stel Timer in" #define D_CONFIGURE_TIMER "Timer"
#define D_TIMER_PARAMETERS "Timer-parameters" #define D_TIMER_PARAMETERS "Timer-parameters"
#define D_TIMER_ENABLE "Aktiveer timers" #define D_TIMER_ENABLE "Aktiveer timers"
#define D_TIMER_ARM "Aktiveer" #define D_TIMER_ARM "Aktiveer"
@ -474,7 +474,7 @@
#define D_TIMER_ACTION "Aksie" #define D_TIMER_ACTION "Aksie"
// xdrv_10_knx.ino // xdrv_10_knx.ino
#define D_CONFIGURE_KNX "Stel KNX op" #define D_CONFIGURE_KNX "KNX"
#define D_KNX_PARAMETERS "KNX-parameters" #define D_KNX_PARAMETERS "KNX-parameters"
#define D_KNX_GENERAL_CONFIG "Algemene" #define D_KNX_GENERAL_CONFIG "Algemene"
#define D_KNX_PHYSICAL_ADDRESS "Fisiese adres" #define D_KNX_PHYSICAL_ADDRESS "Fisiese adres"
@ -546,7 +546,7 @@
#define D_DOMOTICZ_SHUTTER "Luik" #define D_DOMOTICZ_SHUTTER "Luik"
// xdrv_28_pcf8574.ino // xdrv_28_pcf8574.ino
#define D_CONFIGURE_PCF8574 "Configure PCF8574" #define D_CONFIGURE_PCF8574 "PCF8574"
#define D_PCF8574_PARAMETERS "PCF8574 parameters" #define D_PCF8574_PARAMETERS "PCF8574 parameters"
#define D_INVERT_PORTS "Keer poorte om" #define D_INVERT_PORTS "Keer poorte om"
#define D_DEVICE "Toestel" #define D_DEVICE "Toestel"
@ -571,7 +571,7 @@
#define D_THERMOSTAT_AUTOTUNE_HYBRID "Autotune (Hybrid)" #define D_THERMOSTAT_AUTOTUNE_HYBRID "Autotune (Hybrid)"
// xdrv_79_esp32_ble.ino // xdrv_79_esp32_ble.ino
#define D_CONFIGURE_BLE "Configure BLE" #define D_CONFIGURE_BLE "BLE"
#define D_BLE_PARAMETERS "Bluetooth Settings" #define D_BLE_PARAMETERS "Bluetooth Settings"
#define D_MQTT_BLE_ENABLE "Enable Bluetooth" #define D_MQTT_BLE_ENABLE "Enable Bluetooth"
#define D_MQTT_BLE_ACTIVESCAN "Enable Active Scan(*)" #define D_MQTT_BLE_ACTIVESCAN "Enable Active Scan(*)"
@ -627,7 +627,7 @@
#define D_HX_CAL_DONE "Gekalibreer" #define D_HX_CAL_DONE "Gekalibreer"
#define D_HX_CAL_FAIL "Kon nie kalibreer nie" #define D_HX_CAL_FAIL "Kon nie kalibreer nie"
#define D_RESET_HX711 "Stel die skaal terug" #define D_RESET_HX711 "Stel die skaal terug"
#define D_CONFIGURE_HX711 "Stel skaal op" #define D_CONFIGURE_HX711 "skaal"
#define D_HX711_PARAMETERS "Skaal parameters" #define D_HX711_PARAMETERS "Skaal parameters"
#define D_ITEM_WEIGHT "Gewig van die item" #define D_ITEM_WEIGHT "Gewig van die item"
#define D_REFERENCE_WEIGHT "Verwysingsgewig" #define D_REFERENCE_WEIGHT "Verwysingsgewig"

36
tasmota/language/en_GB.h
View File

@ -280,16 +280,16 @@
#define D_CONSOLE "Console" #define D_CONSOLE "Console"
#define D_CONFIRM_RESTART "Confirm Restart" #define D_CONFIRM_RESTART "Confirm Restart"
#define D_CONFIGURE_MODULE "Configure Module" #define D_CONFIGURE_MODULE "Module"
#define D_CONFIGURE_WIFI "Configure WiFi" #define D_CONFIGURE_WIFI "WiFi"
#define D_CONFIGURE_MQTT "Configure MQTT" #define D_CONFIGURE_MQTT "MQTT"
#define D_CONFIGURE_DOMOTICZ "Configure Domoticz" #define D_CONFIGURE_DOMOTICZ "Domoticz"
#define D_CONFIGURE_LOGGING "Configure Logging" #define D_CONFIGURE_LOGGING "Logging"
#define D_CONFIGURE_OTHER "Configure Other" #define D_CONFIGURE_OTHER "Other"
#define D_CONFIRM_RESET_CONFIGURATION "Confirm Reset Configuration" #define D_CONFIRM_RESET_CONFIGURATION "Confirm Reset Configuration"
#define D_RESET_CONFIGURATION "Reset Configuration" #define D_RESET_CONFIGURATION "Reset"
#define D_BACKUP_CONFIGURATION "Backup Configuration" #define D_BACKUP_CONFIGURATION "Backup"
#define D_RESTORE_CONFIGURATION "Restore Configuration" #define D_RESTORE_CONFIGURATION "Restore"
#define D_START_RESTORE "Start restore" #define D_START_RESTORE "Start restore"
#define D_MAIN_MENU "Main Menu" #define D_MAIN_MENU "Main Menu"
@ -356,7 +356,7 @@
#define D_SINGLE_DEVICE "single device" #define D_SINGLE_DEVICE "single device"
#define D_MULTI_DEVICE "multi device" #define D_MULTI_DEVICE "multi device"
#define D_CONFIGURE_TEMPLATE "Configure Template" #define D_CONFIGURE_TEMPLATE "Template"
#define D_TEMPLATE_PARAMETERS "Template parameters" #define D_TEMPLATE_PARAMETERS "Template parameters"
#define D_TEMPLATE_NAME "Name" #define D_TEMPLATE_NAME "Name"
#define D_BASE_TYPE "Based on" #define D_BASE_TYPE "Based on"
@ -386,10 +386,10 @@
#define D_FLASH_CHIP_SIZE "Flash Size" #define D_FLASH_CHIP_SIZE "Flash Size"
#define D_FREE_PROGRAM_SPACE "Free Program Space" #define D_FREE_PROGRAM_SPACE "Free Program Space"
#define D_UPGRADE_BY_WEBSERVER "Upgrade by web server" #define D_UPGRADE_BY_WEBSERVER "Use web server"
#define D_OTA_URL "OTA Url" #define D_OTA_URL "OTA Url"
#define D_START_UPGRADE "Start upgrade" #define D_START_UPGRADE "Start upgrade"
#define D_UPGRADE_BY_FILE_UPLOAD "Upgrade by file upload" #define D_UPGRADE_BY_FILE_UPLOAD "Use file upload"
#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_FACTORY "Switching to safeboot partition"
#define D_UPLOAD_STARTED "Upload started" #define D_UPLOAD_STARTED "Upload started"
#define D_UPGRADE_STARTED "Upgrade started" #define D_UPGRADE_STARTED "Upgrade started"
@ -463,7 +463,7 @@
#define D_DOMOTICZ_UPDATE_TIMER "Update timer" #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
// xdrv_09_timers.ino // xdrv_09_timers.ino
#define D_CONFIGURE_TIMER "Configure Timer" #define D_CONFIGURE_TIMER "Timer"
#define D_TIMER_PARAMETERS "Timer parameters" #define D_TIMER_PARAMETERS "Timer parameters"
#define D_TIMER_ENABLE "Enable Timers" #define D_TIMER_ENABLE "Enable Timers"
#define D_TIMER_ARM "Enable" #define D_TIMER_ARM "Enable"
@ -474,7 +474,7 @@
#define D_TIMER_ACTION "Action" #define D_TIMER_ACTION "Action"
// xdrv_10_knx.ino // xdrv_10_knx.ino
#define D_CONFIGURE_KNX "Configure KNX" #define D_CONFIGURE_KNX "KNX"
#define D_KNX_PARAMETERS "KNX Parameters" #define D_KNX_PARAMETERS "KNX Parameters"
#define D_KNX_GENERAL_CONFIG "General" #define D_KNX_GENERAL_CONFIG "General"
#define D_KNX_PHYSICAL_ADDRESS "Physical Address" #define D_KNX_PHYSICAL_ADDRESS "Physical Address"
@ -528,7 +528,7 @@
// xdrv_89_dali.ino // xdrv_89_dali.ino
#define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_RX "Dali RX"
#define D_SENSOR_DALI_TX "Dali TX" #define D_SENSOR_DALI_TX "Dali TX"
#define D_CONFIGURE_DALI "Config DALI" #define D_CONFIGURE_DALI "DALI"
// xdrv_03_energy.ino // xdrv_03_energy.ino
#define D_ENERGY_TODAY "Energy Today" #define D_ENERGY_TODAY "Energy Today"
@ -546,7 +546,7 @@
#define D_DOMOTICZ_SHUTTER "Shutter" #define D_DOMOTICZ_SHUTTER "Shutter"
// xdrv_28_pcf8574.ino // xdrv_28_pcf8574.ino
#define D_CONFIGURE_PCF8574 "Configure PCF8574" #define D_CONFIGURE_PCF8574 "PCF8574"
#define D_PCF8574_PARAMETERS "PCF8574 parameters" #define D_PCF8574_PARAMETERS "PCF8574 parameters"
#define D_INVERT_PORTS "Invert Ports" #define D_INVERT_PORTS "Invert Ports"
#define D_DEVICE "Device" #define D_DEVICE "Device"
@ -571,7 +571,7 @@
#define D_THERMOSTAT_AUTOTUNE_HYBRID "Autotune (Hybrid)" #define D_THERMOSTAT_AUTOTUNE_HYBRID "Autotune (Hybrid)"
// xdrv_79_esp32_ble.ino // xdrv_79_esp32_ble.ino
#define D_CONFIGURE_BLE "Configure BLE" #define D_CONFIGURE_BLE "BLE"
#define D_BLE_PARAMETERS "Bluetooth Settings" #define D_BLE_PARAMETERS "Bluetooth Settings"
#define D_MQTT_BLE_ENABLE "Enable Bluetooth" #define D_MQTT_BLE_ENABLE "Enable Bluetooth"
#define D_MQTT_BLE_ACTIVESCAN "Enable Active Scan(*)" #define D_MQTT_BLE_ACTIVESCAN "Enable Active Scan(*)"
@ -627,7 +627,7 @@
#define D_HX_CAL_DONE "Calibrated" #define D_HX_CAL_DONE "Calibrated"
#define D_HX_CAL_FAIL "Calibration failed" #define D_HX_CAL_FAIL "Calibration failed"
#define D_RESET_HX711 "Reset Scale" #define D_RESET_HX711 "Reset Scale"
#define D_CONFIGURE_HX711 "Configure Scale" #define D_CONFIGURE_HX711 "Scale"
#define D_HX711_PARAMETERS "Scale parameters" #define D_HX711_PARAMETERS "Scale parameters"
#define D_ITEM_WEIGHT "Item weight" #define D_ITEM_WEIGHT "Item weight"
#define D_REFERENCE_WEIGHT "Reference weight" #define D_REFERENCE_WEIGHT "Reference weight"

8
tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
View File

@ -266,6 +266,9 @@ const char HTTP_HEAD_STYLE3[] PROGMEM =
"<h3>%s</h3>" // Module name "<h3>%s</h3>" // Module name
"<h2>%s</h2>"; // Device name "<h2>%s</h2>"; // Device name
const char HTTP_MENU_HEAD[] PROGMEM =
"<span style='text-align:center;'><h3><hr/>%s<hr/></h3></span>";
const char HTTP_MSG_SLIDER_SHUTTER[] PROGMEM = const char HTTP_MSG_SLIDER_SHUTTER[] PROGMEM =
"<td style='width:70%%'>" "<td style='width:70%%'>"
"<div style='padding:0px 2px;text-align:center;font-size:12px;'><span>%s</span>" "<div style='padding:0px 2px;text-align:center;font-size:12px;'><span>%s</span>"
@ -1952,6 +1955,7 @@ void HandleConfiguration(void) {
WSContentStart_P(PSTR(D_CONFIGURATION)); WSContentStart_P(PSTR(D_CONFIGURATION));
WSContentSendStyle(); WSContentSendStyle();
WSContentSend_P(HTTP_MENU_HEAD, D_CONFIGURATION);
WSContentButton(BUTTON_MODULE); WSContentButton(BUTTON_MODULE);
WSContentButton(BUTTON_WIFI); WSContentButton(BUTTON_WIFI);
@ -2834,6 +2838,7 @@ void HandleInformation(void) {
// }1 = </td></tr><tr><th> // }1 = </td></tr><tr><th>
// }2 = </th><td> // }2 = </th><td>
WSContentSend_P(HTTP_SCRIPT_INFO_BEGIN); WSContentSend_P(HTTP_SCRIPT_INFO_BEGIN);
WSContentSend_P(HTTP_MENU_HEAD, D_INFORMATION);
WSContentSend_P(PSTR("<table style='width:100%%'><tr><th>")); WSContentSend_P(PSTR("<table style='width:100%%'><tr><th>"));
WSContentSend_P(PSTR(D_PROGRAM_VERSION "}2%s %s %s"), TasmotaGlobal.version, TasmotaGlobal.image_name, GetCodeCores().c_str()); WSContentSend_P(PSTR(D_PROGRAM_VERSION "}2%s %s %s"), TasmotaGlobal.version, TasmotaGlobal.image_name, GetCodeCores().c_str());
WSContentSend_P(PSTR("}1" D_BUILD_DATE_AND_TIME "}2%s"), GetBuildDateAndTime().c_str()); WSContentSend_P(PSTR("}1" D_BUILD_DATE_AND_TIME "}2%s"), GetBuildDateAndTime().c_str());
@ -3120,6 +3125,8 @@ void HandleUpgradeFirmware(void) {
WSContentStart_P(PSTR(D_FIRMWARE_UPGRADE)); WSContentStart_P(PSTR(D_FIRMWARE_UPGRADE));
WSContentSendStyle(); WSContentSendStyle();
WSContentSend_P(HTTP_MENU_HEAD, D_FIRMWARE_UPGRADE);
WSContentSend_P(HTTP_FORM_UPG, SettingsTextEscaped(SET_OTAURL).c_str()); WSContentSend_P(HTTP_FORM_UPG, SettingsTextEscaped(SET_OTAURL).c_str());
#ifdef ESP32 #ifdef ESP32
if (EspSingleOtaPartition() && !EspRunningFactoryPartition()) { if (EspSingleOtaPartition() && !EspRunningFactoryPartition()) {
@ -3657,6 +3664,7 @@ void HandleManagement(void) {
WSContentStart_P(PSTR(D_MANAGEMENT)); WSContentStart_P(PSTR(D_MANAGEMENT));
WSContentSendStyle(); WSContentSendStyle();
WSContentSend_P(HTTP_MENU_HEAD, D_MANAGEMENT);
WSContentButton(BUTTON_CONSOLE); WSContentButton(BUTTON_CONSOLE);