diff --git a/Arduino/CanGrow/include/Webserver/File_cangrow_CSS.h b/Arduino/CanGrow/include/Webserver/File_cangrow_CSS.h index c09d745..97d39a7 100644 --- a/Arduino/CanGrow/include/Webserver/File_cangrow_CSS.h +++ b/Arduino/CanGrow/include/Webserver/File_cangrow_CSS.h @@ -34,6 +34,11 @@ const char* File_cangrow_CSS PROGMEM = R"(body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; } +.footer { + color: #343B35; + text-align: center; +} + .center { width: 100%%; margin: auto; diff --git a/Arduino/CanGrow/include/Webserver/Footer.h b/Arduino/CanGrow/include/Webserver/Footer.h index a91fe43..d304dd2 100644 --- a/Arduino/CanGrow/include/Webserver/Footer.h +++ b/Arduino/CanGrow/include/Webserver/Footer.h @@ -27,4 +27,5 @@ * */ -const char* Footer_HTML PROGMEM = R"(</div></body></html>)"; +const char* Footer_HTML PROGMEM = R"(<div class='footer'><span>Build: %CGBUILD%</span></div> +</div></body></html>)"; diff --git a/Arduino/CanGrow/include/Webserver/Header.h b/Arduino/CanGrow/include/Webserver/Header.h index dd084da..3636124 100644 --- a/Arduino/CanGrow/include/Webserver/Header.h +++ b/Arduino/CanGrow/include/Webserver/Header.h @@ -32,7 +32,7 @@ const char* Header_HTML PROGMEM = R"(<!DOCTYPE html> <head> <meta charset='UTF-8'> <meta name='viewport' content='width=device-width, initial-scale=1.0'> - <title>CanGrow %CGVER% - %CGBUILD%</title> + <title>%GROWNAME% - CanGrow v%CGVER%</title> <link rel='icon' href='data:;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsTAAALEwEAmpwYAAABcElEQVQ4y42TzU/bQBDFf7Nx1qGuAYVgQSuo2khBggPhyIH//9AiJAQ9tEeLqCKiUD6sxF52OMSEBCdW57aa9968fTsr3V5XWVLPO6sANNL7ZRAMNeU6Ea4T1UEI6pr55kcAwhpMrYOpk2/r/yEQmKWkIonf+TZVgex4Fw0bIEtIAALF3gbZ8U5VwKa3PJ18JT9IpiLvyflBwuhLG5veVUM0/0aoCONPa2hQjWZ8uEVeupJnXSBwO8YOH8iTeAKc2Q4Xt2C1VZL93F7MjbK/bxDnp5Zn7b+So+9pdQ+K/Q5qJlrRj5Ts6DM+rK7Ih7Mr3HaM7jYQVZqXQ6Tb6yqBYdTfomhHiFfUyMI3f+01/z7RHNzTGDyWGThP63SA2d8EEfIkrgQpzmOvH0AV+3M4zegNpUwagAYG8Yp4BS0nl4Kz5Mpf0JXJMby6w/66Aa+M+9uE53/Iexsggq4ESOYWC0jmsBfX8xdXhcJjL4cLc3kBl8uJGQ/CrpAAAAAASUVORK5CYII='> <style> %CANGROW_CSS% @@ -45,7 +45,7 @@ const char* Header_HTML PROGMEM = R"(<!DOCTYPE html> <li><a href='/wifi/' >📡 WiFi settings</a></li> <li><a href='/help' >❓ Help</a></li> <li><span class='MenuTime'>05:01:40</span></li> - <li><a href='https://git.la10cy.net/DeltaLima/CanGrow' target='_blank'>CanGrow v%CGVER% - %CGBUILD%</a></li> + <li><a href='https://git.la10cy.net/DeltaLima/CanGrow' target='_blank'>CanGrow v%CGVER%</a></li> </ul> <div class='center'> %NEED_RESTART%)"; diff --git a/Arduino/CanGrow/include/Webserver/Page_root_HTML.h b/Arduino/CanGrow/include/Webserver/Page_root_HTML.h index 344fcd9..47ecb85 100644 --- a/Arduino/CanGrow/include/Webserver/Page_root_HTML.h +++ b/Arduino/CanGrow/include/Webserver/Page_root_HTML.h @@ -29,5 +29,5 @@ const char* Page_root_HTML PROGMEM = R"(%HEADER% -<h2>📡 Hello world!</h2> +<h2>🌱 Hello world!</h2> %FOOTER%)"; diff --git a/Arduino/CanGrow/include/Webserver/Page_system.h b/Arduino/CanGrow/include/Webserver/Page_system.h index 9f2e26b..def6002 100644 --- a/Arduino/CanGrow/include/Webserver/Page_system.h +++ b/Arduino/CanGrow/include/Webserver/Page_system.h @@ -114,6 +114,7 @@ void WebPage_system_update_ApplyUpdate(AsyncWebServerRequest *request, String fi if(Update.end(true)){ Serial.printf(":: [Webserver:system:update:ApplyUpdate] Update Success: %uB\n", index+len); } else { + Serial.println(":: [Webserver:system:update:ApplyUpdate] FAILED Update:"); Update.printError(Serial); } } diff --git a/Arduino/CanGrow/include/Webserver/Page_system_HTML.h b/Arduino/CanGrow/include/Webserver/Page_system_HTML.h index c04a7a6..feff524 100644 --- a/Arduino/CanGrow/include/Webserver/Page_system_HTML.h +++ b/Arduino/CanGrow/include/Webserver/Page_system_HTML.h @@ -93,13 +93,10 @@ Build : %CGBUILD% <br> %FOOTER%)"; const char* Page_system_update_HTML_POST PROGMEM = R"(<html> -<head> -<meta http-equiv='refresh' content='3;url=http://%CONFIGWIFI_IP%/' /> -</head> -<body> -<h1>successfully updated! redirecting tp http://%CONFIGWIFI_IP% in 3 seconds</h1> -</body> -</html>)"; +<head><meta http-equiv='refresh' content='15;url=/' /></head> +<body><h1>Successfully updated! Restarting...</h1><br> +Redirect to "/" in 15 seconds +</body></html>)"; /* * Subpage restart