Commit aaed579298dbc6f4880b1fbb4e74641904aaec6a
2020-02-08T17:07:49
migrate head html from gotweb_ui.h
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index a40db9d..69aa4cf 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -1626,7 +1626,84 @@ gw_template(size_t key, void *arg)
switch (key) {
case (TEMPL_HEAD):
- kerr = khttp_puts(gw_trans->gw_req, head);
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_META,
+ KATTR_CONTENT, "initial-scale=1.0, user-scalable=no",
+ KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_META,
+ KATTR_CHARSET, "utf-8",
+ KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_META,
+ KATTR_NAME, "msapplication-TileColor",
+ KATTR_CONTENT, "#da532c", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_META,
+ KATTR_NAME, "theme-color",
+ KATTR_CONTENT, "#ffffff", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_LINK,
+ KATTR_REL, "apple-touch-icon", KATTR_SIZES, "180x180",
+ KATTR_HREF, "/apple-touch-icon.png", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_LINK,
+ KATTR_REL, "icon", KATTR_TYPE, "image/png", KATTR_SIZES,
+ "32x32", KATTR_HREF, "/favicon-32x32.png", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_LINK,
+ KATTR_REL, "icon", KATTR_TYPE, "image/png", KATTR_SIZES,
+ "16x16", KATTR_HREF, "/favicon-16x16.png", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_LINK,
+ KATTR_REL, "manifest", KATTR_HREF, "/site.webmanifest",
+ KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_LINK,
+ KATTR_REL, "mask-icon", KATTR_HREF,
+ "/safari-pinned-tab.svg", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_LINK,
+ KATTR_REL, "stylesheet", KATTR_TYPE, "text/css",
+ KATTR_HREF, "/gotweb.css", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ return 0;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
if (kerr != KCGI_OK)
return 0;
break;
diff --git a/gotweb/gotweb_ui.h b/gotweb/gotweb_ui.h
index 6e5ce0e..db3eb41 100644
--- a/gotweb/gotweb_ui.h
+++ b/gotweb/gotweb_ui.h
@@ -19,28 +19,6 @@
/* general html */
-char *head =
- "<meta name='viewport' content='initial-scale=1.0," \
- " user-scalable=no' />" \
- "<meta charset='utf-8' />" \
- "<meta name='msapplication-TileColor' content='#da532c' />" \
- "<meta name='theme-color' content='#ffffff' />" \
- "<link rel='apple-touch-icon' sizes='180x180'" \
- " href='/apple-touch-icon.png' />" \
- "<link rel='icon' type='image/png' sizes='32x32'" \
- " href='/favicon-32x32.png' />" \
- "<link rel='icon' type='image/png' sizes='16x16'" \
- " href='/favicon-16x16.png' />" \
- "<link rel='manifest' href='/site.webmanifest' />" \
- "<link rel='mask-icon' href='/safari-pinned-tab.svg'" \
- " color='#5bbad5' />" \
- "<link rel='stylesheet' type='text/css' href='/gotweb.css' />";
-
-char *got_link =
- "<div id='got_link'>" \
- "<a href='%s' target='_sotd'><img src='/%s' alt='logo' /></a>" \
- "</div>";
-
char *site_link =
"<div id='site_link'>" \
"<a href='%s'>%s</a> %s %s" \