From f60a1d1b06c0dbd79a4c0f71a839becd729d55a5 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Fri, 16 Mar 2018 10:56:28 -0500 Subject: [PATCH] adds section hrs --- WiFiManager.cpp | 6 +++++- strings_en.h | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 4829be7..e7110a5 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -763,8 +763,9 @@ void WiFiManager::handleWifi(boolean scan) { page += pitem; page += getStaticOut(); + page += FPSTR(HTTP_FORM_WIFI_END); if(_paramsInWifi && _paramsCount>0){ - page += FPSTR(HTTP_FORM_WIFI_END); + page += FPSTR(HTTP_FORM_PARAM_HEAD); page += getParamOut(); } page += FPSTR(HTTP_FORM_END); @@ -964,6 +965,9 @@ String WiFiManager::getStaticOut(){ if((_staShowDns || _sta_static_dns) && _staShowDns>=0){ page += getIpForm(FPSTR(S_dns),FPSTR(S_staticdns),(_sta_static_dns ? _sta_static_dns.toString() : "")); // @token dns } + + if(page!="") page += FPSTR(HTTP_BR); // @todo remove these, use css + return page; } diff --git a/strings_en.h b/strings_en.h index d42fa73..fede69b 100644 --- a/strings_en.h +++ b/strings_en.h @@ -43,10 +43,11 @@ const char HTTP_ITEM[] PROGMEM = "
"; const char HTTP_FORM_WIFI[] PROGMEM = "
"; -const char HTTP_FORM_WIFI_END[] PROGMEM = "

"; -const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "

"; +const char HTTP_FORM_WIFI_END[] PROGMEM = ""; +const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "

"; const char HTTP_FORM_END[] PROGMEM = "

"; const char HTTP_FORM_LABEL[] PROGMEM = ""; +const char HTTP_FORM_PARAM_HEAD[] PROGMEM = "

"; const char HTTP_FORM_PARAM[] PROGMEM = "
"; const char HTTP_SCAN_LINK[] PROGMEM = "
";