cgi search housekeeping, sync & remove redundancy

- removed copy of d search form both org and src
  duplication & out of date

2 files changed, 70 insertions, 67 deletions

diff --git a/sundry/spine_search_cgi/src/spine_search.d b/sundry/spine_search_cgi/src/spine_search.d
index 3e0b3fc..b000a1d 100644
--- a/sundry/spine_search_cgi/src/spine_search.d
+++ b/sundry/spine_search_cgi/src/spine_search.d
@@ -487,7 +487,7 @@ void cgi_function_intro(Cgi cgi) {
       _url_new = _url_new ~ _fn;
     }
     _matched_objects_text =
-      "<font size=\"2\" color=\"#666666\">"
+      "<font-size=\"2rem\" color=\"#666666\">"
       ~ "<a href=\""
       ~ _url_new
       ~ "\">"
@@ -528,7 +528,7 @@ void cgi_function_intro(Cgi cgi) {
       arrow_previous = "";
     } else {
       arrow_previous =
-        "<font size=\"2\" color=\"#666666\">"
+        "<font-size=\"1.8rem\" color=\"#666666\">"
         ~ "<a href=\""
         ~ _url_previous
         ~ "\">"
@@ -536,7 +536,7 @@ void cgi_function_intro(Cgi cgi) {
         ~ "</a> || </font>";
     }
     arrow_next =
-      "<font size=\"2\" color=\"#666666\">"
+      "<font-size=\"1.8rem\" color=\"#666666\">"
       ~ "<a href=\""
       ~ _url_next
       ~ "\">"
@@ -558,15 +558,16 @@ void cgi_function_intro(Cgi cgi) {
   <link rel="generator" href="sisudoc.org">
   <link rel="shortcut icon" href="%s://%s/image_sys/spine.ico">
   <style media = "all">
+    html {
+      font-size              : 62.5%%;
+    }
     *{
       padding                  : 0px;
       margin                   : 2px;
     }
     body {
       height                   : 100vh;
-      background-color         : #FFFFFF;
-    }
-    body {
+      font-size                : 1.6rem;
       color                    : #000000;
       background               : #FFFFFF;
       background-color         : #FFFFFF;
@@ -594,7 +595,7 @@ void cgi_function_intro(Cgi cgi) {
     a.matched_ocn:hover {
       color                    : #000000;
       background-color         : #F9F9AA;
-      font-size                : 100%%;
+      font-size                : 1.6rem;
     }
     a.lnkocn:link {
       color                    : #777777;
@@ -606,7 +607,7 @@ void cgi_function_intro(Cgi cgi) {
     }
     a.lnkocn:hover {
       color                    : #777777;
-      font-size                : 100%%;
+      font-size                : 1.6rem;
     }
     a:hover img {
       background-color         : #FFFFFF;
@@ -641,14 +642,14 @@ void cgi_function_intro(Cgi cgi) {
       background-color         : #FFFF48;
     }
     input, select, textarea {
-      font-size                : 150%%;
+      font-size                : 2rem;
     }
     input[type="text"] {
-      font-size                : 150%%;
+      font-size                : 2rem;
       line-height              : 150%%;
     }
     button[type="submit"] {
-      font-size                : 150%%;
+      font-size                : 2rem;
       line-height              : 150%%;
     }
     p.norm { }
@@ -668,7 +669,7 @@ void cgi_function_intro(Cgi cgi) {
       text-indent              : 0em;
     }
     p.publication {
-      font-size                : 100%%;
+      font-size                : 1.6rem;
       margin-left              : 0em;
       margin-top               : 0px;
       margin-bottom            : 0px;
@@ -676,11 +677,11 @@ void cgi_function_intro(Cgi cgi) {
       text-align               : left;
     }
     p.ocn_is {
-      font-size                : 100%%;
+      font-size                : 1.6rem;
       display                  : inline-block;
     }
     p.matched_ocn {
-      font-size                : 90%%;
+      font-size                : 1.5rem;
       margin-left              : 2em;
       margin-top               : 0px;
       margin-bottom            : 0px;
@@ -1099,7 +1100,7 @@ void cgi_function_intro(Cgi cgi) {
       display                  : inline;
     }
     p.endnote {
-      font-size                : 96%%;
+      font-size                : 1.5rem;
       line-height              : 120%%;
       text-align               : left;
       margin-right             : 15mm;
@@ -1126,14 +1127,14 @@ void cgi_function_intro(Cgi cgi) {
       background               : #FFF3B6;
     }
     p.small {
-      font-size                : 80%%;
+      font-size                : 1.4rem;
       margin-top               : 0px;
       margin-bottom            : 0px;
       margin-right             : 6px;
       text-align               : left;
     }
     .tiny, .tiny_left, .tiny_right, .tiny_center {
-      font-size                : 75%%;
+      font-size                : 1.3rem;
       margin-top               : 0px;
       margin-bottom            : 0px;
       color                    : #EEEEEE;
@@ -1200,7 +1201,7 @@ void cgi_function_intro(Cgi cgi) {
       white-space              : -o-pre-wrap;
       background-color         : #555555;
       color                    : #DDDDDD;
-      font-size                : 120%%;
+      font-size                : 1.8rem;
       line-height              : 120%%;
     }
     pre.codeline::before {
@@ -1242,7 +1243,7 @@ void cgi_function_intro(Cgi cgi) {
     }
     p.small_left,th.small_left,td.small_left {
       text-align               : left;
-      font-size                : 80%%;
+      font-size                : 1.4rem;
     }
     p.right,th.right,td.right {
       text-align               : right;
@@ -1275,14 +1276,14 @@ void cgi_function_intro(Cgi cgi) {
       margin-top               : 10px;
       margin-bottom            : 0px;
     }
-    h0 { font-size             : 125%%; }
-    h1 { font-size             : 120%%; }
-    h2 { font-size             : 115%%; }
-    h3 { font-size             : 110%%; }
-    h4 { font-size             : 105%%; }
-    h5 { font-size             : 100%%; }
-    h6 { font-size             : 100%%; }
-    h7 { font-size             : 100%%; }
+    h0 { font-size             : 2rem; }
+    h1 { font-size             : 1.9rem; }
+    h2 { font-size             : 1.8rem; }
+    h3 { font-size             : 1.7rem; }
+    h4 { font-size             : 1.6rem; }
+    h5 { font-size             : 1.6rem; }
+    h6 { font-size             : 1.6rem; }
+    h7 { font-size             : 1.6rem; }
     h0, h1, h2, h3, h4, h5, h6, h7 {
       text-shadow              : .2em .2em .3em #999999;
     }
@@ -1302,42 +1303,42 @@ void cgi_function_intro(Cgi cgi) {
     }
     h0.toc {
       margin-left              : 1em;
-      font-size                : 120%%;
+      font-size                : 2rem;
       line-height              : 150%%;
     }
     h1.toc {
       margin-left              : 1em;
-      font-size                : 115%%;
+      font-size                : 1.9rem;
       line-height              : 150%%;
     }
     h2.toc {
       margin-left              : 2em;
-      font-size                : 110%%;
+      font-size                : 1.8rem;
       line-height              : 140%%;
     }
     h3.toc {
       margin-left              : 3em;
-      font-size                : 105%%;
+      font-size                : 1.7rem;
       line-height              : 120%%;
     }
     h4.toc {
       margin-left              : 4em;
-      font-size                : 100%%;
+      font-size                : 1.6rem;
       line-height              : 120%%;
     }
     h5.toc {
       margin-left              : 5em;
-      font-size                : 95%%;
+      font-size                : 1.5rem;
       line-height              : 110%%;
     }
     h6.toc {
       margin-left              : 6em;
-      font-size                : 90%%;
+      font-size                : 1.4rem;
       line-height              : 110%%;
     }
     h7.toc {
       margin-left              : 7em;
-      font-size                : 85%%;
+      font-size                : 1.3rem;
       line-height              : 100%%;
     }
     .subtoc {
@@ -1346,19 +1347,19 @@ void cgi_function_intro(Cgi cgi) {
     }
     h5.subtoc {
       margin-left              : 2em;
-      font-size                : 80%%;
+      font-size                : 1.5rem;
       margin-top               : 2px;
       margin-bottom            : 2px;
     }
     h6.subtoc {
       margin-left              : 3em;
-      font-size                : 75%%;
+      font-size                : 1.4rem;
       margin-top               : 0px;
       margin-bottom            : 0px;
     }
     h7.subtoc {
       margin-left              : 4em;
-      font-size                : 70%%;
+      font-size                : 1.3rem;
       margin-top               : 0px;
       margin-bottom            : 0px;
     }
@@ -1449,7 +1450,7 @@ void cgi_function_intro(Cgi cgi) {
         // assert(method_get_url == environment.get("HTTP_REFERER", conf.query_base_url ~ conf.query_string));
         if (conf.request_method == "POST") {
           _the_can =
-            "<font size=\"2\" color=\"#666666\">"
+            "<font-size=\"1rem\" color=\"#666666\">"
             ~ "POST:&nbsp;"
             ~ "<a href=\""
             ~ method_post_url_construct
@@ -1459,7 +1460,7 @@ void cgi_function_intro(Cgi cgi) {
             ~ "<br>";
         } else if (conf.request_method == "GET") {
           _the_can =
-            "<font size=\"2\" color=\"#666666\">"
+            "<font-size=\"1rem\" color=\"#666666\">"
             ~ "GET:&nbsp;&nbsp;"
             ~ "<a href=\""
             ~ method_get_url
@@ -1478,25 +1479,25 @@ void cgi_function_intro(Cgi cgi) {
         string search_field = post_value("sf", "field");
         tf = text_fields;
         tip = format(q"┃
-      <font size="2" color="#666666">
-      <b>database:</b> <font size="2" color="#004000">%s</font>; <b>selected view:</b> <font size="2" color="#004000">index</font>
+      <font-size="1rem" color="#666666">
+      <b>database:</b> <font-size="1rem" color="#004000">%s</font>; <b>selected view:</b> <font-size="2" color="#004000">index</font>
       <b>search string:</b> %s %s %s %s %s %s<br>
       %s %s %s %s %s %s
       </font>
       ┃",
           cv.db_selected,
-          (tf.text.empty   ? "" : "\"text:   <font size=\"2\" color=\"#004000\">" ~ tf.text   ~ "</font>; "),
-          (tf.title.empty  ? "" : "\"title:  <font size=\"2\" color=\"#004000\">" ~ tf.title  ~ "</font>; "),
-          (tf.author.empty ? "" : "\"author: <font size=\"2\" color=\"#004000\">" ~ tf.author ~ "</font>; "),
-          (tf.date.empty   ? "" : "\"date    <font size=\"2\" color=\"#004000\">" ~ tf.date   ~ "</font>; "),
-          (tf.uid.empty    ? "" : "\"uid:    <font size=\"2\" color=\"#004000\">" ~ tf.uid    ~ "</font>; "),
-          (tf.fn.empty     ? "" : "\"fn:     <font size=\"2\" color=\"#004000\">" ~ tf.fn     ~ "</font>; "),
-          (tf.text.empty   ? "" :  "text:    <font size=\"2\" color=\"#004000\">" ~ tf.text   ~ "</font><br>"),
-          (tf.title.empty  ? "" : "title:    <font size=\"2\" color=\"#004000\">" ~ tf.title  ~ "</font><br>"),
-          (tf.author.empty ? "" :  "author:  <font size=\"2\" color=\"#004000\">" ~ tf.author ~ "</font><br>"),
-          (tf.date.empty   ? "" :  "date:    <font size=\"2\" color=\"#004000\">" ~ tf.date   ~ "</font><br>"),
-          (tf.uid.empty    ? "" : "\"uid:    <font size=\"2\" color=\"#004000\">" ~ tf.uid    ~ "</font>; "),
-          (tf.fn.empty     ? "" : "\"fn:     <font size=\"2\" color=\"#004000\">" ~ tf.fn     ~ "</font>; "),
+          (tf.text.empty   ? "" : "\"text:   <font-size=\"1rem\" color=\"#004000\">" ~ tf.text   ~ "</font>; "),
+          (tf.title.empty  ? "" : "\"title:  <font-size=\"1rem\" color=\"#004000\">" ~ tf.title  ~ "</font>; "),
+          (tf.author.empty ? "" : "\"author: <font-size=\"1rem\" color=\"#004000\">" ~ tf.author ~ "</font>; "),
+          (tf.date.empty   ? "" : "\"date    <font-size=\"1rem\" color=\"#004000\">" ~ tf.date   ~ "</font>; "),
+          (tf.uid.empty    ? "" : "\"uid:    <font-size=\"1rem\" color=\"#004000\">" ~ tf.uid    ~ "</font>; "),
+          (tf.fn.empty     ? "" : "\"fn:     <font-size=\"1rem\" color=\"#004000\">" ~ tf.fn     ~ "</font>; "),
+          (tf.text.empty   ? "" :  "text:    <font-size=\"1rem\" color=\"#004000\">" ~ tf.text   ~ "</font><br>"),
+          (tf.title.empty  ? "" : "title:    <font-size=\"1rem\" color=\"#004000\">" ~ tf.title  ~ "</font><br>"),
+          (tf.author.empty ? "" :  "author:  <font-size=\"1rem\" color=\"#004000\">" ~ tf.author ~ "</font><br>"),
+          (tf.date.empty   ? "" :  "date:    <font-size=\"1rem\" color=\"#004000\">" ~ tf.date   ~ "</font><br>"),
+          (tf.uid.empty    ? "" : "\"uid:    <font-size=\"1rem\" color=\"#004000\">" ~ tf.uid    ~ "</font>; "),
+          (tf.fn.empty     ? "" : "\"fn:     <font-size=\"1rem\" color=\"#004000\">" ~ tf.fn     ~ "</font>; "),
         );
       }
       return tip;
@@ -1513,9 +1514,9 @@ void cgi_function_intro(Cgi cgi) {
     %s
   </td></tr></table>
   <td valign=\"top\"><tr><td>
-    <font size="2" color="#222222">
+    <font-size="1rem" color="#222222">
     <input type="hidden" name="db" value="%s">
-    <input type="submit" value="SiSU search">
+    <input type="submit" value="※ SiSU search">
     <input type="radio" name="rt" id="results_type_index" value="idx" %s> index
     <input type="radio" name="rt" id="results_type_text" value="txt" %s> text / grep;
     match limit:
@@ -1730,7 +1731,7 @@ LIMIT %s OFFSET %s
       );
       (cv.checked_sql)
       ? cgi.write(previous_next
-          ~ "<hr><font size=\"2\" color=\"#666666\">"
+          ~ "<hr><font-size=\"1rem\" color=\"#666666\">"
           ~ sql_select.the_body.strip.split("\n  ").join(" ").split("\n").join("<br>")
           ~ "</font>\n"
         )
@@ -1891,11 +1892,12 @@ LIMIT %s OFFSET %s
       } else { // offset_not_beyond_limit = false;
         cgi.write("select_query_results empty<p>\n");
       }
-      cgi.write("<br><p class=\"center\"><a href=\"https://sisudoc.org/\" target=\"_top\">
-<label for=\"find\"><b>≅ SiSU spine</b></label>
-</a> <label for=\"find\">(generated) search form</label>
-<br><a href=\"https://git.sisudoc.org/\" target=\"_top\">
-  git</a>
+      cgi.write("<br><p class=\"center\">
+<label for=\"find\">
+<a href=\"https://sisudoc.org/\" target=\"_top\"><b>≅ SiSU Spine</b></a>
+</label>
+<label for=\"find\">(object numbering &amp; object search) 2022</label>
+<br><a href=\"https://git.sisudoc.org/\" target=\"_top\">git</a>
 </p>
 ");
     }
diff --git a/sundry/spine_search_cgi/src/spine_search.d_ b/sundry/spine_search_cgi/src/spine_search.d_
index f8e88e3..c6f8cb7 100755
--- a/sundry/spine_search_cgi/src/spine_search.d_
+++ b/sundry/spine_search_cgi/src/spine_search.d_
@@ -1894,11 +1894,12 @@ LIMIT %s OFFSET %s
       } else { // offset_not_beyond_limit = false;
         cgi.write("select_query_results empty<p>\n");
       }
-      cgi.write("<br><p class=\"center\"><a href=\"https://sisudoc.org/\" target=\"_top\">
-<label for=\"find\"><b>≅ SiSU Spine</b></label>
-</a> <label for=\"find\">(object numbering &amp; object search) 2022</label>
-<br><a href=\"https://git.sisudoc.org/\" target=\"_top\">
-  git</a>
+      cgi.write("<br><p class=\"center\">
+<label for=\"find\">
+<a href=\"https://sisudoc.org/\" target=\"_top\"><b>≅ SiSU Spine</b></a>
+</label>
+<label for=\"find\">(object numbering &amp; object search) 2022</label>
+<br><a href=\"https://git.sisudoc.org/\" target=\"_top\">git</a>
 </p>
 ");
     }