diff --git a/platformio.ini b/platformio.ini index 07a146ab..1b9de84a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -30,7 +30,7 @@ build_flags = ;-Wno-unused-variable -D ATOMIC_FS_UPDATE -D BEARSSL_SSL_BASIC - -D BUILD_VERSION='"GUI-Generic 4.3.1"' + -D BUILD_VERSION='"GUI-Generic 4.3.2"' ;-D DEFAULT_TEMPLATE_BOARD=19 -D SUPLA_ENABLE_GUI ;-D SUPLA_ENABLE_SSL diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h index c9e6efdf..4f0a2aba 100644 --- a/src/SuplaCommonPROGMEM.h +++ b/src/SuplaCommonPROGMEM.h @@ -23,36 +23,63 @@ #define PGMT(pgm_ptr) (reinterpret_cast(pgm_ptr)) const char HTTP_META[] PROGMEM = - "\n"; + "" + "\n"; const char HTTP_STYLE[] PROGMEM = - ""; - + ""; +const char HTTP_SCRIPT[] PROGMEM = + "\n"; +const char HTTP_DIV_START[] PROGMEM = + "
"; +const char HTTP_DIV_END[] PROGMEM = + "
"; const char HTTP_LOGO[] PROGMEM = - "
https://forum.supla.org/\n"; +const char HTTP_IFRAMES[] PROGMEM = + "
" + "
" + "
" + "
"; const char HTTP_FAVICON[] PROGMEM = "sendContent_P(HTTP_META); httpServer->sendContent_P(HTTP_FAVICON); httpServer->sendContent_P(HTTP_STYLE); + httpServer->sendContent_P(HTTP_SCRIPT); + httpServer->sendContent_P(HTTP_DIV_START); + httpServer->sendContent_P(HTTP_IFRAMES); httpServer->sendContent_P(HTTP_LOGO); String summary = FPSTR(HTTP_SUMMARY); @@ -98,7 +101,6 @@ void SuplaWebServer::sendHeaderStart() { summary.replace(F("{f}"), String(ESP.getFreeHeap() / 1024.0)); httpServer->sendContent(summary); - httpServer->sendContent_P(HTTP_COPYRIGHT); } } @@ -117,6 +119,7 @@ void SuplaWebServer::sendHeaderEnd() { if (chunkedSendHeader) { sendHeader(); httpServer->sendContent_P(HTTP_RBT); + httpServer->sendContent_P(HTTP_DIV_END); httpServer->chunkedResponseFinalize(); #ifdef ARDUINO_ARCH_ESP8266