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 --- src/doc_reform/meta/metadoc_harvests_authors.d | 78 +++++++++++++++++++++++++- src/doc_reform/meta/metadoc_harvests_topics.d | 78 +++++++++++++++++++++++++- 2 files changed, 154 insertions(+), 2 deletions(-) (limited to 'src/doc_reform/meta') 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 ]

+
+ +%s +


ABCDEFGHIJKLMNOPQRSTUVWXYZ,  ┃", _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 ]

+
+ + %s +

ABCDEFGHIJKLMNOPQRSTUVWXYZ


┃", _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