diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c index 16a41423d..0e39a926e 100644 --- a/src/httpserver/http_fns.c +++ b/src/httpserver/http_fns.c @@ -160,6 +160,28 @@ int http_fn_index(http_request_t *request) { CHANNEL_Set(j,newSetValue,1); } + poststr(request, ""); + for (i = 0; i < CHANNEL_MAX; i++) { + int channelType; + + channelType = CHANNEL_GetType(i); + if (h_isChannelRelay(i) || channelType == ChType_Toggle) { + if (i <= 1) { + hprintf128(request, "", CHANNEL_MAX); + } + if (CHANNEL_Check(i)) { + poststr(request, ""); + } + else { + poststr(request, ""); + } + if (i == CHANNEL_MAX - 1) { + poststr(request, ""); + } + } + } + poststr(request, "
ONOFF
"); + poststr(request, "
"); for(i = 0; i < CHANNEL_MAX; i++) { @@ -254,17 +276,14 @@ int http_fn_index(http_request_t *request) { hprintf128(request, "", CHANNEL_MAX); } const char *c; - const char *state; if(CHANNEL_Check(i)) { c = "bgrn"; - state = "ON"; } else { c = "bred"; - state = "OFF"; } poststr(request,"",c,i,state); + hprintf128(request,"",c,i); if (i == CHANNEL_MAX-1) { poststr(request, ""); } diff --git a/src/httpserver/new_http.c b/src/httpserver/new_http.c index 6de142a86..6abf3eadb 100644 --- a/src/httpserver/new_http.c +++ b/src/httpserver/new_http.c @@ -19,7 +19,7 @@ const char httpMimeTypeHTML[] = "text/html" ; // HTML MIME type const char httpMimeTypeText[] = "text/plain" ; // TEXT MIME type const char httpMimeTypeJson[] = "application/json" ; // TEXT MIME type const char httpMimeTypeBinary[] = "application/octet-stream" ; // binary/file MIME type -const char htmlHeader[] = "
" ; +const char htmlHeader[] = "
" ; const char htmlEnd[] = "
" ; const char htmlReturnToMenu[] = "Return to menu"; const char htmlReturnToCfg[] = "Return to cfg";
"); hprintf128(request,"",i); - hprintf128(request,"