From 55bfdbea5a766bb6b0923e9a94cec14cf51439f6 Mon Sep 17 00:00:00 2001 From: Henri83 Date: Fri, 19 Apr 2024 03:43:35 +0200 Subject: [PATCH] include;home in home_full.txt --- hd/etc/home_full.txt | 82 ++------------------------------------------ lib/perso.ml | 4 +-- 2 files changed, 3 insertions(+), 83 deletions(-) diff --git a/hd/etc/home_full.txt b/hd/etc/home_full.txt index 9482de18d2..98b0cedfaf 100644 --- a/hd/etc/home_full.txt +++ b/hd/etc/home_full.txt @@ -1,9 +1,7 @@ - + - - %nn; [*relationship link between]%sp; %if;(public_name != "")%public_name;%else;%first_name;%end; @@ -16,82 +14,6 @@ %include;favicon %include;css </head> -%(TODO : -* highlight/filter by nbr -* RLM par chemin vers les mêmes ancêtres / need to fix RLM spouses isolated) -* discuter quoi afficher comme « comptage des chemins » -* highlight sur les cases avec des individus vivants + counts -%) <body%body_prop;> %include;hed -%define;display_sosa_ref(xx) - [*sosa reference: %t:::xx] -%end; -%define;get_random(xxx) - %random.init; - %random.xxx; -%end; -%define;dice() - %random.init; - %apply;nth%with;one/two/three/four/five/six%and;%random.6;%end; -%end; -%let;random_index;%apply;get_random(nb_persons.v)%in; -%if;(not cancel_links) - <div class="d-flex flex-column fix_top fix_left"> - <a tabindex="1" role="button" class="btn btn-sm btn-link p-0 border-0" href="%prefix;" title="[*home]"> - <i class="fa fa-house fa-fw fa-sm" aria-hidden="true"></i>%nn; - <i class="sr-only">[*home]</i>%nn; - </a> - %if;(referer!="") - <a tabindex="2" role="button" class="btn btn-sm btn-link p-0 border-0" href="%referer;" title="[*back]">%nn; - <i class="fa fa-arrow-left-long fa-fw fa-xs" aria-hidden="true"></i>%nn; - <span class="sr-only">[*back]</span>%nn; - </a> - %end; - <a tabindex="3" role="button" class="btn btn-sm btn-link p-0 border-0" data-toggle="modal" data-target="#searchmodal" - accesskey="S" title="[*search/case sensitive]0">%nn; - <i class="fa fa-magnifying-glass fa-fw fa-xs" aria-hidden="true"></i>%nn; - <span class="sr-only">[*search/case sensitive]0</span>%nn; - </a> - %let;rng;%if;((e.i!="" or e.p!="" or e.n!="") and e.m!="S" and e.m!="L" and e.m!="" and not ("_FAM" in e.m))1%else;0%end;%in; - <a role="button" class="btn btn-sm btn-link p-0 border-0" - href="%if;(rng=1)%apply;url_set%with;i/p/n/oc%and;%random_index;%end;%else;%prefix;i=%random_index;%end;" - title="[*random individual]%if;(rng=1) ([stay on the current tool])%end;"><i class="fa fa-dice-%apply;dice() fa-fw fa-xs" aria-hidden="true"></i>%nn; - <span class="sr-only">[*random individual]</span>%nn; - </a> - %if;(b.hide_querytime_bugs!="yes") - <div class="btn btn-sm p-0 border-0" id="q_time">%nn; - <i class="fa fa-hourglass-half fa-fw fa-xs p-0"></i>%nn; - </div> - <div class="btn btn-sm p-0 border-0 d-none" id="nb_errors">%nn; - <i class="fa fa-bug fa-fw fa-xs p-0"></i>%nn; - </div> - %end; - </div> - <div class="modal" id="searchmodal" role="dialog" aria-labelledby="searchpopup" aria-hidden="true"> - <div class="modal-dialog modal-lg" role="document"> - <div class="modal-content"> - <div class="modal-body" id="ModalSearch"> - <form id="collapse_search" method="get" action="%prefix;"> - %hidden; - <input type="hidden" name="m" value="S"> - <div class="d-flex justify-content-center"> - <h5 class="rounded modal-title my-2 text-center w-50 align-self-center" id="searchpopup">[*search/case sensitive]0 [person/persons]0</h5> - <div class="col-8"> - %if;(browsing_with_sosa_ref) - <h5>%apply;display_sosa_ref%with;%sosa_ref;%end;</h5> - %end; - <label class="sr-only" for="n">Search public name</label> - <input type="search" id="n" class="form-control form-control-lg" name="n" placeholder="[*surname/surnames]0, [public name], [alias]%if;browsing_with_sosa_ref;, [n° Sosa]%end;" - autofocus> - <label class="sr-only" for="p">Search firstname</label> - <input type="search" id="p" class="form-control form-control-lg mt-2" name="p" placeholder="[*first name/first names]0"> - </div> - <button class="btn btn-outline-primary" type="submit" title="[*search/case sensitive]0"><i class="fa fa-magnifying-glass fa-lg mx-2"></i> [*search/case sensitive]0</button> - </div> - </form> - </div> - </div> - </div> - </div> -%end; \ No newline at end of file +%include;home \ No newline at end of file diff --git a/lib/perso.ml b/lib/perso.ml index 72af9efa3f..012893d24b 100644 --- a/lib/perso.ml +++ b/lib/perso.ml @@ -1434,9 +1434,7 @@ and eval_simple_bool_var conf base env = | "are_residence" -> check_relation (( = ) Residence) | "are_separated" -> fam_check_aux (fun fam -> get_divorce fam = Separated) | "browsing_with_sosa_ref" -> ( - match get_env "sosa_ref" env with - | Vsosa_ref v -> v <> None - | _ -> false) + match get_env "sosa_ref" env with Vsosa_ref v -> v <> None | _ -> false) | "has_comment" | "has_fnotes" -> ( match get_env "fam" env with | Vfam (_, fam, _, m_auth) when mode_local env ->