"
+#ifdef BE_MINIMAL
+ "
" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "
"
+#endif
+ "
"
+#ifdef LANGUAGE_MODULE_NAME
+ "
" D_MODULE " {ha
"
+#else
+ "{ha " D_MODULE "
"
+#endif
+ "{h}
{j}";
const char HTTP_MSG_SLIDER1[] PROGMEM =
"
" D_COLDLIGHT "" D_WARMLIGHT "
"
"
";
@@ -487,6 +497,7 @@ void ShowPage(String &page, bool auth)
if (HTTP_MANAGER == webserver_state) {
if (WifiConfigCounter()) {
+ page.replace(F(""), FPSTR(HTTP_SCRIPT_COUNTER));
page.replace(F(""), F(""));
page += FPSTR(HTTP_COUNTER);
}
@@ -515,7 +526,6 @@ void WebRestart(uint8_t type)
AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTART);
String page = FPSTR(HTTP_HEAD);
- page += FPSTR(HTTP_HEAD_RELOAD);
page += FPSTR(HTTP_HEAD_STYLE);
if (type) {
@@ -536,6 +546,7 @@ void WebRestart(uint8_t type)
} else {
page += FPSTR(HTTP_BTN_MAIN);
}
+ page.replace(F(""), FPSTR(HTTP_SCRIPT_RELOAD));
ShowPage(page);
ShowWebSource(SRC_WEBGUI);
@@ -588,6 +599,7 @@ void HandleRoot()
char stemp[10];
String page = FPSTR(HTTP_HEAD);
page.replace(F("{v}"), FPSTR(S_MAIN_MENU));
+ page += FPSTR(HTTP_SCRIPT_ROOT);
page += FPSTR(HTTP_HEAD_STYLE);
page.replace(F(""), F(""));
@@ -881,6 +893,7 @@ void HandleWifiConfiguration()
String page = FPSTR(HTTP_HEAD);
page.replace(F("{v}"), FPSTR(S_CONFIGURE_WIFI));
+ page += FPSTR(HTTP_SCRIPT_WIFI);
page += FPSTR(HTTP_HEAD_STYLE);
if (WebServer->hasArg("scan")) {
@@ -1396,6 +1409,7 @@ void HandleUpgradeFirmwareStart()
page += F("
" D_UPGRADE_STARTED " ...
");
page += FPSTR(HTTP_MSG_RSTRT);
page += FPSTR(HTTP_BTN_MAIN);
+// page.replace(F(""), FPSTR(HTTP_SCRIPT_RELOAD));
ShowPage(page);
snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_UPGRADE " 1"));
@@ -1446,6 +1460,7 @@ void HandleUploadDone()
} else {
page += F("green'>" D_SUCCESSFUL "
");
page += FPSTR(HTTP_MSG_RSTRT);
+ page.replace(F(""), FPSTR(HTTP_SCRIPT_RELOAD));
ShowWebSource(SRC_WEBGUI);
restart_flag = 2; // Always restart to re-enable disabled features during update
}