diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2022-02-02 11:38:33 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2022-02-05 18:25:05 -0500 |
| commit | b3ab72df529dab36483285567b1e72acb48187b3 (patch) | |
| tree | 41c277e6d39110a66b52b6f466773d4f22264701 | |
| parent | xmls css, step (diff) | |
htmls, banner layout additions
- scroll/seg doc access toggle
- epub link added, later make optional
- search button, minor cosmetic
| -rw-r--r-- | org/cgi_spine_search.org | 2 | ||||
| -rw-r--r-- | org/out_curate_metadata.org | 2 | ||||
| -rw-r--r-- | org/out_metadata.org | 12 | ||||
| -rw-r--r-- | org/out_xmls.org | 11 | ||||
| -rw-r--r-- | src/doc_reform/io_out/metadata.d | 12 | ||||
| -rw-r--r-- | src/doc_reform/io_out/xmls.d | 11 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_curate_authors.d | 2 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_curate_topics.d | 2 | ||||
| -rwxr-xr-x | sundry/spine_search_cgi/src/spine_search.d_ | 2 |
9 files changed, 35 insertions, 21 deletions
diff --git a/org/cgi_spine_search.org b/org/cgi_spine_search.org index 1666a0f..a79d89b 100644 --- a/org/cgi_spine_search.org +++ b/org/cgi_spine_search.org @@ -919,7 +919,7 @@ return tip; <td valign=\"top\"><tr><td> <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: diff --git a/org/out_curate_metadata.org b/org/out_curate_metadata.org index 6c7169f..1c84bec 100644 --- a/org/out_curate_metadata.org +++ b/org/out_curate_metadata.org @@ -814,7 +814,7 @@ string theme_light_1 = format(q"┃ <input type="hidden" name="sml" value="1000"> <input type="hidden" name="ec" value="on"> <input type="hidden" name="url" value="on"> -<button type="submit" form="search">db</button> +<button type="submit" form="search">※ db</button> </font></form> <!-- SiSU Spine Search --> </div>┃", diff --git a/org/out_metadata.org b/org/out_metadata.org index 965a36e..c5eddc5 100644 --- a/org/out_metadata.org +++ b/org/out_metadata.org @@ -85,12 +85,12 @@ metadata_ ~= format(q"┃<body lang="en" xml:lang="en"> ┃"); metadata_ ~= "<div class=\"flex-menu-bar\"><div class=\"flex-menu-option\">"; if (doc_matters.opt.action.html_curate_link) { - metadata_ ~= format(q"┃<p>[<a href="../../index.html"> HOME </a>] Curated metadata + metadata_ ~= format(q"┃<p>[<a href="../../../index.html"> <b>≅</b> HOME </a>] Curated metadata: [<a href="../../authors.html"> Authors </a>] [<a href="../../topics.html"> Topics </a>]</p> ┃"); } else { - metadata_ ~= format(q"┃<p>[<a href="../../index.html"> HOME </a>] + metadata_ ~= format(q"┃<p>[<a href="../../../index.html"> ≅ <b>HOME</b> </a>] ┃"); } metadata_ ~= "</div>" ~ inline_search_form(doc_matters) ~ "</div><hr />"; @@ -132,11 +132,11 @@ metadata_ ~= "<p class=\"lev1\">● markup source: [<a href=\"../../" ~ pth_pod. ~ "[<a href=\"../../" ~ pth_pod.internal_base ~ "/" ~ doc_matters.src.filename_base ~ "/\">" ~ " pod tree </a>]</p>"; metadata_ ~= "<p class=\"lev1\">● outputs: [<a href=\"" ~ doc_matters.src.filename_base ~ ".html\">" - ~ " html scroll </a>] " + ~ " ▣ html scroll </a>] " ~ "[<a href=\"" ~ doc_matters.src.filename_base ~ "/toc.html\">" - ~ " html seg </a>]" + ~ " ▤ html seg </a>]" ~ "[<a href=\"../../" ~ pth_epub.internal_base ~ "/" ~ doc_matters.src.filename_base ~ "." ~ doc_matters.src.language ~ ".epub\">" - ~ " epub </a>]</p>"; + ~ " ◆ epub </a>]</p>"; if (doc_matters.conf_make_meta.meta.classify_topic_register_arr.length > 0) { metadata_ ~= "<hr /><p class=\"lev0\">Topics:</p>"; string[] _top = ["", "", "", "", ""]; @@ -548,7 +548,7 @@ string theme_light_1 = format(q"┃ <input type="hidden" name="ec" value="on"> <input type="hidden" name="url" value="on"> <button type="submit" form="search" name="fn" value="%s">doc</button> -<button type="submit" form="search">db</button> +<button type="submit" form="search">※ db</button> </font></form> <!-- SiSU Spine Search --> </div>┃", diff --git a/org/out_xmls.org b/org/out_xmls.org index 964f43d..84c15db 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -368,7 +368,7 @@ import <input type="hidden" name="ec" value="on"> <input type="hidden" name="url" value="on"> <button type="submit" form="search" name="fn" value="%s">doc</button> - <button type="submit" form="search">db</button> + <button type="submit" form="search">※ db</button> </font></form> <!-- SiSU Spine Search --> </div>┃", @@ -397,11 +397,18 @@ import ) { string o; string metadata_links = ((doc_matters.opt.action.html_curate_link) - ? format(q"┃<p class="tiny">[<a href="%s"> ≅ </a>|<a href="%smetadata.%s.html"> m </a>|<a href="%s../../authors.html"> A </a>|<a href="%s../../topics.html"> T </a>]</p>┃", + ? format(q"┃<p class="small">[<a href="%s"> ≅ </a>|<a href="%s"> %s </a>|<a href="%sepub/%s.%s.epub"> ◆ </a>|<a href="%smetadata.%s.html"> m </a>|<a href="%s../../authors.html"> A </a>|<a href="%s../../topics.html"> T </a>]</p>┃", (doc_matters.opt.action.webserver_url_doc_root.length > 0) ? doc_matters.opt.action.webserver_url_doc_root : doc_matters.conf_make_meta.conf.w_srv_data_root_url , // HOME index.html equivalent _cfg.www_url_doc_root, + (type == "seg") + ? "../" ~ doc_matters.src.filename_base ~ ".html" + : "./" ~ doc_matters.src.filename_base ~ "/toc.html", + (type == "seg") ? "▣" : "▤", // ■ □ ▢ ▣ ▤ ▥ ▦ ▧ ▨ 〓 + (type == "seg") ? "../../" : "../", + doc_matters.src.filename_base, + doc_matters.src.lng, (type == "seg") ? "../" : "", doc_matters.src.filename_base, (type == "seg") ? "../" : "", diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d index 4dd8476..6eab92e 100644 --- a/src/doc_reform/io_out/metadata.d +++ b/src/doc_reform/io_out/metadata.d @@ -67,7 +67,7 @@ template outputMetadata() { <input type="hidden" name="ec" value="on"> <input type="hidden" name="url" value="on"> <button type="submit" form="search" name="fn" value="%s">doc</button> - <button type="submit" form="search">db</button> + <button type="submit" form="search">※ db</button> </font></form> <!-- SiSU Spine Search --> </div>┃", @@ -352,12 +352,12 @@ string theme_light_1 = format(q"┃ ┃"); metadata_ ~= "<div class=\"flex-menu-bar\"><div class=\"flex-menu-option\">"; if (doc_matters.opt.action.html_curate_link) { - metadata_ ~= format(q"┃<p>[<a href="../../index.html"> HOME </a>] Curated metadata + metadata_ ~= format(q"┃<p>[<a href="../../../index.html"> <b>≅</b> HOME </a>] Curated metadata: [<a href="../../authors.html"> Authors </a>] [<a href="../../topics.html"> Topics </a>]</p> ┃"); } else { - metadata_ ~= format(q"┃<p>[<a href="../../index.html"> HOME </a>] + metadata_ ~= format(q"┃<p>[<a href="../../../index.html"> ≅ <b>HOME</b> </a>] ┃"); } metadata_ ~= "</div>" ~ inline_search_form(doc_matters) ~ "</div><hr />"; @@ -399,11 +399,11 @@ string theme_light_1 = format(q"┃ ~ "[<a href=\"../../" ~ pth_pod.internal_base ~ "/" ~ doc_matters.src.filename_base ~ "/\">" ~ " pod tree </a>]</p>"; metadata_ ~= "<p class=\"lev1\">● outputs: [<a href=\"" ~ doc_matters.src.filename_base ~ ".html\">" - ~ " html scroll </a>] " + ~ " ▣ html scroll </a>] " ~ "[<a href=\"" ~ doc_matters.src.filename_base ~ "/toc.html\">" - ~ " html seg </a>]" + ~ " ▤ html seg </a>]" ~ "[<a href=\"../../" ~ pth_epub.internal_base ~ "/" ~ doc_matters.src.filename_base ~ "." ~ doc_matters.src.language ~ ".epub\">" - ~ " epub </a>]</p>"; + ~ " ◆ epub </a>]</p>"; if (doc_matters.conf_make_meta.meta.classify_topic_register_arr.length > 0) { metadata_ ~= "<hr /><p class=\"lev0\">Topics:</p>"; string[] _top = ["", "", "", "", ""]; diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index 2524664..66661cf 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -265,7 +265,7 @@ template outputXHTMLs() { <input type="hidden" name="ec" value="on"> <input type="hidden" name="url" value="on"> <button type="submit" form="search" name="fn" value="%s">doc</button> - <button type="submit" form="search">db</button> + <button type="submit" form="search">※ db</button> </font></form> <!-- SiSU Spine Search --> </div>┃", @@ -288,11 +288,18 @@ template outputXHTMLs() { ) { string o; string metadata_links = ((doc_matters.opt.action.html_curate_link) - ? format(q"┃<p class="tiny">[<a href="%s"> ≅ </a>|<a href="%smetadata.%s.html"> m </a>|<a href="%s../../authors.html"> A </a>|<a href="%s../../topics.html"> T </a>]</p>┃", + ? format(q"┃<p class="small">[<a href="%s"> ≅ </a>|<a href="%s"> %s </a>|<a href="%sepub/%s.%s.epub"> ◆ </a>|<a href="%smetadata.%s.html"> m </a>|<a href="%s../../authors.html"> A </a>|<a href="%s../../topics.html"> T </a>]</p>┃", (doc_matters.opt.action.webserver_url_doc_root.length > 0) ? doc_matters.opt.action.webserver_url_doc_root : doc_matters.conf_make_meta.conf.w_srv_data_root_url , // HOME index.html equivalent _cfg.www_url_doc_root, + (type == "seg") + ? "../" ~ doc_matters.src.filename_base ~ ".html" + : "./" ~ doc_matters.src.filename_base ~ "/toc.html", + (type == "seg") ? "▣" : "▤", // ■ □ ▢ ▣ ▤ ▥ ▦ ▧ ▨ 〓 + (type == "seg") ? "../../" : "../", + doc_matters.src.filename_base, + doc_matters.src.lng, (type == "seg") ? "../" : "", doc_matters.src.filename_base, (type == "seg") ? "../" : "", diff --git a/src/doc_reform/meta/metadoc_curate_authors.d b/src/doc_reform/meta/metadoc_curate_authors.d index ceb6229..f3c1138 100644 --- a/src/doc_reform/meta/metadoc_curate_authors.d +++ b/src/doc_reform/meta/metadoc_curate_authors.d @@ -84,7 +84,7 @@ template spineMetaDocCuratesAuthors() { <input type="hidden" name="sml" value="1000"> <input type="hidden" name="ec" value="on"> <input type="hidden" name="url" value="on"> - <button type="submit" form="search">db</button> + <button type="submit" form="search">※ db</button> </font></form> <!-- SiSU Spine Search --> </div>┃", diff --git a/src/doc_reform/meta/metadoc_curate_topics.d b/src/doc_reform/meta/metadoc_curate_topics.d index 0f6b74c..a8b0db0 100644 --- a/src/doc_reform/meta/metadoc_curate_topics.d +++ b/src/doc_reform/meta/metadoc_curate_topics.d @@ -84,7 +84,7 @@ template spineMetaDocCuratesTopics() { <input type="hidden" name="sml" value="1000"> <input type="hidden" name="ec" value="on"> <input type="hidden" name="url" value="on"> - <button type="submit" form="search">db</button> + <button type="submit" form="search">※ db</button> </font></form> <!-- SiSU Spine Search --> </div>┃", diff --git a/sundry/spine_search_cgi/src/spine_search.d_ b/sundry/spine_search_cgi/src/spine_search.d_ index 30e0e9e..5259ce7 100755 --- a/sundry/spine_search_cgi/src/spine_search.d_ +++ b/sundry/spine_search_cgi/src/spine_search.d_ @@ -1518,7 +1518,7 @@ void cgi_function_intro(Cgi cgi) { <td valign=\"top\"><tr><td> <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: |