Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Paul Wilde 2024-01-28 18:49:16 +00:00
commit d86b96b5a3
2 changed files with 10 additions and 1 deletions

10
html.c
View file

@ -427,7 +427,9 @@ static xs_html *html_base_head(void)
xs_html_attr("name", "generator"), xs_html_attr("name", "generator"),
xs_html_attr("content", USER_AGENT))); xs_html_attr("content", USER_AGENT)));
/* add server CSS */ /* add server CSS and favicon */
xs *f;
f = xs_fmt("%s/favicon.ico", srv_baseurl);
xs_list *p = xs_dict_get(srv_config, "cssurls"); xs_list *p = xs_dict_get(srv_config, "cssurls");
char *v; char *v;
while (xs_list_iter(&p, &v)) { while (xs_list_iter(&p, &v)) {
@ -438,6 +440,12 @@ static xs_html *html_base_head(void)
xs_html_attr("href", v))); xs_html_attr("href", v)));
} }
xs_html_add(head,
xs_html_sctag("link",
xs_html_attr("rel", "icon"),
xs_html_attr("type", "image/x-icon"),
xs_html_attr("href", f)));
return head; return head;
} }

View file

@ -81,6 +81,7 @@ static const char *greeting_html =
"<!DOCTYPE html>\n" "<!DOCTYPE html>\n"
"<html><head>\n" "<html><head>\n"
"<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/>\n" "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/>\n"
"<link rel=\"icon\" type=\"image/x-icon\" href=\"https://%host%/favicon.ico\"/>\n"
"<title>Welcome to %host%</title>\n" "<title>Welcome to %host%</title>\n"
"<body style=\"margin: auto; max-width: 50em\">\n" "<body style=\"margin: auto; max-width: 50em\">\n"
"%blurb%" "%blurb%"