diff options
| -rw-r--r-- | org/out_xmls.org | 49 | ||||
| -rw-r--r-- | src/doc_reform/io_out/xmls.d | 49 |
2 files changed, 46 insertions, 52 deletions
diff --git a/org/out_xmls.org b/org/out_xmls.org index 864e86e..4ccd2a0 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -300,19 +300,19 @@ import string _form; if (doc_matters.opt.action.html_search_link) { o = format(q"┃ -<div class="flex-menu-option"> -<!-- SiSU Spine Search --> -<form action="%s" target="_top" method="POST" accept-charset="UTF-8" id="search"> -<font size="2"> -<input type="text" name="sf" size="24" maxlength="255">%s -<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" name="fn" value="%s">doc</button> -<button type="submit" form="search">db</button> -</font></form> -<!-- SiSU Spine Search --> -</div>┃", + <div class="flex-menu-option"> + <!-- SiSU Spine Search --> + <form action="%s" target="_top" method="POST" accept-charset="UTF-8" id="search"> + <font size="2"> + <input type="text" name="sf" size="24" maxlength="255">%s + <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" name="fn" value="%s">doc</button> + <button type="submit" form="search">db</button> + </font></form> + <!-- SiSU Spine Search --> + </div>┃", doc_matters.conf_make_meta.conf.w_srv_cgi_action, (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) ? "" @@ -370,7 +370,9 @@ import %s <div class="flex-menu-option"> %s - </div>%s%s┃", + </div>%s + </div> +</div>┃", special_characters_text(doc_matters.conf_make_meta.meta.title_full), (doc_matters.conf_make_meta.meta.creator_author.empty) ? "" : ", " ~ special_characters_text(doc_matters.conf_make_meta.meta.creator_author), @@ -383,7 +385,6 @@ import site_info_button(doc_matters), metadata_links, inline_search_form(doc_matters), - (type == "seg") ? "" : "\n</div>", ); return o; } @@ -848,22 +849,18 @@ import obj.tags.segname_next, ); } - string _toc_pre_next = format(q"┃ <div class="nav-bar"> - %s - %s - %s - </div> - </div> + string _toc_pre_next = format(q"┃ <div class="nav-bar"> + %s + %s + %s </div>┃", toc, prev, next, ); - string _pre_next = format(q"┃ <div class="nav-bar"> - %s - %s - </div> - </div> + string _pre_next = format(q"┃ <div class="nav-bar"> + %s + %s </div>┃", prev, next, diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index 5545f23..747212a 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -205,19 +205,19 @@ template outputXHTMLs() { string _form; if (doc_matters.opt.action.html_search_link) { o = format(q"┃ - <div class="flex-menu-option"> - <!-- SiSU Spine Search --> - <form action="%s" target="_top" method="POST" accept-charset="UTF-8" id="search"> - <font size="2"> - <input type="text" name="sf" size="24" maxlength="255">%s - <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" name="fn" value="%s">doc</button> - <button type="submit" form="search">db</button> - </font></form> - <!-- SiSU Spine Search --> - </div>┃", + <div class="flex-menu-option"> + <!-- SiSU Spine Search --> + <form action="%s" target="_top" method="POST" accept-charset="UTF-8" id="search"> + <font size="2"> + <input type="text" name="sf" size="24" maxlength="255">%s + <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" name="fn" value="%s">doc</button> + <button type="submit" form="search">db</button> + </font></form> + <!-- SiSU Spine Search --> + </div>┃", doc_matters.conf_make_meta.conf.w_srv_cgi_action, (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) ? "" @@ -269,7 +269,9 @@ template outputXHTMLs() { %s <div class="flex-menu-option"> %s - </div>%s%s┃", + </div>%s + </div> + </div>┃", special_characters_text(doc_matters.conf_make_meta.meta.title_full), (doc_matters.conf_make_meta.meta.creator_author.empty) ? "" : ", " ~ special_characters_text(doc_matters.conf_make_meta.meta.creator_author), @@ -282,7 +284,6 @@ template outputXHTMLs() { site_info_button(doc_matters), metadata_links, inline_search_form(doc_matters), - (type == "seg") ? "" : "\n</div>", ); return o; } @@ -682,22 +683,18 @@ template outputXHTMLs() { obj.tags.segname_next, ); } - string _toc_pre_next = format(q"┃ <div class="nav-bar"> - %s - %s - %s - </div> - </div> + string _toc_pre_next = format(q"┃ <div class="nav-bar"> + %s + %s + %s </div>┃", toc, prev, next, ); - string _pre_next = format(q"┃ <div class="nav-bar"> - %s - %s - </div> - </div> + string _pre_next = format(q"┃ <div class="nav-bar"> + %s + %s </div>┃", prev, next, |