Skip to content

Commit

Permalink
grouping of grandparents and cousins modified
Browse files Browse the repository at this point in the history
minor bugs fixed and translations actualized
  • Loading branch information
hartenthaler committed Aug 20, 2021
1 parent 3a3c3f5 commit 8e8f7bf
Show file tree
Hide file tree
Showing 7 changed files with 1,025 additions and 1,223 deletions.
2 changes: 1 addition & 1 deletion latest-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.16.46
2.0.16.47
1,027 changes: 480 additions & 547 deletions module.php

Large diffs are not rendered by default.

10 changes: 1 addition & 9 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,14 @@ This Readme contains the following main sections

This module presents the core and the extended family of a proband. It is based on the [Eskimo kinship system](https://en.wikipedia.org/wiki/Kinship_terminology).

The module was derived from the module vytux_cousins. There are additional features
* addition for half-cousins from webtrees user [ardhtu](https://www.webtrees.net/index.php/en/forum/2-open-discussion/35751-vytux-cousins-children-of-half-sibblings-will-not-be-recognized-as-cousins#85279).
* don't show empty tables for "Father's family" and "Mother's family"
* beside father's and mother's family, now there can be a third category "father's and mother's family" if members of the extended family are related to both sides
* count individuals separately for each sex (this supports translation if there are for example different words for male and female cousins)
* new text added if there is a family but no members in a part of the extended family (e.g. "... has no first cousins recorded.")
* tab is greyed out if the extended family is empty

The user can filter the shown results by gender and dead/alive persons.

The admin can decide in the control panel
* which extended family parts should be shown and in which sequence they should be presented
* if filter options should be presented for users
* how empty parts of extended family should be presented
* wheter the name of proband is a full name or a short version
* wheter labels like "adopted child", "foster child" or "twin" should be used to indicate special situations
* wheter labels like "adopted child", "foster child" or "twin" should be used to indicate special situations (GEDCOM record to indicate that a person is a triplet, should look like "1 ASSO @I123@\n2 RELA triplet")
* whether a compact design should be used or an enriched version, showing a photo as well as complete birth and death information

The default presentation sequence of the extended family parts is oriented at the generation of the people in this part, relative to the proband
Expand Down
34 changes: 12 additions & 22 deletions resources/css/hh_extended_family.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,6 @@
padding: 10px 0 2px 0;
}

.comment {
border: 2px solid black;
border-radius: 4px;
padding: 2px 10px 2px 10px;
margin: 0px 10px;
text-align: center;
font-size: 14px;
background-color: lightgrey;
color: red;
}

#hh-extended-family-ancestors,
#hh-extended-family-descendants,
#hh_extended_family_summary {
}

Expand Down Expand Up @@ -87,10 +74,7 @@
width: 99%;
}

#hh_extended_family_f,
#hh_extended_family_m,
#hh_extended_family_fm,
#hh_extended_family_g {
#hh_extended_family_box {
border: 1px solid grey;
border-radius: 5px;
display: table-cell;
Expand All @@ -100,10 +84,7 @@

/* Mobile low resolution viewport */
@media (max-width: 600px) {
#hh_extended_family_f,
#hh_extended_family_m,
#hh_extended_family_fm,
#hh_extended_family_g {
#hh_extended_family_box {
border: 1px solid grey;
border-radius: 5px;
display: table-caption;
Expand Down Expand Up @@ -157,4 +138,13 @@
margin: 0px 0px 0px 0px;
}


.comment {
border: 2px solid black;
border-radius: 4px;
padding: 2px 10px 2px 10px;
margin: 0px 10px;
text-align: center;
font-size: 14px;
background-color: lightgrey;
color: red;
}
1,175 changes: 531 additions & 644 deletions resources/views/tab.phtml

Large diffs are not rendered by default.

Binary file modified screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshot_control_panel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8e8f7bf

Please sign in to comment.