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

Refactor new webserver boarding code

This commit is contained in:
Theo Arends 2021-04-13 12:41:13 +02:00
parent 6fda2401e3
commit 27cee8868b
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tasmota/xdrv_01_webserver.ino
View File

@ -817,20 +817,18 @@ void WSContentButton(uint32_t title_index, bool show=true)
char action[4]; char action[4];
char title[100]; // Large to accomodate UTF-16 as used by Russian char title[100]; // Large to accomodate UTF-16 as used by Russian
WSContentSend_P(PSTR("<p><form id=but%d style=\"display: %s;\" action='%s' method='get'"),
title_index,
show ? "block":"none",
GetTextIndexed(action, sizeof(action), title_index, kButtonAction));
if (title_index <= BUTTON_RESET_CONFIGURATION) { if (title_index <= BUTTON_RESET_CONFIGURATION) {
char confirm[100]; char confirm[100];
WSContentSend_P(PSTR("<p><form id=but%d style=\"display: %s;\" action='%s' method='get' onsubmit='return confirm(\"%s\");'><button name='%s' class='button bred'>%s</button></form></p>"), WSContentSend_P(PSTR(" onsubmit='return confirm(\"%s\");'><button name='%s' class='button bred'>%s</button></form></p>"),
title_index,
show ? "block":"none",
GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
GetTextIndexed(confirm, sizeof(confirm), title_index, kButtonConfirm), GetTextIndexed(confirm, sizeof(confirm), title_index, kButtonConfirm),
(!title_index) ? PSTR("rst") : PSTR("non"), (!title_index) ? PSTR("rst") : PSTR("non"),
GetTextIndexed(title, sizeof(title), title_index, kButtonTitle)); GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
} else { } else {
WSContentSend_P(PSTR("<p><form id=but%d style=\"display: %s;\" action='%s' method='get'><button>%s</button></form></p>"), WSContentSend_P(PSTR("><button>%s</button></form></p>"),
title_index,
show ? "block":"none",
GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
GetTextIndexed(title, sizeof(title), title_index, kButtonTitle)); GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
} }
} }
@ -1925,12 +1923,7 @@ void HandleWifiConfiguration(void) {
} }
} }
if (limitScannedNetworks) { WSContentSend_P(PSTR("<div><a href='/wi?scan='>%s</a></div><br>"), (limitScannedNetworks) ? PSTR(D_SHOW_MORE_WIFI_NETWORKS) : PSTR(D_SCAN_FOR_WIFI_NETWORKS));
WSContentSend_P(PSTR("<div><a href='/wi?scan='>" D_SHOW_MORE_WIFI_NETWORKS "</a></div><br>"));
} else {
WSContentSend_P(PSTR("<div><a href='/wi?scan='>" D_SCAN_FOR_WIFI_NETWORKS "</a></div><br>"));
}
WSContentSend_P(HTTP_FORM_WIFI_PART1, (WifiIsInManagerMode()) ? "" : PSTR(" (" STA_SSID1 ")"), SettingsText(SET_STASSID1)); WSContentSend_P(HTTP_FORM_WIFI_PART1, (WifiIsInManagerMode()) ? "" : PSTR(" (" STA_SSID1 ")"), SettingsText(SET_STASSID1));
if (WifiIsInManagerMode()) { if (WifiIsInManagerMode()) {
// As WIFI_HOSTNAME may contain %s-%04d it cannot be part of HTTP_FORM_WIFI where it will exception // As WIFI_HOSTNAME may contain %s-%04d it cannot be part of HTTP_FORM_WIFI where it will exception
@ -1944,19 +1937,14 @@ void HandleWifiConfiguration(void) {
if (WifiIsInManagerMode()) { if (WifiIsInManagerMode()) {
#ifndef FIRMWARE_MINIMAL #ifndef FIRMWARE_MINIMAL
WSContentSend_P(PSTR("<div style='text-align:center;color:#%06x;'><h3>"), WebColor(COL_TEXT_WARNING));
if (WIFI_TESTING == Web.wifiTest) { if (WIFI_TESTING == Web.wifiTest) {
WSContentSend_P(PSTR("<div style='text-align:center;color:#%06x;'><h3>" D_TRYING_TO_CONNECT "<br>%s</h3></div>"), WSContentSend_P(PSTR(D_TRYING_TO_CONNECT "<br>%s</h3></div>"), SettingsText(SET_STASSID1));
WebColor(COL_TEXT_WARNING),
SettingsText(SET_STASSID1)
);
} else if (WIFI_TEST_FINISHED_BAD == Web.wifiTest) { } else if (WIFI_TEST_FINISHED_BAD == Web.wifiTest) {
WSContentSend_P(PSTR("<div style='text-align:center;color:#%06x;'><h3>" D_CONNECT_FAILED_TO " %s<br>" D_CHECK_CREDENTIALS "</h3></div>"), WSContentSend_P(PSTR(D_CONNECT_FAILED_TO " %s<br>" D_CHECK_CREDENTIALS "</h3></div>"), SettingsText(SET_STASSID1));
WebColor(COL_TEXT_WARNING),
SettingsText(SET_STASSID1)
);
} }
// More Options Button // More Options Button
WSContentSend_P(PSTR("<div id=butmod style=\"display: %s;\"></div><p><form id=butmo style=\"display: %s;\"><button type='button' onclick='hidBtns()'>" D_SHOW_MORE_OPTIONS "</button></form></p>"), WSContentSend_P(PSTR("<div id=butmod style=\"display:%s;\"></div><p><form id=butmo style=\"display:%s;\"><button type='button' onclick='hidBtns()'>" D_SHOW_MORE_OPTIONS "</button></form></p>"),
(WIFI_TEST_FINISHED_BAD == Web.wifiTest) ? "none" : Web.initial_config ? "block" : "none", Web.initial_config ? "block" : "none" (WIFI_TEST_FINISHED_BAD == Web.wifiTest) ? "none" : Web.initial_config ? "block" : "none", Web.initial_config ? "block" : "none"
); );
WSContentSpaceButton(BUTTON_RESTORE, !Web.initial_config); WSContentSpaceButton(BUTTON_RESTORE, !Web.initial_config);