From 681dd49c3e138942778266cc44210e47eea8b048 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 24 Apr 2020 13:59:28 -0400 Subject: html, harvests search form, minor misc - harvests add search form to db option - dark theme input background color (follows cgi search form) - html tidy html tidy --- org/out_harvest_metadata.org | 96 +++++++++++++++++++++++++- org/out_metadata.org | 85 +++++++++++++++++++++-- org/out_xmls.org | 27 ++++---- org/out_xmls_css.org | 8 +++ src/doc_reform/io_out/metadata.d | 74 +++++++++++++++++++- src/doc_reform/io_out/xmls.d | 27 ++++---- src/doc_reform/io_out/xmls_css.d | 24 +++++++ src/doc_reform/meta/metadoc_harvests_authors.d | 78 ++++++++++++++++++++- src/doc_reform/meta/metadoc_harvests_topics.d | 78 ++++++++++++++++++++- 9 files changed, 457 insertions(+), 40 deletions(-) diff --git a/org/out_harvest_metadata.org b/org/out_harvest_metadata.org index bcd4472..b9d7296 100644 --- a/org/out_harvest_metadata.org +++ b/org/out_harvest_metadata.org @@ -136,6 +136,7 @@ template spineMetaDocHarvestsTopics() { M _make_and_meta_struct, O _opt_action, ) { + <> <> <> <> @@ -220,7 +221,14 @@ foreach(k, doc_harvest; hvst.harvests) {

Metadata Harvest - Topics (output organised by language & filetype)

[ HOME ] [ Metadata Harvest - Authors ]

A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,

@@ -233,6 +241,7 @@ foreach(k, doc_harvest; hvst.harvests) { ┃", _opt_action.css_theme_default ? theme_light_0 : theme_dark_0, _opt_action.css_theme_default ? theme_light_1 : theme_dark_1, + inline_search_form(_make_and_meta_struct), ) ~ "\n"; #+END_SRC @@ -467,6 +476,7 @@ template spineMetaDocHarvestsAuthors() { M _make_and_meta_struct, O _opt_action, ) { + <> <> <> <> @@ -502,7 +512,14 @@ template spineMetaDocHarvestsAuthors() {

Metadata Harvest - Authors (output organised by language & filetype)

[ HOME ] [ Metadata Harvest - Topics ]

A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, @@ -515,6 +532,7 @@ template spineMetaDocHarvestsAuthors() { ┃", _opt_action.css_theme_default ? theme_light_0 : theme_dark_0, _opt_action.css_theme_default ? theme_light_1 : theme_dark_1, + inline_search_form(_make_and_meta_struct), ) ~ "\n"; string[string] _au; string[] _auth_date_title; @@ -646,6 +664,10 @@ string theme_dark_0 = format(q"┃ color : #FFFFFF; background : #777777; } + input { + color : #FFFFFF; + background-color : #777777; + } ┃"); string theme_light_0 = format(q"┃ body { @@ -686,6 +708,10 @@ string theme_light_0 = format(q"┃ a.lev3:hover { background : #BBBBBB; } + input { + color : #000000; + background-color : #FFFFFF; + } ┃"); #+END_SRC @@ -753,6 +779,43 @@ string theme_light_1 = format(q"┃ ┃"); #+END_SRC +*** search form + +#+NAME: harvested_html_search +#+BEGIN_SRC d +@safe string inline_search_form(M)( + M _make_and_meta_truct, +) { + string o; + string _form; + if (_opt_action.html_search_link) { + o = format(q"┃ +

┃", + _make_and_meta_struct.conf.w_srv_cgi_action, + (_make_and_meta_struct.conf.w_srv_db_sqlite.empty) + ? "" + : "\n ", + ); + } else { + o = ""; + } + return o; +} +#+END_SRC + *** harvested html head #+NAME: harvested_html_head @@ -852,6 +915,35 @@ string theme_light_1 = format(q"┃ font-size : 80%%; margin-left : 6em; }%s + /* flex */ + .flex-menu-bar { + display : -webkit-flex; + display : flex; + -webkit-flex-wrap : wrap; + -webkit-align-items : center; + align-items : center; + width : 100%%; + margin-left : 0%%; + margin-right : 2%%; + background-color : inherited; + } + .flex-menu-option { + background-color : inherited; + margin-right : 4px; + } + .flex-list { + display : -webkit-flex; + display : flex; + -webkit-align-items : center; + display : block; + align-items : center; + width : 100%%; + background-color : inherited; + } + .flex-list-item { + background-color : inherited; + margin : 4px; + } #+END_SRC diff --git a/org/out_metadata.org b/org/out_metadata.org index f7f8700..13d6708 100644 --- a/org/out_metadata.org +++ b/org/out_metadata.org @@ -22,6 +22,7 @@ module doc_reform.io_out.metadata; template outputMetadata() { @safe void outputMetadata(T)( T doc_matters) { + <> <> <> <> @@ -77,17 +78,17 @@ metadata_ ~= format(q"┃ ┃"); +metadata_ ~= "

"; if (!(doc_matters.conf_make_meta.meta.title_full.empty)) { metadata_ ~= "

Title: " ~ doc_matters.conf_make_meta.meta.title_full ~ "

"; } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.very_verbose) { @@ -258,7 +259,7 @@ metadata_write_output(doc_matters, metadata_); **** head #+NAME: harvested_html_themes -#+BEGIN_SRC d +#+BEGIN_SRC css string theme_dark_0 = format(q"┃ body { color : #CCCCCC; @@ -284,6 +285,10 @@ string theme_dark_0 = format(q"┃ color : #888888; text-decoration : underline; } + input { + color : #FFFFFF; + background-color : #777777; + } ┃"); string theme_light_0 = format(q"┃ body { @@ -310,13 +315,17 @@ string theme_light_0 = format(q"┃ color : #003399; text-decoration : underline; } + input { + color : #000000; + background-color : #FFFFFF; + } ┃"); #+END_SRC **** levels #+NAME: harvested_html_themes -#+BEGIN_SRC d +#+BEGIN_SRC css string theme_dark_1 = format(q"┃ h1 { color : #FFFFFF; @@ -454,6 +463,35 @@ string theme_light_1 = format(q"┃ font-size : 80%%; margin-left : 6em; }%s + /* flex */ + .flex-menu-bar { + display : -webkit-flex; + display : flex; + -webkit-flex-wrap : wrap; + -webkit-align-items : center; + align-items : center; + width : 100%%; + margin-left : 0%%; + margin-right : 2%%; + background-color : inherited; + } + .flex-menu-option { + background-color : inherited; + margin-right : 4px; + } + .flex-list { + display : -webkit-flex; + display : flex; + -webkit-align-items : center; + display : block; + align-items : center; + width : 100%%; + background-color : inherited; + } + .flex-list-item { + background-color : inherited; + margin : 4px; + } #+END_SRC @@ -484,3 +522,42 @@ string theme_light_1 = format(q"┃ doc_matters.opt.action.css_theme_default ? theme_light_1 : theme_dark_1, ) ~ "\n"; #+END_SRC + +*** search form + +#+NAME: harvested_html_search +#+BEGIN_SRC d +@safe string inline_search_form(M)( + M doc_matters, +) { + string o; + string _form; + if (doc_matters.opt.action.html_search_link) { + o = format(q"┃ +┃", + doc_matters.conf_make_meta.conf.w_srv_cgi_action, + (doc_matters.conf_make_meta.conf.w_srv_db_sqlite.empty) + ? "" + : "\n ", + doc_matters.src.filename_base, + ); + } else { + o = ""; + } + return o; +} +#+END_SRC diff --git a/org/out_xmls.org b/org/out_xmls.org index 0211cd5..db1b2a0 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -200,7 +200,7 @@ import ┃", - doc_matters.conf_make_meta.meta.title_full, + doc_matters.conf_make_meta.meta.title_full.replaceAll(regex("\""), """), doc_matters.conf_make_meta.meta.creator_author, _publisher, doc_matters.conf_make_meta.meta.date_published, @@ -261,7 +261,6 @@ import o = format(q"┃

%s @@ -397,7 +396,7 @@ import ┃", html_simple, - doc_matters.conf_make_meta.meta.title_full, + doc_matters.conf_make_meta.meta.title_full.replaceAll(regex("\""), """), (doc_matters.conf_make_meta.meta.creator_author.empty) ? "" : ", " ~ doc_matters.conf_make_meta.meta.creator_author, doc_matters.conf_make_meta.meta.title_full, @@ -772,7 +771,7 @@ import toc = format(q"┃ ┃", @@ -784,7 +783,7 @@ import prev = format(q"┃

┃", @@ -797,18 +796,17 @@ import next = format(q"┃

┃", obj.tags.segname_next, ); } - string _toc_pre_next = format(q"┃ + string _toc_pre_next = format(q"┃

┃", @@ -816,10 +814,9 @@ import prev, next, ); - string _pre_next = format(q"┃ + string _pre_next = format(q"┃ ┃", diff --git a/org/out_xmls_css.org b/org/out_xmls_css.org index 443f788..7e5ed46 100644 --- a/org/out_xmls_css.org +++ b/org/out_xmls_css.org @@ -157,6 +157,10 @@ template spineCss() { color : #003399; text-decoration : underline; } + input { + color : #000000; + background-color : #FFFFFF; + } #+END_SRC **** div @@ -1073,6 +1077,10 @@ Consider what if anything should be used here color : #888888; text-decoration : underline; } + input { + color : #FFFFFF; + background-color : #777777; + } #+END_SRC **** div diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d index 6c059ce..1d366b9 100644 --- a/src/doc_reform/io_out/metadata.d +++ b/src/doc_reform/io_out/metadata.d @@ -1,6 +1,39 @@ module doc_reform.io_out.metadata; template outputMetadata() { @safe void outputMetadata(T)( T doc_matters) { + @safe string inline_search_form(M)( + M doc_matters, + ) { + string o; + string _form; + if (doc_matters.opt.action.html_search_link) { + o = format(q"┃ + ┃", + doc_matters.conf_make_meta.conf.w_srv_cgi_action, + (doc_matters.conf_make_meta.conf.w_srv_db_sqlite.empty) + ? "" + : "\n ", + doc_matters.src.filename_base, + ); + } else { + o = ""; + } + return o; + } import std.file, std.format; @@ -32,6 +65,10 @@ string theme_dark_0 = format(q"┃ color : #888888; text-decoration : underline; } + input { + color : #FFFFFF; + background-color : #777777; + } ┃"); string theme_light_0 = format(q"┃ body { @@ -58,6 +95,10 @@ string theme_light_0 = format(q"┃ color : #003399; text-decoration : underline; } + input { + color : #000000; + background-color : #FFFFFF; + } ┃"); string theme_dark_1 = format(q"┃ h1 { @@ -179,6 +220,35 @@ string theme_light_1 = format(q"┃ font-size : 80%%; margin-left : 6em; }%s + /* flex */ + .flex-menu-bar { + display : -webkit-flex; + display : flex; + -webkit-flex-wrap : wrap; + -webkit-align-items : center; + align-items : center; + width : 100%%; + margin-left : 0%%; + margin-right : 2%%; + background-color : inherited; + } + .flex-menu-option { + background-color : inherited; + margin-right : 4px; + } + .flex-list { + display : -webkit-flex; + display : flex; + -webkit-align-items : center; + display : block; + align-items : center; + width : 100%%; + background-color : inherited; + } + .flex-list-item { + background-color : inherited; + margin : 4px; + } @@ -230,17 +300,17 @@ string theme_light_1 = format(q"┃ ┃"); + metadata_ ~= "

"; if (!(doc_matters.conf_make_meta.meta.title_full.empty)) { metadata_ ~= "

Title: " ~ doc_matters.conf_make_meta.meta.title_full ~ "

"; } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.very_verbose) { diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index ffcdcb6..b4c5e56 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -109,7 +109,7 @@ template outputXHTMLs() { ┃", - doc_matters.conf_make_meta.meta.title_full, + doc_matters.conf_make_meta.meta.title_full.replaceAll(regex("\""), """), doc_matters.conf_make_meta.meta.creator_author, _publisher, doc_matters.conf_make_meta.meta.date_published, @@ -158,7 +158,6 @@ template outputXHTMLs() { o = format(q"┃

%s @@ -282,7 +281,7 @@ template outputXHTMLs() { ┃", html_simple, - doc_matters.conf_make_meta.meta.title_full, + doc_matters.conf_make_meta.meta.title_full.replaceAll(regex("\""), """), (doc_matters.conf_make_meta.meta.creator_author.empty) ? "" : ", " ~ doc_matters.conf_make_meta.meta.creator_author, doc_matters.conf_make_meta.meta.title_full, @@ -598,7 +597,7 @@ template outputXHTMLs() { toc = format(q"┃ ┃", @@ -610,7 +609,7 @@ template outputXHTMLs() { prev = format(q"┃

┃", @@ -623,18 +622,17 @@ template outputXHTMLs() { next = format(q"┃

┃", obj.tags.segname_next, ); } - string _toc_pre_next = format(q"┃ + string _toc_pre_next = format(q"┃

┃", @@ -642,10 +640,9 @@ template outputXHTMLs() { prev, next, ); - string _pre_next = format(q"┃ + string _pre_next = format(q"┃ ┃", diff --git a/src/doc_reform/io_out/xmls_css.d b/src/doc_reform/io_out/xmls_css.d index 88af237..e882b4d 100644 --- a/src/doc_reform/io_out/xmls_css.d +++ b/src/doc_reform/io_out/xmls_css.d @@ -466,6 +466,10 @@ template spineCss() { color : #003399; text-decoration : underline; } + input { + color : #000000; + background-color : #FFFFFF; + } div { margin-left : 0; margin-right : 0; @@ -1176,6 +1180,10 @@ template spineCss() { color : #888888; text-decoration : underline; } + input { + color : #FFFFFF; + background-color : #777777; + } div { margin-left : 0; margin-right : 0; @@ -1885,6 +1893,10 @@ template spineCss() { color : #003399; text-decoration : underline; } + input { + color : #000000; + background-color : #FFFFFF; + } div { margin-left : 0; margin-right : 0; @@ -2521,6 +2533,10 @@ template spineCss() { color : #888888; text-decoration : underline; } + input { + color : #FFFFFF; + background-color : #777777; + } div { margin-left : 0; margin-right : 0; @@ -3156,6 +3172,10 @@ template spineCss() { color : #003399; text-decoration : underline; } + input { + color : #000000; + background-color : #FFFFFF; + } div { margin-left : 0; margin-right : 0; @@ -3682,6 +3702,10 @@ template spineCss() { color : #888888; text-decoration : underline; } + input { + color : #FFFFFF; + background-color : #777777; + } div { margin-left : 0; margin-right : 0; diff --git a/src/doc_reform/meta/metadoc_harvests_authors.d b/src/doc_reform/meta/metadoc_harvests_authors.d index 132c0af..5555f9d 100644 --- a/src/doc_reform/meta/metadoc_harvests_authors.d +++ b/src/doc_reform/meta/metadoc_harvests_authors.d @@ -19,6 +19,37 @@ template spineMetaDocHarvestsAuthors() { M _make_and_meta_struct, O _opt_action, ) { + @safe string inline_search_form(M)( + M _make_and_meta_truct, + ) { + string o; + string _form; + if (_opt_action.html_search_link) { + o = format(q"┃ + ┃", + _make_and_meta_struct.conf.w_srv_cgi_action, + (_make_and_meta_struct.conf.w_srv_db_sqlite.empty) + ? "" + : "\n ", + ); + } else { + o = ""; + } + return o; + } string theme_dark_0 = format(q"┃ body { color : #CCCCCC; @@ -60,6 +91,10 @@ string theme_dark_0 = format(q"┃ color : #FFFFFF; background : #777777; } + input { + color : #FFFFFF; + background-color : #777777; + } ┃"); string theme_light_0 = format(q"┃ body { @@ -100,6 +135,10 @@ string theme_light_0 = format(q"┃ a.lev3:hover { background : #BBBBBB; } + input { + color : #000000; + background-color : #FFFFFF; + } ┃"); string theme_dark_1 = format(q"┃ h1 { @@ -261,6 +300,35 @@ string theme_light_1 = format(q"┃ font-size : 80%%; margin-left : 6em; }%s + /* flex */ + .flex-menu-bar { + display : -webkit-flex; + display : flex; + -webkit-flex-wrap : wrap; + -webkit-align-items : center; + align-items : center; + width : 100%%; + margin-left : 0%%; + margin-right : 2%%; + background-color : inherited; + } + .flex-menu-option { + background-color : inherited; + margin-right : 4px; + } + .flex-list { + display : -webkit-flex; + display : flex; + -webkit-align-items : center; + display : block; + align-items : center; + width : 100%%; + background-color : inherited; + } + .flex-list-item { + background-color : inherited; + margin : 4px; + } @@ -269,13 +337,21 @@ string theme_light_1 = format(q"┃

Metadata Harvest - Authors (output organised by language & filetype)

[ HOME ] [ Metadata Harvest - Topics ]

A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, ┃", _opt_action.css_theme_default ? theme_light_0 : theme_dark_0, _opt_action.css_theme_default ? theme_light_1 : theme_dark_1, + inline_search_form(_make_and_meta_struct), ) ~ "\n"; string[string] _au; string[] _auth_date_title; diff --git a/src/doc_reform/meta/metadoc_harvests_topics.d b/src/doc_reform/meta/metadoc_harvests_topics.d index aeb7cba..5332659 100644 --- a/src/doc_reform/meta/metadoc_harvests_topics.d +++ b/src/doc_reform/meta/metadoc_harvests_topics.d @@ -19,6 +19,37 @@ template spineMetaDocHarvestsTopics() { M _make_and_meta_struct, O _opt_action, ) { + @safe string inline_search_form(M)( + M _make_and_meta_truct, + ) { + string o; + string _form; + if (_opt_action.html_search_link) { + o = format(q"┃ +

┃", + _make_and_meta_struct.conf.w_srv_cgi_action, + (_make_and_meta_struct.conf.w_srv_db_sqlite.empty) + ? "" + : "\n ", + ); + } else { + o = ""; + } + return o; + } auto min_repeat_number = 42; string[] _document_topic_register; string[] _topic_register; @@ -103,6 +134,10 @@ string theme_dark_0 = format(q"┃ color : #FFFFFF; background : #777777; } + input { + color : #FFFFFF; + background-color : #777777; + } ┃"); string theme_light_0 = format(q"┃ body { @@ -143,6 +178,10 @@ string theme_light_0 = format(q"┃ a.lev3:hover { background : #BBBBBB; } + input { + color : #000000; + background-color : #FFFFFF; + } ┃"); string theme_dark_1 = format(q"┃ h1 { @@ -302,6 +341,35 @@ string theme_light_1 = format(q"┃ font-size : 80%%; margin-left : 6em; }%s + /* flex */ + .flex-menu-bar { + display : -webkit-flex; + display : flex; + -webkit-flex-wrap : wrap; + -webkit-align-items : center; + align-items : center; + width : 100%%; + margin-left : 0%%; + margin-right : 2%%; + background-color : inherited; + } + .flex-menu-option { + background-color : inherited; + margin-right : 4px; + } + .flex-list { + display : -webkit-flex; + display : flex; + -webkit-align-items : center; + display : block; + align-items : center; + width : 100%%; + background-color : inherited; + } + .flex-list-item { + background-color : inherited; + margin : 4px; + } @@ -310,13 +378,21 @@ string theme_light_1 = format(q"┃

Metadata Harvest - Topics (output organised by language & filetype)

[ HOME ] [ Metadata Harvest - Authors ]

A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,

┃", _opt_action.css_theme_default ? theme_light_0 : theme_dark_0, _opt_action.css_theme_default ? theme_light_1 : theme_dark_1, + inline_search_form(_make_and_meta_struct), ) ~ "\n"; char _prev_k = "_".to!char; int _kn; -- cgit v1.2.3