From b3ab72df529dab36483285567b1e72acb48187b3 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 2 Feb 2022 11:38:33 -0500 Subject: htmls, banner layout additions - scroll/seg doc access toggle - epub link added, later make optional - search button, minor cosmetic --- org/cgi_spine_search.org | 2 +- org/out_curate_metadata.org | 2 +- org/out_metadata.org | 12 ++++++------ org/out_xmls.org | 11 +++++++++-- src/doc_reform/io_out/metadata.d | 12 ++++++------ src/doc_reform/io_out/xmls.d | 11 +++++++++-- src/doc_reform/meta/metadoc_curate_authors.d | 2 +- src/doc_reform/meta/metadoc_curate_topics.d | 2 +- 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; - + index 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"┃ - + ┃", 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"┃ ┃"); metadata_ ~= "

"; @@ -132,11 +132,11 @@ metadata_ ~= "

● markup source: [" ~ " pod tree ]

"; metadata_ ~= "

● outputs: [" - ~ " html scroll ] " + ~ " ▣ html scroll ] " ~ "[" - ~ " html seg ]" + ~ " ▤ html seg ]" ~ "[" - ~ " epub ]

"; + ~ " ◆ epub ]

"; if (doc_matters.conf_make_meta.meta.classify_topic_register_arr.length > 0) { metadata_ ~= "

Topics:

"; string[] _top = ["", "", "", "", ""]; @@ -548,7 +548,7 @@ string theme_light_1 = format(q"┃ - + ┃", 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 - + ┃", @@ -397,11 +397,18 @@ import ) { string o; string metadata_links = ((doc_matters.opt.action.html_curate_link) - ? format(q"┃

[ ≅ | m | A | T ]

┃", + ? format(q"┃

[ ≅ | %s | ◆ | m | A | T ]

"; @@ -399,11 +399,11 @@ string theme_light_1 = format(q"┃ ~ "[" ~ " pod tree ]

"; metadata_ ~= "

● outputs: [" - ~ " html scroll ] " + ~ " ▣ html scroll ] " ~ "[" - ~ " html seg ]" + ~ " ▤ html seg ]" ~ "[" - ~ " epub ]

"; + ~ " ◆ epub ]

"; if (doc_matters.conf_make_meta.meta.classify_topic_register_arr.length > 0) { metadata_ ~= "

Topics:

"; 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() { - + ┃", @@ -288,11 +288,18 @@ template outputXHTMLs() { ) { string o; string metadata_links = ((doc_matters.opt.action.html_curate_link) - ? format(q"┃

[ ≅ | m | A | T ]

┃", + ? format(q"┃

[ ≅ | %s | ◆ | m | A | T ]

┃", (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() { - + ┃", 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() { - + ┃", 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) { - + index text / grep; match limit: -- cgit v1.2.3