From 73f8706880b753c9be8a27b0c28c59a3a45dfa86 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 9 Mar 2018 16:32:41 -0500 Subject: home button text, a redo --- src/sdp/meta/conf_make_meta_structs.d | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/sdp/meta/conf_make_meta_structs.d') diff --git a/src/sdp/meta/conf_make_meta_structs.d b/src/sdp/meta/conf_make_meta_structs.d index a5d2c15..64e45d9 100644 --- a/src/sdp/meta/conf_make_meta_structs.d +++ b/src/sdp/meta/conf_make_meta_structs.d @@ -24,14 +24,18 @@ auto url_markup(string line) { ~ _mkup.lnk_o ~ "$2" ~ _mkup.lnk_c ~ _mkup.url_o ~ "$3" ~ _mkup.url_c ~ "$4") // ("$1{ $2 }$3$4") - ) + ) .replaceAll( _rgx.inline_link_naked_url, ("$1" ~ _mkup.lnk_o ~ "$2" ~ _mkup.lnk_c ~ _mkup.url_o ~ "$2" ~ _mkup.url_c ~ "$3") // ("$1{ $2 }$2$3") - ); + ) + .replaceAll( + _rgx.arr_delimiter, + _mkup.br_line + ); return line_; } struct ConfCompositeMakeStr { @@ -43,7 +47,9 @@ struct ConfCompositeMakeStr { string[] footer; string[] headings; string[] home_button_image; - string[] home_button_text; + string home_button_text = "{SiSU}http://www.sisudoc.org;" + ~ " {www.sisudoc.org}http://www.sisudoc.org;" + ~ " {sources / git}http://git.sisudoc.org/gitweb/"; string italics; string auto_num_top_at_level; int auto_num_top_lv = 9; @@ -89,13 +95,8 @@ struct confCompositeMakeBuild { auto home_button_image(string[] _mk) { return _mk; } - auto home_button_text(string[] _mk) { - string line_; - string[] _mk2; - foreach (line; _mk) { - _mk2 ~= url_markup(line); - } - return _mk2; + auto home_button_text(string _mk) { + return url_markup(_mk); } auto italics(string _mk) { string[] _out; @@ -129,7 +130,9 @@ struct ConfCompositeMakeInit { string[] footer; string[] headings; string[] home_button_image; - string[] home_button_text; + string home_button_text = "{SiSU}http://www.sisudoc.org;" + ~ " {www.sisudoc.org}http://www.sisudoc.org;" + ~ " {sources / git}http://git.sisudoc.org/gitweb/"; string[] italics; string auto_num_top_at_level; int auto_num_top_lv = 9; -- cgit v1.2.3