diff options
author | Ralph Amissah <ralph.amissah@gmail.com> | 2023-06-27 16:53:20 -0400 |
---|---|---|
committer | Ralph Amissah <ralph.amissah@gmail.com> | 2023-06-28 16:20:33 -0400 |
commit | b861bbb5810c95fe7079c853453ea698ca01f336 (patch) | |
tree | 7ddd70412a8c35cc994a50b5eecc883823f7a4ff /src/doc_reform/io_out | |
parent | "empty page" index.html, sort homepage link (diff) |
icon chars, usability / cosmetic minor fix
Diffstat (limited to 'src/doc_reform/io_out')
-rw-r--r-- | src/doc_reform/io_out/html_snippet.d | 6 | ||||
-rw-r--r-- | src/doc_reform/io_out/metadata.d | 66 | ||||
-rw-r--r-- | src/doc_reform/io_out/xmls.d | 12 | ||||
-rw-r--r-- | src/doc_reform/io_out/xmls_css.d | 84 |
4 files changed, 145 insertions, 23 deletions
diff --git a/src/doc_reform/io_out/html_snippet.d b/src/doc_reform/io_out/html_snippet.d index 8dbb949..92c25d5 100644 --- a/src/doc_reform/io_out/html_snippet.d +++ b/src/doc_reform/io_out/html_snippet.d @@ -71,9 +71,9 @@ template htmlSnippet() { <link href="%s" rel="stylesheet" /> </head> <body> - <p class="heading"> - <a href="%s">⟰ </a> - <a href="%s"> ≅ </a> + <p class="icons"> + <a href="%s" class="lnkicon">⟰ </a> + <a href="%s" class="lnkicon"> ≅ </a> </p> </body> </html>┃", diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d index 2745237..1ac7350 100644 --- a/src/doc_reform/io_out/metadata.d +++ b/src/doc_reform/io_out/metadata.d @@ -60,7 +60,7 @@ template outputMetadata() { <div class="flex-menu-option"> <!-- SiSU Spine Search --> <form action="%s" target="_top" method="POST" accept-charset="UTF-8" id="searchtxt"> - <font size="2">🔎 + <font size="2">%s <input type="text" name="sf" size="24" maxlength="255">%s <input type="hidden" name="sml" value="1000"> <input type="hidden" name="ec" value="on"> @@ -86,6 +86,11 @@ template outputMetadata() { doc_matters.conf_make_meta.conf.w_srv_cgi_action, (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) ? "" + : "\n <a href=\"" + ~ doc_matters.conf_make_meta.conf.w_srv_cgi_action + ~ "\">🔎 </a>", + (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) + ? "" : "\n <input type=\"hidden\" name=\"db\" value=\"" ~ doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename ~ "\">", @@ -134,6 +139,18 @@ string theme_dark_0 = format(q"┃ color : #888888; text-decoration : underline; } + a.lnkicon:link { + text-decoration : none; + } + a.lnkicon:visited { + text-decoration : none; + } + a.lnkicon:hover { + font-size : 160%%; + } + a:hover img { + background-color : #FFFFFF; + } input { color : #FFFFFF; background-color : #777777; @@ -164,6 +181,18 @@ string theme_light_0 = format(q"┃ color : #003399; text-decoration : underline; } + a.lnkicon:link { + text-decoration : none; + } + a.lnkicon:visited { + text-decoration : none; + } + a.lnkicon:hover { + font-size : 160%%; + } + a:hover img { + background-color : #FFFFFF; + } input { color : #000000; background-color : #FFFFFF; @@ -265,6 +294,15 @@ string theme_light_1 = format(q"┃ margin-right : 6px; text-align : left; } + p.icons, .icons_center { + font-size : 100%%; + margin-top : 0px; + margin-bottom : 0px; + margin-right : 6px; + } + p.icons { + text-align : left; + } p.lev0 { font-size : 120%%; margin-left : 1em; @@ -388,9 +426,9 @@ string theme_light_1 = format(q"┃ ┃"); metadata_ ~= "<div class=\"flex-menu-bar\"><div class=\"flex-menu-option\">"; if (doc_matters.opt.action.html_link_curate) { - metadata_ ~= format(q"┃<p>[<a href="%s"> <b>⟰</b> HOME </a> | <a href="../../index.html"> ≅ Collection </a>] [ - <a href="../../authors.html"> 🖋 Authors </a> | - <a href="../../topics.html"> ⌘ Topics </a>]</p> + metadata_ ~= format(q"┃<p class="icons">[<a href="%s" class="lnkicon"> <b>⟰</b> HOME </a> | <a href="../../index.html" class="lnkicon"> ≅ Collection </a>] [ + <a href="../../authors.html" class="lnkicon"> 🖋 Authors </a> | + <a href="../../topics.html" class="lnkicon"> ⌘ Topics </a>]</p> ┃", (doc_matters.opt.action.webserver_url_doc_root.length > 0) ? doc_matters.opt.action.webserver_url_doc_root @@ -398,7 +436,7 @@ string theme_light_1 = format(q"┃ , // HOME index.html equivalent _cfg.www_url_doc_root, ); } else { - metadata_ ~= format(q"┃<p>[<a href="../../../index.html"> ≅ <b>HOME</b> </a> <a href="../../index.html"> ≅ Collection </a>] + metadata_ ~= format(q"┃<p class="icons">[<a href="../../../index.html" class="lnkicon"> ≅ <b>HOME</b> </a> <a href="../../index.html" class="lnkicon"> ≅ Collection </a>] ┃"); } metadata_ ~= "</div>" ~ inline_search_form(doc_matters) ~ "</div><hr />"; @@ -436,35 +474,35 @@ string theme_light_1 = format(q"┃ } metadata_ ~= "<hr /><p class=\"lev1\">source: " ~ doc_matters.src.filename_base ~ "</p>"; if (doc_matters.opt.action.html_link_markup_source) { - metadata_ ~= "<p class=\"lev1\">● markup source: the pod [<a href=\"../../" ~ pth_pod.internal_base ~ "/" ~ doc_matters.src.filename_base ~ ".zip\">" + metadata_ ~= "<p class=\"lev1\">● markup source: the pod [<a href=\"../../" ~ pth_pod.internal_base ~ "/" ~ doc_matters.src.filename_base ~ ".zip\" class=\"lnkicon\">" ~ " 🫛 zipped </a>| " - ~ "<a href=\"../../" ~ pth_pod.internal_base ~ "/" ~ doc_matters.src.filename_base ~ "/\">" + ~ "<a href=\"../../" ~ pth_pod.internal_base ~ "/" ~ doc_matters.src.filename_base ~ "/\" class=\"lnkicon\">" ~ " 🫛 tree </a>] "; } - metadata_ ~= "<p class=\"lev1\">● outputs: [ html: <a href=\"" ~ doc_matters.src.filename_base ~ ".html\">" + metadata_ ~= "<p class=\"lev1\">● outputs: [ html: <a href=\"" ~ doc_matters.src.filename_base ~ ".html\" class=\"lnkicon\">" ~ " ▤ scroll </a> " - ~ "|<a href=\"" ~ doc_matters.src.filename_base ~ "/toc.html\">" + ~ "|<a href=\"" ~ doc_matters.src.filename_base ~ "/toc.html\" class=\"lnkicon\">" ~ " ※ seg </a>] " - ~ "[<a href=\"../../" ~ pth_epub.internal_base ~ "/" ~ doc_matters.src.filename_base ~ "." ~ doc_matters.src.language ~ ".epub\">" + ~ "[<a href=\"../../" ~ pth_epub.internal_base ~ "/" ~ doc_matters.src.filename_base ~ "." ~ doc_matters.src.language ~ ".epub\" class=\"lnkicon\">" ~ " ◆ epub </a>] "; if ((doc_matters.opt.action.html_link_pdf) || (doc_matters.opt.action.html_link_pdf_a4)) { metadata_ ~= "[ pdf: <a href=\"../../pdf/" ~ doc_matters.src.filename_base - ~ "." ~ doc_matters.src.language ~ ".a4.portrait.pdf\">" + ~ "." ~ doc_matters.src.language ~ ".a4.portrait.pdf\" class=\"lnkicon\">" ~ " □ a4 </a> " ~ "|<a href=\"../../pdf/" ~ doc_matters.src.filename_base - ~ "." ~ doc_matters.src.language ~ ".letter.portrait.pdf\">" + ~ "." ~ doc_matters.src.language ~ ".letter.portrait.pdf\" class=\"lnkicon\">" ~ " □ U.S. letter </a>] "; } else if (doc_matters.opt.action.html_link_pdf_a4) { metadata_ ~= "[<a href=\"../../pdf/" ~ doc_matters.src.filename_base - ~ "." ~ doc_matters.src.language ~ ".a4.portrait.pdf\">" + ~ "." ~ doc_matters.src.language ~ ".a4.portrait.pdf\" class=\"lnkicon\">" ~ " □ pdf (a4) </a>] "; } else if (doc_matters.opt.action.html_link_pdf_letter) { metadata_ ~= "[<a href=\"../../pdf/" ~ doc_matters.src.filename_base - ~ "." ~ doc_matters.src.language ~ ".letter.portrait.pdf\">" + ~ "." ~ doc_matters.src.language ~ ".letter.portrait.pdf\" class=\"lnkicon\">" ~ " □ pdf (U.S. letter) </a>] "; } metadata_ ~= "</p>"; diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index 4fd4e1b..16781e7 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -239,13 +239,13 @@ template outputXHTMLs() { _locations = (doc_matters.conf_make_meta.make.home_button_text) .replaceAll( rgx.inline_link, - ("<p class=\"tiny_left\"><a href=\"$2\">$1</a></p>")) + ("<p class=\"tiny_left\"><a href=\"$2\" class=\"lnkicon\">$1</a></p>")) .replaceAll( rgx.br_line, "") .replaceAll( rgx.br_line_inline, ""); } else { - _locations = "<p class=\"tiny_left\"><a href=\"https://www.doc-reform.org\">spine</a></p>\n<p class=\"tiny_left\"><a href=\"https://git.sisudoc.org/software/spine/\">sources / git</a></p>\n<p class=\"tiny_left\"><a href=\"https://www.sisudoc.org\">www.sisudoc.org</a></p>"; + _locations = "<p class=\"icons\"><a href=\"https://www.doc-reform.org\" class=\"lnkicon\">spine</a></p>\n<p class=\"icons\"><a href=\"https://git.sisudoc.org/software/spine/\" class=\"lnkicon\">sources / git</a></p>\n<p class=\"icons\"><a href=\"https://www.sisudoc.org\" class=\"lnkicon\">www.sisudoc.org</a></p>"; } string o; o = format(q"┃<div class="flex-menu-option"> @@ -320,7 +320,7 @@ template outputXHTMLs() { ) { string o; string metadata_links = ((doc_matters.opt.action.html_link_curate) - ? format(q"┃<p class="small"><a href="%s">⟰ </a> [<a href="%s"> %s </a><a href="%sepub/%s.%s.epub"> ◆ </a>%s%s<a href="%smetadata.%s.html"> ℹ </a>] <a href="%s../../index.html"> ≅ </a>|<a href="%s../../authors.html"> 🖋 </a>|<a href="%s../../topics.html"> ⌘ </a>|</p>┃", + ? format(q"┃<p class="icons"><a href="%s" class="lnkicon">⟰ </a> [<a href="%s" class="lnkicon"> %s </a><a href="%sepub/%s.%s.epub" class="lnkicon"> ◆ </a>%s%s<a href="%smetadata.%s.html" class="lnkicon"> ℹ </a>] <a href="%s../../index.html" class="lnkicon"> ≅ </a>|<a href="%s../../authors.html" class="lnkicon"> 🖋 </a>|<a href="%s../../topics.html" class="lnkicon"> ⌘ </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 @@ -339,7 +339,7 @@ template outputXHTMLs() { ~ doc_matters.src.filename_base ~ "." ~ doc_matters.src.lng - ~ ".a4.portrait.pdf\"> □ </a>") + ~ ".a4.portrait.pdf\" class=\"lnkicon\"> □ </a>") : "", (doc_matters.opt.action.html_link_pdf || doc_matters.opt.action.html_link_pdf_letter) ? ("<a href=\"" @@ -348,7 +348,7 @@ template outputXHTMLs() { ~ doc_matters.src.filename_base ~ "." ~ doc_matters.src.lng - ~ ".letter.portrait.pdf\"> □ </a>") + ~ ".letter.portrait.pdf\" class=\"lnkicon\"> □ </a>") : "", (type == "seg") ? "../" : "", doc_matters.src.filename_base, @@ -486,7 +486,7 @@ template outputXHTMLs() { <hr /> <div class="generator"> <p class="small_center" id="sisu_spine"><a name="sisu_spine"></a> - <a href="https://sisudoc.org">≅ SiSU Spine ፨</a> (object numbering & object search) + <a href="https://sisudoc.org" class="lnkicon">≅ SiSU Spine ፨</a> (object numbering & object search) </p> <p class="small_center" id="sisu_spine"><a name="sisu_spine"></a> (web 1993, object numbering 1997, object search 2002 ...) 2023 diff --git a/src/doc_reform/io_out/xmls_css.d b/src/doc_reform/io_out/xmls_css.d index dc4811d..50cab21 100644 --- a/src/doc_reform/io_out/xmls_css.d +++ b/src/doc_reform/io_out/xmls_css.d @@ -510,6 +510,15 @@ a.lnkocn:hover { color : #777777; font-size : 1.8rem; } +a.lnkicon:link { + text-decoration : none; +} +a.lnkicon:visited { + text-decoration : none; +} +a.lnkicon:hover { + font-size : 160%%; +} a:hover img { background-color : #FFFFFF; } @@ -798,6 +807,15 @@ p.tiny_center { margin-right : 0px; text-align : center; } +p.icons, .icons_center { + font-size : 100%%; + margin-top : 0px; + margin-bottom : 0px; + margin-right : 6px; +} +p.icons { + text-align : left; +} p.concordance_word { line-height : 150%%; font-weight : bold; @@ -1241,6 +1259,16 @@ a.lnkocn:hover { color : #BBBBBB; font-size : 1.8rem; } +a.lnkicon:link { + text-decoration : none; +} +a.lnkicon:visited { + text-decoration : none; +} +a.lnkicon:hover { + color : #BBBBBB; + font-size : 120%%; +} a:hover img { background-color : #000000; } @@ -1973,6 +2001,15 @@ a.lnkocn:hover { color : #777777; font-size : 1.8rem; } +a.lnkicon:link { + text-decoration : none; +} +a.lnkicon:visited { + text-decoration : none; +} +a.lnkicon:hover { + font-size : 160%%; +} a:hover img { background-color : #FFFFFF; } @@ -2261,6 +2298,15 @@ p.tiny_center { margin-right : 0px; text-align : center; } +p.icons, .icons_center { + font-size : 100%%; + margin-top : 0px; + margin-bottom : 0px; + margin-right : 6px; +} +p.icons { + text-align : left; +} p.concordance_word { line-height : 150%%; font-weight : bold; @@ -2630,6 +2676,16 @@ a.lnkocn:hover { color : #BBBBBB; font-size : 1.8rem; } +a.lnkicon:link { + text-decoration : none; +} +a.lnkicon:visited { + text-decoration : none; +} +a.lnkicon:hover { + color : #BBBBBB; + font-size : 120%%; +} a:hover img { background-color : #000000; } @@ -3288,6 +3344,15 @@ a.lnkocn:hover { color : #777777; font-size : 1.8rem; } +a.lnkicon:link { + text-decoration : none; +} +a.lnkicon:visited { + text-decoration : none; +} +a.lnkicon:hover { + font-size : 160%%; +} a:hover img { background-color : #FFFFFF; } @@ -3576,6 +3641,15 @@ p.tiny_center { margin-right : 0px; text-align : center; } +p.icons, .icons_center { + font-size : 100%%; + margin-top : 0px; + margin-bottom : 0px; + margin-right : 6px; +} +p.icons { + text-align : left; +} p.concordance_word { line-height : 150%%; font-weight : bold; @@ -3835,6 +3909,16 @@ a.lnkocn:hover { color : #BBBBBB; font-size : 1.8rem; } +a.lnkicon:link { + text-decoration : none; +} +a.lnkicon:visited { + text-decoration : none; +} +a.lnkicon:hover { + color : #BBBBBB; + font-size : 120%%; +} a:hover img { background-color : #000000; } |