From d1060246828a88cf37d477b70d001fd6d2c33734 Mon Sep 17 00:00:00 2001 From: technyon Date: Fri, 17 Jun 2022 22:31:41 +0200 Subject: [PATCH] cleanup html --- WebCfgServer.cpp | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp index fc6452c..70e6bae 100644 --- a/WebCfgServer.cpp +++ b/WebCfgServer.cpp @@ -326,29 +326,24 @@ void WebCfgServer::buildHtml(String& response) response.concat("

Info

\n"); - String version = " "; - version.concat(nuki_hub_version); + String version = nuki_hub_version; response.concat(""); - printParameter(response, "MQTT Connected", _network->isMqttConnected() ? " Yes" : " No"); + printParameter(response, "MQTT Connected", _network->isMqttConnected() ? "Yes" : "No"); if(_nuki != nullptr) { - String lockState = " "; char lockstateArr[20]; NukiLock::lockstateToString(_nuki->keyTurnerState().lockState, lockstateArr); - lockState.concat(lockstateArr); - printParameter(response, "NUKI Lock paired", _nuki->isPaired() ? " Yes" : " No"); - printParameter(response, "NUKI Lock state", lockState.c_str()); + printParameter(response, "NUKI Lock paired", _nuki->isPaired() ? "Yes" : "No"); + printParameter(response, "NUKI Lock state", lockstateArr); } if(_nukiOpener != nullptr) { - String lockState = " "; char lockstateArr[20]; NukiOpener::lockstateToString(_nukiOpener->keyTurnerState().lockState, lockstateArr); - lockState.concat(lockstateArr); - printParameter(response, "NUKI Opener paired", _nukiOpener->isPaired() ? " Yes" : " No"); - printParameter(response, "NUKI Opener state", lockState.c_str()); + printParameter(response, "NUKI Opener paired", _nukiOpener->isPaired() ? "Yes" : "No"); + printParameter(response, "NUKI Opener state", lockstateArr); } printParameter(response, "Firmware", version.c_str()); response.concat("


"); @@ -358,7 +353,7 @@ void WebCfgServer::buildHtml(String& response) response.concat(""); response.concat(""); - response.concat("
"); + response.concat(""); response.concat("

Configuration

"); response.concat(""); @@ -400,8 +395,7 @@ void WebCfgServer::buildHtml(String& response) } response.concat(""); - response.concat("\n"); - response.concat("\n"); + response.concat(""); } @@ -578,13 +572,10 @@ void WebCfgServer::processUnpair(bool opener) void WebCfgServer::buildHtmlHeader(String &response) { - response.concat("\n"); - response.concat("\n"); + response.concat(""); response.concat(""); - response.concat("\n"); - response.concat("NUKI Hub\n"); - response.concat("\n"); - response.concat("\n"); + response.concat(""); + response.concat("NUKI Hub"); } void WebCfgServer::printInputField(String& response, @@ -603,7 +594,7 @@ void WebCfgServer::printInputField(String& response, response.concat(description); response.concat(""); response.concat("
"); - response.concat("