Skip to content

Commit b48f782

Browse files
Mr-DaveDevMr-Dave
authored andcommitted
Legacy interface revisions
1 parent 3237933 commit b48f782

2 files changed

Lines changed: 32 additions & 9 deletions

File tree

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
Summary of Changes for version 4.2 are below
2+
* html fixes for legacy interface
3+
* Fix typo in guide
24
* Workaround compiler warnings on system header HAVE_STDLIB_H
35
* Update motion guide
46
* Revise timing and multiple threads for streams

webu_text.c

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ static void webu_text_header(struct webui_ctx *webui) {
7171

7272
if (webui->cntlst[0]->conf.webcontrol_interface == 2) {
7373
snprintf(response, sizeof (response),"%s",
74+
"<!DOCTYPE html>\n"
7475
"<html>\n"
7576
"<head><title>Motion "VERSION" </title></head>\n"
76-
"<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n"
77+
"<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, user-scalable=yes\">\n"
7778
"<body>\n");
7879
webu_write(webui, response);
7980
}
@@ -212,6 +213,9 @@ static void webu_text_list_basic(struct webui_ctx *webui) {
212213

213214
webu_text_camera_name(webui);
214215

216+
snprintf(response,sizeof(response),"%s","<ul>\n");
217+
webu_write(webui, response);
218+
215219
indx_parm = 0;
216220
while (config_params[indx_parm].param_name != NULL){
217221

@@ -227,7 +231,7 @@ static void webu_text_list_basic(struct webui_ctx *webui) {
227231
val_parm = config_params[indx_parm].print(webui->cntlst, NULL, indx_parm, 0);
228232
}
229233
snprintf(response, sizeof (response),
230-
"<a href=/%s/config/set?%s>%s</a> = %s<br>\n"
234+
" <li><a href=/%s/config/set?%s>%s</a> = %s</li>\n"
231235
,webui->uri_camid
232236
,config_params[indx_parm].param_name
233237
,config_params[indx_parm].param_name
@@ -236,6 +240,10 @@ static void webu_text_list_basic(struct webui_ctx *webui) {
236240

237241
indx_parm++;
238242
}
243+
244+
snprintf(response,sizeof(response),"%s","</ul>\n");
245+
webu_write(webui, response);
246+
239247
webu_text_trailer(webui);
240248

241249
}
@@ -865,6 +873,7 @@ void webu_text_get_query(struct webui_ctx *webui) {
865873
const char *val_parm;
866874
char temp_name[WEBUI_LEN_PARM];
867875

876+
868877
/* Search through the depreciated parms and if applicable,
869878
* get the new parameter name so we can check its webcontrol_parms level
870879
*/
@@ -904,13 +913,25 @@ void webu_text_get_query(struct webui_ctx *webui) {
904913

905914
webu_text_back(webui,"/config");
906915

907-
snprintf(response, sizeof (response),
908-
"%s = %s %s\n"
909-
"Done %s\n"
910-
,config_params[indx_parm].param_name
911-
,val_parm
912-
,webui->text_eol, webui->text_eol
913-
);
916+
webu_text_camera_name(webui);
917+
918+
if (webui->cntlst[0]->conf.webcontrol_interface == 2) {
919+
snprintf(response, sizeof (response),
920+
"<ul>\n"
921+
" <li>%s = %s </li>\n"
922+
"</ul>\n"
923+
,config_params[indx_parm].param_name
924+
,val_parm
925+
);
926+
} else {
927+
snprintf(response, sizeof (response),
928+
"%s = %s %s\n"
929+
"Done %s\n"
930+
,config_params[indx_parm].param_name
931+
,val_parm
932+
,webui->text_eol, webui->text_eol
933+
);
934+
}
914935
webu_write(webui, response);
915936
webu_text_trailer(webui);
916937

0 commit comments

Comments
 (0)