changeset 1742:5dda4803c59b

Output better HTML.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 18 Oct 2017 15:07:41 +0300
parents b4f728ef950c
children e625b1b50126
files colormap.c libmaputils.c
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/colormap.c	Wed Oct 18 14:23:58 2017 +0300
+++ b/colormap.c	Wed Oct 18 15:07:41 2017 +0300
@@ -297,8 +297,8 @@
         "@LOCATIONS@\n"
         "  </select>\n"
         "  <br />\n"
-        "  <input name=\"shide\" onClick=\"jsToggleLabels();\" type=\"checkbox\"%s>Labels</input>\n"
-        "  <input name=\"sscroll\" type=\"checkbox\"%s>Smooth scroll</input>\n"
+        "  <input name=\"shide\" id=\"shide\" onClick=\"jsToggleLabels();\" type=\"checkbox\"%s><label for=\"shide\">Labels</label>\n"
+        "  <input name=\"sscroll\" id=\"sscroll\" type=\"checkbox\"%s><label for=\"sscroll\">Smooth scroll</label>\n"
         " </form>\n"
         "</div>\n",
         (1 ? " checked=\"checked\"" : ""),
--- a/libmaputils.c	Wed Oct 18 14:23:58 2017 +0300
+++ b/libmaputils.c	Wed Oct 18 15:07:41 2017 +0300
@@ -403,7 +403,7 @@
     {
         fprintf(outFile,
         "<!DOCTYPE html>\n"
-        "<html>\n"
+        "<html lang=\"en\">\n"
         "<head>\n"
         " <meta charset=\"%s\">\n",
         strCharSet);
@@ -415,14 +415,12 @@
         "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
         "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"
         "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\n"
-        "<head>\n",
+        "<head>\n"
+        " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\" />\n",
+        strCharSet,
         strCharSet);
     }
 
-    fprintf(outFile,
-        " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\" />\n",
-        strCharSet);
-
     if (title)
     {
         fprintf(outFile, " <title>");