Merge branch 'master' into publish-additional-states

This commit is contained in:
iranl
2024-02-17 21:30:44 +01:00
committed by GitHub
23 changed files with 362 additions and 703 deletions

View File

@@ -749,13 +749,13 @@ void WebCfgServer::buildOtaHtml(String &response, bool errored)
if(_preferences->getBool(preference_check_updates))
{
response.concat("<button title=\"Open latest release on GitHub\" onclick=\" window.open('");
response.concat("<div id=\"gitdiv\"><button title=\"Open latest release on GitHub\" onclick=\" window.open('");
response.concat(GITHUB_LATEST_RELEASE_URL);
response.concat("', '_blank'); return false;\">Open latest release on GitHub</button>");
response.concat("<br><br><button title=\"Download latest binary from GitHub\" onclick=\" window.open('");
response.concat(GITHUB_LATEST_RELEASE_BINARY_URL);
response.concat("'); return false;\">Download latest binary from GitHub</button>");
response.concat("'); return false;\">Download latest binary from GitHub</button></div>");
}
response.concat("<div id=\"msgdiv\" style=\"visibility:hidden\">Initiating Over-the-air update. This will take about two minutes, please be patient.<br>You will be forwarded automatically when the update is complete.</div>");
@@ -765,6 +765,7 @@ void WebCfgServer::buildOtaHtml(String &response, bool errored)
response.concat(" button.addEventListener('click',hideshow,false);");
response.concat(" function hideshow() {");
response.concat(" document.getElementById('upform').style.visibility = 'hidden';");
response.concat(" document.getElementById('gitdiv').style.visibility = 'hidden';");
response.concat(" document.getElementById('msgdiv').style.visibility = 'visible';");
response.concat(" }");
response.concat("});");
@@ -1374,4 +1375,4 @@ String WebCfgServer::getPreselectionForGpio(const uint8_t &pin)
}
return String((int8_t)PinRole::Disabled);
}
}