112 |
113 | $shares
23 | */
24 |
25 | ?>
26 |
27 |
139 |
--------------------------------------------------------------------------------
/resources/views/chart-box.phtml:
--------------------------------------------------------------------------------
1 |
';
25 |
26 | return;
27 | }
28 |
29 | $module_service = \Vesta\VestaUtils::get(ModuleService::class);
30 |
31 | $menus = $module_service->findByComponent(ModuleChartInterface::class, $individual->tree(), Auth::user())->map(static function (ModuleChartInterface $module) use ($individual): ?Menu {
32 | return $module->chartBoxMenu($individual);
33 | })->filter();
34 |
35 | foreach ($individual->spouseFamilies() as $family) {
36 | $menus->push(new Menu('' . MoreI18N::xlate('Family with spouse') . '', $family->url()));
37 | $spouse = $family->spouse($individual);
38 | if ($spouse && $spouse->canShow()) {
39 | $menus->push(new Menu($spouse->fullName(), $spouse->url()));
40 | }
41 | foreach ($family->children() as $child) {
42 | if ($child->canShow()) {
43 | $menus->push(new Menu($child->fullName(), $child->url()));
44 | }
45 | }
46 | }
47 |
48 | // Do not show these facts in the expanded chart boxes.
49 | $exclude = [
50 | 'FAM:CHAN',
51 | 'FAM:CHIL',
52 | 'FAM:HUSB',
53 | 'FAM:NOTE',
54 | 'FAM:OBJE',
55 | 'FAM:RESN',
56 | 'FAM:SOUR',
57 | 'FAM:WIFE',
58 | 'INDI:ADDR',
59 | 'INDI:ALIA',
60 | 'INDI:ASSO',
61 | 'INDI:CHAN',
62 | 'INDI:EMAIL',
63 | 'INDI:FAMC',
64 | 'INDI:FAMS',
65 | 'INDI:NAME',
66 | 'INDI:NOTE',
67 | 'INDI:OBJE',
68 | 'INDI:PHON',
69 | 'INDI:RESI',
70 | 'INDI:RESN',
71 | 'INDI:SEX',
72 | 'INDI:SOUR',
73 | 'INDI:SSN',
74 | 'INDI:SUBM',
75 | 'INDI:TITL',
76 | 'INDI:URL',
77 | 'INDI:WWW',
78 | 'INDI:_EMAIL',
79 | 'INDI:_TODO',
80 | 'INDI:_UID',
81 | 'INDI:_WT_OBJE_SORT'
82 | ];
83 |
84 | /** @var Collection|Fact[] $all_facts */
85 | $all_facts = $individual->facts();
86 | foreach ($individual->spouseFamilies() as $family) {
87 | foreach ($family->facts() as $fact) {
88 | $all_facts->push($fact);
89 | }
90 | }
91 |
92 | $all_facts = $all_facts->filter(static function (Fact $fact) use ($exclude): bool {
93 | return !in_array($fact->tag(), $exclude, true);
94 | });
95 |
96 | $all_facts = Fact::sortFacts($all_facts);
97 |
98 | $id = Uuid::uuid4()->toString();
99 | ?>
100 |
101 |
114 |
115 |
116 |
117 |
118 |
119 |
122 |
123 | name() . '::theme/footer'); ?>
124 |
125 |
126 | name() . '::layouts/body/scripts'); ?>
127 |
128 |
129 |
--------------------------------------------------------------------------------
/resources/views/individual-page-menu.phtml:
--------------------------------------------------------------------------------
1 | $clipboard_facts
21 | * @var Individual $record
22 | * @var Collection
102 | canShow() && $individual->tree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) : ?>
103 |
207 |
--------------------------------------------------------------------------------
/IvoPetkov/HTML5DOMTokenList.php:
--------------------------------------------------------------------------------
1 | element = $element;
53 | $this->attributeName = $attributeName;
54 | $this->previousValue = null;
55 | $this->tokenize();
56 | }
57 |
58 | /**
59 | * Adds the given tokens to the list.
60 | *
61 | * @param string[] $tokens The tokens you want to add to the list.
62 | * @return void
63 | */
64 | public function add(string ...$tokens)
65 | {
66 | if (count($tokens) === 0) {
67 | return;
68 | }
69 | foreach ($tokens as $t) {
70 | if (in_array($t, $this->tokens)) {
71 | continue;
72 | }
73 | $this->tokens[] = $t;
74 | }
75 | $this->setAttributeValue();
76 | }
77 |
78 | /**
79 | * Removes the specified tokens from the list. If the string does not exist in the list, no error is thrown.
80 | *
81 | * @param string[] $tokens The token you want to remove from the list.
82 | * @return void
83 | */
84 | public function remove(string ...$tokens)
85 | {
86 | if (count($tokens) === 0) {
87 | return;
88 | }
89 | if (count($this->tokens) === 0) {
90 | return;
91 | }
92 | foreach ($tokens as $t) {
93 | $i = array_search($t, $this->tokens);
94 | if ($i === false) {
95 | continue;
96 | }
97 | array_splice($this->tokens, $i, 1);
98 | }
99 | $this->setAttributeValue();
100 | }
101 |
102 | /**
103 | * Returns an item in the list by its index (returns null if the number is greater than or equal to the length of the list).
104 | *
105 | * @param int $index The zero-based index of the item you want to return.
106 | * @return null|string
107 | */
108 | public function item(int $index)
109 | {
110 | $this->tokenize();
111 | if ($index >= count($this->tokens)) {
112 | return null;
113 | }
114 | return $this->tokens[$index];
115 | }
116 |
117 | /**
118 | * Removes a given token from the list and returns false. If token doesn't exist it's added and the function returns true.
119 | *
120 | * @param string $token The token you want to toggle.
121 | * @param bool $force A Boolean that, if included, turns the toggle into a one way-only operation. If set to false, the token will only be removed but not added again. If set to true, the token will only be added but not removed again.
122 | * @return bool false if the token is not in the list after the call, or true if the token is in the list after the call.
123 | */
124 | public function toggle(string $token, bool $force = null): bool
125 | {
126 | $this->tokenize();
127 | $isThereAfter = false;
128 | $i = array_search($token, $this->tokens);
129 | if (is_null($force)) {
130 | if ($i === false) {
131 | $this->tokens[] = $token;
132 | $isThereAfter = true;
133 | } else {
134 | array_splice($this->tokens, $i, 1);
135 | }
136 | } else {
137 | if ($force) {
138 | if ($i === false) {
139 | $this->tokens[] = $token;
140 | }
141 | $isThereAfter = true;
142 | } else {
143 | if ($i !== false) {
144 | array_splice($this->tokens, $i, 1);
145 | }
146 | }
147 | }
148 | $this->setAttributeValue();
149 | return $isThereAfter;
150 | }
151 |
152 | /**
153 | * Returns true if the list contains the given token, otherwise false.
154 | *
155 | * @param string $token The token you want to check for the existence of in the list.
156 | * @return bool true if the list contains the given token, otherwise false.
157 | */
158 | public function contains(string $token): bool
159 | {
160 | $this->tokenize();
161 | return in_array($token, $this->tokens);
162 | }
163 |
164 | /**
165 | * Replaces an existing token with a new token.
166 | *
167 | * @param string $old The token you want to replace.
168 | * @param string $new The token you want to replace $old with.
169 | * @return void
170 | */
171 | public function replace(string $old, string $new)
172 | {
173 | if ($old === $new) {
174 | return;
175 | }
176 | $this->tokenize();
177 | $i = array_search($old, $this->tokens);
178 | if ($i !== false) {
179 | $j = array_search($new, $this->tokens);
180 | if ($j === false) {
181 | $this->tokens[$i] = $new;
182 | } else {
183 | array_splice($this->tokens, $i, 1);
184 | }
185 | $this->setAttributeValue();
186 | }
187 | }
188 |
189 | /**
190 | *
191 | * @return string
192 | */
193 | public function __toString(): string
194 | {
195 | $this->tokenize();
196 | return implode(' ', $this->tokens);
197 | }
198 |
199 | /**
200 | * Returns an iterator allowing you to go through all tokens contained in the list.
201 | *
202 | * @return ArrayIterator
203 | */
204 | public function entries(): ArrayIterator
205 | {
206 | $this->tokenize();
207 | return new ArrayIterator($this->tokens);
208 | }
209 |
210 | /**
211 | * Returns the value for the property specified
212 | *
213 | * @param string $name The name of the property
214 | * @return string The value of the property specified
215 | * @throws \Exception
216 | */
217 | public function __get(string $name)
218 | {
219 | if ($name === 'length') {
220 | $this->tokenize();
221 | return count($this->tokens);
222 | } else if ($name === 'value') {
223 | return $this->__toString();
224 | }
225 | throw new \Exception('Undefined property: HTML5DOMTokenList::$' . $name);
226 | }
227 |
228 | /**
229 | *
230 | * @return void
231 | */
232 | private function tokenize()
233 | {
234 | $current = $this->element->getAttribute($this->attributeName);
235 | if ($this->previousValue === $current) {
236 | return;
237 | }
238 | $this->previousValue = $current;
239 | $tokens = explode(' ', $current);
240 | $finals = [];
241 | foreach ($tokens as $token) {
242 | if ($token === '')
243 | continue;
244 | if (in_array($token, $finals))
245 | continue;
246 | $finals[] = $token;
247 | }
248 | $this->tokens = $finals;
249 | }
250 |
251 | /**
252 | *
253 | * @return void
254 | */
255 | private function setAttributeValue()
256 | {
257 | $value = implode(' ', $this->tokens);
258 | if ($this->previousValue === $value) {
259 | return;
260 | }
261 | $this->previousValue = $value;
262 | $this->element->setAttribute($this->attributeName, $value);
263 | }
264 | }
265 |
--------------------------------------------------------------------------------
/IvoPetkov/HTML5DOMElement.php:
--------------------------------------------------------------------------------
1 | firstChild === null) {
53 | return '';
54 | }
55 | $html = $this->ownerDocument->saveHTML($this);
56 | $nodeName = $this->nodeName;
57 | return preg_replace('@^<' . $nodeName . '[^>]*>|$@', '', $html);
58 | } elseif ($name === 'outerHTML') {
59 | if ($this->firstChild === null) {
60 | $nodeName = $this->nodeName;
61 | $attributes = $this->getAttributes();
62 | $result = '<' . $nodeName . '';
63 | foreach ($attributes as $name => $value) {
64 | $result .= ' ' . $name . '="' . htmlentities($value) . '"';
65 | }
66 | if (array_search($nodeName, ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr']) === false) {
67 | $result .= '>';
68 | } else {
69 | $result .= '/>';
70 | }
71 | return $result;
72 | }
73 | return $this->ownerDocument->saveHTML($this);
74 | } elseif ($name === 'classList') {
75 | if ($this->classList === null) {
76 | $this->classList = new HTML5DOMTokenList($this, 'class');
77 | }
78 | return $this->classList;
79 | }
80 | throw new \Exception('Undefined property: HTML5DOMElement::$' . $name);
81 | }
82 |
83 | /**
84 | * Sets the value for the property specified.
85 | *
86 | * @param string $name
87 | * @param string $value
88 | * @throws \Exception
89 | */
90 | public function __set(string $name, $value)
91 | {
92 | if ($name === 'innerHTML') {
93 | while ($this->hasChildNodes()) {
94 | $this->removeChild($this->firstChild);
95 | }
96 | if (!isset(self::$newObjectsCache['html5domdocument'])) {
97 | self::$newObjectsCache['html5domdocument'] = new \IvoPetkov\HTML5DOMDocument();
98 | }
99 | $tmpDoc = clone (self::$newObjectsCache['html5domdocument']);
100 | $tmpDoc->loadHTML('' . $value . '');
101 | foreach ($tmpDoc->getElementsByTagName('body')->item(0)->childNodes as $node) {
102 | $node = $this->ownerDocument->importNode($node, true);
103 | $this->appendChild($node);
104 | }
105 | return;
106 | } elseif ($name === 'outerHTML') {
107 | if (!isset(self::$newObjectsCache['html5domdocument'])) {
108 | self::$newObjectsCache['html5domdocument'] = new \IvoPetkov\HTML5DOMDocument();
109 | }
110 | $tmpDoc = clone (self::$newObjectsCache['html5domdocument']);
111 | $tmpDoc->loadHTML('' . $value . '');
112 | foreach ($tmpDoc->getElementsByTagName('body')->item(0)->childNodes as $node) {
113 | $node = $this->ownerDocument->importNode($node, true);
114 | $this->parentNode->insertBefore($node, $this);
115 | }
116 | $this->parentNode->removeChild($this);
117 | return;
118 | } elseif ($name === 'classList') {
119 | $this->setAttribute('class', $value);
120 | return;
121 | }
122 | throw new \Exception('Undefined property: HTML5DOMElement::$' . $name);
123 | }
124 |
125 | /**
126 | * Updates the result value before returning it.
127 | *
128 | * @param string $value
129 | * @return string The updated value
130 | */
131 | private function updateResult(string $value): string
132 | {
133 | $value = str_replace(self::$foundEntitiesCache[0], self::$foundEntitiesCache[1], $value);
134 | if (strstr($value, 'html5-dom-document-internal-entity') !== false) {
135 | $search = [];
136 | $replace = [];
137 | $matches = [];
138 | preg_match_all('/html5-dom-document-internal-entity([12])-(.*?)-end/', $value, $matches);
139 | $matches[0] = array_unique($matches[0]);
140 | foreach ($matches[0] as $i => $match) {
141 | $search[] = $match;
142 | $replace[] = html_entity_decode(($matches[1][$i] === '1' ? '&' : '&#') . $matches[2][$i] . ';');
143 | }
144 | $value = str_replace($search, $replace, $value);
145 | self::$foundEntitiesCache[0] = array_merge(self::$foundEntitiesCache[0], $search);
146 | self::$foundEntitiesCache[1] = array_merge(self::$foundEntitiesCache[1], $replace);
147 | unset($search);
148 | unset($replace);
149 | unset($matches);
150 | }
151 | return $value;
152 | }
153 |
154 | /**
155 | * Returns the updated nodeValue Property
156 | *
157 | * @return string The updated $nodeValue
158 | */
159 | public function getNodeValue(): string
160 | {
161 | return $this->updateResult($this->nodeValue);
162 | }
163 |
164 | /**
165 | * Returns the updated $textContent Property
166 | *
167 | * @return string The updated $textContent
168 | */
169 | public function getTextContent(): string
170 | {
171 | return $this->updateResult($this->textContent);
172 | }
173 |
174 | /**
175 | * Returns the value for the attribute name specified.
176 | *
177 | * @param string $name The attribute name.
178 | * @return string The attribute value.
179 | * @throws \InvalidArgumentException
180 | */
181 | public function getAttribute($name): string
182 | {
183 | if ($this->attributes->length === 0) { // Performance optimization
184 | return '';
185 | }
186 | $value = parent::getAttribute($name);
187 | return $value !== '' ? (strstr($value, 'html5-dom-document-internal-entity') !== false ? $this->updateResult($value) : $value) : '';
188 | }
189 |
190 | /**
191 | * Returns an array containing all attributes.
192 | *
193 | * @return array An associative array containing all attributes.
194 | */
195 | public function getAttributes(): array
196 | {
197 | $attributes = [];
198 | foreach ($this->attributes as $attributeName => $attribute) {
199 | $value = $attribute->value;
200 | $attributes[$attributeName] = $value !== '' ? (strstr($value, 'html5-dom-document-internal-entity') !== false ? $this->updateResult($value) : $value) : '';
201 | }
202 | return $attributes;
203 | }
204 |
205 | /**
206 | * Returns the element outerHTML.
207 | *
208 | * @return string The element outerHTML.
209 | */
210 | public function __toString(): string
211 | {
212 | return $this->outerHTML;
213 | }
214 |
215 | /**
216 | * Returns the first child element matching the selector.
217 | *
218 | * @param string $selector A CSS query selector. Available values: *, tagname, tagname#id, #id, tagname.classname, .classname, tagname.classname.classname2, .classname.classname2, tagname[attribute-selector], [attribute-selector], "div, p", div p, div > p, div + p and p ~ ul.
219 | * @return HTML5DOMElement|null The result DOMElement or null if not found.
220 | * @throws \InvalidArgumentException
221 | */
222 | public function querySelector(string $selector)
223 | {
224 | return $this->internalQuerySelector($selector);
225 | }
226 |
227 | /**
228 | * Returns a list of children elements matching the selector.
229 | *
230 | * @param string $selector A CSS query selector. Available values: *, tagname, tagname#id, #id, tagname.classname, .classname, tagname.classname.classname2, .classname.classname2, tagname[attribute-selector], [attribute-selector], "div, p", div p, div > p, div + p and p ~ ul.
231 | * @return HTML5DOMNodeList Returns a list of DOMElements matching the criteria.
232 | * @throws \InvalidArgumentException
233 | */
234 | public function querySelectorAll(string $selector)
235 | {
236 | return $this->internalQuerySelectorAll($selector);
237 | }
238 | }
239 |
--------------------------------------------------------------------------------
/resources/views/css/theme.phtml:
--------------------------------------------------------------------------------
1 | /* ---------------------------------------------------------------------------- */
2 | /* ---------------------------------------------------------------------------- */
3 | /* ---------------------------------------------------------------------------- */
4 |
5 | /*
6 | adjustments as suggested here
7 | https://www.webtrees.net/index.php/en/forum/3-help-for-2-0-alpha/32882-solved-support-for-bigger-monitors#70135
8 | */
9 |
10 | getPreference('FULL_WIDTH', '1'))) : ?>
11 |
12 | @media (min-width:576px){.container-lg{max-width:540px}} /* bootstrap: col-sm */
13 | @media (min-width:768px){.container-lg{max-width:720px}} /* bootstrap: col-md */
14 | @media (min-width:900px){.container-lg{max-width:860px}} /* extra step added */
15 | @media (min-width:992px){.container-lg{max-width:960px}} /* extra step added, bootstrap: col-lg */
16 | @media (min-width:1024px){.container-lg{max-width:974px}}
17 | @media (min-width:1200px){.container-lg{max-width:1140px}} /* extra step added, bootstrap: col-xl */
18 | @media (min-width:1280px){.container-lg{max-width:1220px}}
19 | @media (min-width:1400px){.container-lg{max-width:1340px}}
20 | @media (min-width:1600px){.container-lg{max-width:1540px}}
21 | @media (min-width:1680px){.container-lg{max-width:1620px}}
22 | @media (min-width:1920px){.container-lg{max-width:1860px}}
23 | @media (min-width:2560px){.container-lg{max-width:2500px}}
24 |
25 |
26 |
27 | /* edit containers do not have to be that wide though on larger screens */
28 | @media (min-width:576px){.edit-container{max-width:540px}}
29 | @media (min-width:768px){.edit-container{max-width:720px}}
30 | @media (min-width:1024px){.edit-container{max-width:720px}}
31 | @media (min-width:1280px){.edit-container{max-width:720px}}
32 | @media (min-width:1400px){.edit-container{max-width:720px}}
33 | @media (min-width:1600px){.edit-container{max-width:720px}}
34 | @media (min-width:1680px){.edit-container{max-width:720px}}
35 | @media (min-width:1920px){.edit-container{max-width:720px}}
36 | @media (min-width:2560px){.edit-container{max-width:720px}}
37 |
38 | /* align with edit-container */
39 | @media (min-width:576px){.container.card.wt-osk{max-width:540px}}
40 | @media (min-width:768px){.container.card.wt-osk{max-width:720px}}
41 | @media (min-width:1024px){.container.card.wt-osk{max-width:720px}}
42 | @media (min-width:1280px){.container.card.wt-osk{max-width:720px}}
43 | @media (min-width:1400px){.container.card.wt-osk{max-width:720px}}
44 | @media (min-width:1600px){.container.card.wt-osk{max-width:720px}}
45 | @media (min-width:1680px){.container.card.wt-osk{max-width:720px}}
46 | @media (min-width:1920px){.container.card.wt-osk{max-width:720px}}
47 | @media (min-width:2560px){.container.card.wt-osk{max-width:720px}}
48 |
49 | /* also do not center them?
50 | [dir="ltr"] .edit-container,
51 | [dir="rtl"] .edit-container {
52 | padding-right: 15px;
53 | padding-left: 15px;
54 | margin-right: 15px;
55 | margin-left: 15px;
56 | //original values:
57 | //padding-right: 15px;
58 | //padding-left: 15px;
59 | //margin-right: auto;
60 | //margin-left: auto;
61 | }
62 | */
63 |
64 | /* ---------------------------------------------------------------------------- */
65 | /* ---------------------------------------------------------------------------- */
66 | /* ---------------------------------------------------------------------------- */
67 |
68 | getPreference('COMPACT_INDI_PAGE', '1')) > 0) : ?>
69 |
70 | /*
71 | individual: title
72 | */
73 |
74 | [dir] .mb-4, [dir] .my-4 {
75 | margin-bottom: 0.25rem !important;
76 | /* original values:
77 | margin-bottom: 1.5rem !important;
78 | */
79 | }
80 |
81 | /*
82 | individual: name parts
83 | IndividualController.formatNameRecord
84 | */
85 |
86 | [dir] .btn-link {
87 | padding: .125rem .125rem;
88 | /* original values:
89 | padding: .25rem .25rem;
90 | */
91 | }
92 |
93 | [dir] .card-header {
94 | padding: .25rem .75rem;
95 | /* original values:
96 | padding: .75rem 1.25rem;
97 | */
98 | }
99 |
100 | [dir] .card-body {
101 | padding: .25rem .75rem;
102 | /* original values:
103 | padding: 1.25rem;
104 | */
105 | }
106 |
107 | [dir] dl {
108 | margin-bottom: 0rem;
109 | /* original values:
110 | margin-bottom: 1rem;
111 | */
112 | }
113 |
114 | dl dd {
115 | display: inline;
116 | }
117 |
118 | dl dd:after{
119 | display: block;
120 | content: '';
121 | }
122 |
123 | dl dt{
124 | display: inline-block;
125 | margin-right: 2ch;
126 | }
127 |
128 | /*
129 | everywhere: do not use sex icon images
130 | */
131 |
132 | .wt-icon-sex-m {
133 | content: none;
134 | color: #31639c;
135 | }
136 |
137 | .wt-icon-sex-f {
138 | content: none;
139 | color: #9c3163;
140 | }
141 |
142 | .wt-icon-sex-u {
143 | content: none;
144 | }
145 |
146 | /*
147 | individual: sex icon
148 | */
149 |
150 | .vt_gender .wt-icon-sex-m,.vt_gender .wt-icon-sex-f,.vt_gender .wt-icon-sex-u {
151 | width: 0.8em;
152 | height: 0.8em;
153 | font-size: 1.5rem !important;
154 | }
155 |
156 | /*
157 | individual: tabs
158 | */
159 |
160 | [dir] .pt-4, [dir] .py-4 {
161 | padding-top: .25rem !important;
162 | padding-bottom: .25rem !important;
163 | /* original values:
164 | padding-top: 1.5rem !important;
165 | padding-bottom: 1.5rem !important;
166 | */
167 | }
168 |
169 | [dir] .wt-facts-table {
170 | margin-bottom: 0rem;
171 | /* original values:
172 | margin-bottom: 1rem;
173 | */
174 | }
175 |
176 | [dir] .wt-facts-table td, [dir] .table th {
177 | padding: .25rem;
178 | /* original values:
179 | padding: .75rem;
180 | */
181 | }
182 |
183 | [dir] label {
184 | margin-bottom: 0rem;
185 | /* original values:
186 | margin-bottom: .5rem;
187 | */
188 | }
189 |
190 | [dir] caption {
191 | padding-top: .25rem;
192 | padding-bottom: .25rem;
193 | /* original values:
194 | padding-top: .75rem;
195 | padding-bottom: .75rem;
196 | */
197 | }
198 |
199 |
200 |
201 | /* ---------------------------------------------------------------------------- */
202 | /* ---------------------------------------------------------------------------- */
203 | /* ---------------------------------------------------------------------------- */
204 |
205 | /*
206 | Family navigator sidebar
207 |
208 | make long names, small display sizes etc behave better - all this should probably be in webtrees itself!
209 | (we have made this part of the layout smaller, so it's even more important here though)
210 | */
211 |
212 | [dir] .wt-family-navigator-family {
213 | table-layout: fixed;
214 | }
215 |
216 | [dir] .wt-family-navigator-family th {
217 | /* effectively affects the first column. Can we set a more flexible width? apparently not with table layout 'fixed' */
218 | width: 30%;
219 |
220 | /* [2022/08] had to diable this because it affects the dropdown menu, apparently not possible to solve this without additional wrapper element? */
221 | /* overflow: hidden; */
222 | }
223 |
224 | [dir] .wt-family-navigator-name {
225 | overflow: hidden;
226 | }
227 |
228 | [dir] .wt-family-navigator-child > td {
229 | overflow: hidden;
230 | }
231 |
232 | [dir] .wt-family-navigator-family .dropdown-toggle {
233 | /*
234 | not sure what original 'nowrap' is supposed to accomplish,
235 | effect is: 'younger sister' wraps, 'younger sister (dropdown arrow)' doesn't. That's not what we want!
236 | probably intended to prevent wrapping of the dropdown arrow (actually some borders, WTF - this is from bootstrap),
237 | which itself is added via css (with implicit whitespace wrt the white-space property, apparently)
238 | */
239 | white-space: normal;
240 | }
241 |
242 | /* note: very long names in dropdown are still problematic */
243 | [dir] .wt-family-navigator-family .dropdown-item {
244 | white-space: normal;
245 | }
246 |
247 | /* ---------------------------------------------------------------------------- */
248 | /* ---------------------------------------------------------------------------- */
249 | /* ---------------------------------------------------------------------------- */
250 |
251 | /*
252 | edit dialogs
253 | */
254 |
255 | /*
256 | more space for names (should use this regardless of compact layout?)
257 | also pad and border etc like a form-control
258 | (maybe just use class form-control?)
259 | */
260 | .edit-container input.NAME, .edit-container input._MARNM {
261 | width: calc(100% - 25px);
262 |
263 | height: calc(1.5em + 2px);
264 |
265 | padding-top: 0.1rem;
266 | padding-right: 0.5rem;
267 | padding-bottom: 0.1rem;
268 | padding-left: 0.5rem;
269 |
270 | background-color: #fff;
271 | background-clip: padding-box;
272 | border: 1px solid #ced4da;
273 | border-radius: .25rem;
274 | }
275 |
276 | /*
277 | compact layout, ok foe webtrees 2.1
278 | */
279 |
280 | /* all rows */
281 | .edit-container .row.mb-3 {
282 | margin-bottom: 0.25rem !important;
283 | /* original value:
284 | margin-bottom: 1rem !important;
285 | */
286 | }
287 |
288 | /* e.g. date input field */
289 | .edit-container .form-control {
290 | height: calc(1.5em + 2px);
291 | /* original values:
292 | height: calc(1.5em + .75rem + 2px);
293 | */
294 | }
295 |
296 | /* icons for location, help etc */
297 | .edit-container .input-group-text {
298 | padding-top: 0rem;
299 | padding-right: 0.75rem;
300 | padding-bottom: 0rem;
301 | padding-left: 0.75rem;
302 | /* original values:
303 | padding-top: 0.375rem;
304 | padding-right: 0.75rem;
305 | padding-bottom: 0.375rem;
306 | padding-left: 0.75rem;
307 | */
308 | }
309 |
310 |
311 | .edit-container textarea.form-control {
312 | height: auto;
313 | }
314 |
315 | .edit-container .col-form-label {
316 | padding-top: calc(.1rem + 1px);
317 | padding-bottom: calc(.1rem + 1px);
318 | /* original values:
319 | padding-top: calc(.375rem + 1px);
320 | padding-bottom: calc(.375rem + 1px);
321 | */
322 | margin-bottom: 0;
323 | }
324 |
325 | /* ---------------------------------------------------------------------------- */
326 | /* ---------------------------------------------------------------------------- */
327 | /* ---------------------------------------------------------------------------- */
328 |
329 | /* issue #50 */
330 | /* Add space between thumbnails */
331 | .p-1 .gallery {
332 | padding-left: 2px;
333 | }
334 |
--------------------------------------------------------------------------------
/patchedWebtrees/IndividualExt.php:
--------------------------------------------------------------------------------
1 | settings;
19 | }
20 |
21 | public function __construct(
22 | string $xref,
23 | string $gedcom,
24 | ?string $pending,
25 | Tree $tree,
26 | IndividualExtSettings $settings)
27 | {
28 | parent::__construct($xref, $gedcom, $pending, $tree);
29 |
30 | $this->settings = $settings;
31 | }
32 |
33 | /**
34 | * Convert a name record into ‘full’ and ‘sort’ versions.
35 | * Use the NAME field to generate the ‘full’ version, as the
36 | * gedcom spec says that this is the individual’s name, as they would write it.
37 | * Use the SURN field to generate the sortable names. Note that this field
38 | * may also be used for the ‘true’ surname, perhaps spelt differently to that
39 | * recorded in the NAME field. e.g.
40 | *
41 | * 1 NAME Robert /de Gliderow/
42 | * 2 GIVN Robert
43 | * 2 SPFX de
44 | * 2 SURN CLITHEROW
45 | * 2 NICK The Bald
46 | *
47 | * full=>'Robert de Gliderow 'The Bald''
48 | * sort=>'CLITHEROW, ROBERT'
49 | *
50 | * Handle multiple surnames, either as;
51 | *
52 | * 1 NAME Carlos /Vasquez/ y /Sante/
53 | * or
54 | * 1 NAME Carlos /Vasquez y Sante/
55 | * 2 GIVN Carlos
56 | * 2 SURN Vasquez,Sante
57 | *
58 | * @param string $type
59 | * @param string $full
60 | * @param string $gedcom
61 | *
62 | * @return void
63 | */
64 | protected function addName(string $type, string $full, string $gedcom): void
65 | {
66 | ////////////////////////////////////////////////////////////////////////////
67 | // Extract the structured name parts - use for "sortable" names and indexes
68 | ////////////////////////////////////////////////////////////////////////////
69 |
70 | $sublevel = 1 + (int) substr($gedcom, 0, 1);
71 | $GIVN = preg_match("/\n{$sublevel} GIVN (.+)/", $gedcom, $match) ? $match[1] : '';
72 | $SURN = preg_match("/\n{$sublevel} SURN (.+)/", $gedcom, $match) ? $match[1] : '';
73 | $NICK = preg_match("/\n{$sublevel} NICK (.+)/", $gedcom, $match) ? $match[1] : '';
74 |
75 | // SURN is an comma-separated list of surnames...
76 | if ($SURN !== '') {
77 | $SURNS = preg_split('/ *, */', $SURN);
78 | } else {
79 | $SURNS = [];
80 | }
81 |
82 | // ...so is GIVN - but nobody uses it like that
83 | $GIVN = str_replace('/ *, */', ' ', $GIVN);
84 |
85 | ////////////////////////////////////////////////////////////////////////////
86 | // Extract the components from NAME - use for the "full" names
87 | ////////////////////////////////////////////////////////////////////////////
88 |
89 | // Fix bad slashes. e.g. 'John/Smith' => 'John/Smith/'
90 | if (substr_count($full, '/') % 2 === 1) {
91 | $full .= '/';
92 | }
93 |
94 | // GEDCOM uses "//" to indicate an unknown surname
95 | $full = preg_replace('/\/\//', '/@N.N./', $full);
96 |
97 | // Extract the surname.
98 | // Note, there may be multiple surnames, e.g. Jean /Vasquez/ y /Cortes/
99 | if (preg_match('/\/.*\//', $full, $match)) {
100 | $surname = str_replace('/', '', $match[0]);
101 | } else {
102 | $surname = '';
103 | }
104 |
105 | // If we don’t have a SURN record, extract it from the NAME
106 | if (!$SURNS) {
107 | if (preg_match_all('/\/([^\/]*)\//', $full, $matches)) {
108 | // There can be many surnames, each wrapped with '/'
109 | $SURNS = $matches[1];
110 | foreach ($SURNS as $n => $SURN) {
111 | // Remove surname prefixes, such as "van de ", "d'" and "'t " (lower case only)
112 | $SURNS[$n] = preg_replace('/^(?:[a-z]+ |[a-z]+\' ?|\'[a-z]+ )+/', '', $SURN);
113 | }
114 | } else {
115 | // It is valid not to have a surname at all
116 | $SURNS = [''];
117 | }
118 | }
119 |
120 | // If we don’t have a GIVN record, extract it from the NAME
121 | if (!$GIVN) {
122 | $GIVN = preg_replace(
123 | [
124 | '/ ?\/.*\/ ?/',
125 | // remove surname
126 | '/ ?".+"/',
127 | // remove nickname
128 | '/ {2,}/',
129 | // multiple spaces, caused by the above
130 | '/^ | $/',
131 | // leading/trailing spaces, caused by the above
132 | ],
133 | [
134 | ' ',
135 | ' ',
136 | ' ',
137 | '',
138 | ],
139 | $full
140 | );
141 | }
142 |
143 | // Add placeholder for unknown given name
144 | if (!$GIVN) {
145 | $GIVN = self::PRAENOMEN_NESCIO;
146 | $pos = (int) strpos($full, '/');
147 | $full = substr($full, 0, $pos) . '@P.N. ' . substr($full, $pos);
148 | }
149 |
150 | //[RC] adjusted
151 | $fullForFullNN = $full;
152 |
153 | //Issue #115
154 | //slashes in $full have special meaning, must use something else (at least for creating the html)
155 | //should we revert this for display afterwards?
156 | // not sure, if nickname is set as part of full by user, he wouldn't be able to use a slash either
157 | //(anyway there is nothing in the spec about this case)
158 | $NICK = str_replace('/', '|', $NICK);
159 |
160 | //[RC] adjusted: logic is configurable
161 | if ($NICK && strpos($full, '"' . $NICK . '"') === false) {
162 | // A NICK field is present, but not included in the NAME.
163 | // we may have to handle it specifically
164 | $handler = \Vesta\VestaUtils::get(IndividualNameHandler::class);
165 | $full = $handler->addNick($full, $NICK);
166 | }
167 |
168 | //moved to fullName(): we don't want this e.g. when using individual name for family name
169 | //$full = $handler->addXref($full, $this->xref());
170 |
171 | // Remove slashes - they don’t get displayed
172 | // $fullNN keeps the @N.N. placeholders, for the database
173 | // $full is for display on-screen
174 | $fullNN = str_replace('/', '', $fullForFullNN);
175 |
176 | // Insert placeholders for any missing/unknown names
177 | $full = str_replace(self::NOMEN_NESCIO, I18N::translateContext('Unknown surname', '…'), $full);
178 | $full = str_replace(self::PRAENOMEN_NESCIO, I18N::translateContext('Unknown given name', '…'), $full);
179 | // Format for display
180 | $full = '' . preg_replace('/\/([^\/]*)\//', '$1', e($full)) . '';
181 | // Localise quotation marks around the nickname
182 | $full = preg_replace_callback('/"([^&]*)"/', static function (array $matches): string {
183 | return '
104 |
107 | displayImage(40, 50, 'contain', ['class' => 'wt-chart-box-thumbnail']) ?>
108 |
109 |
110 |
111 | canShow()) : ?>
112 |
113 |
142 |
143 |
144 |
114 |
115 |
116 |
117 |
118 |
119 |
120 |
125 |
126 |
127 |
128 |
129 |
130 |
131 |
132 |
133 |
140 |
141 |
145 | canShow()) : ?>
146 | fullName() ?>
147 |
148 | fullName() ?>
149 |
150 |
151 |
152 |
153 | alternateName() ?>
154 |
155 |
156 |
157 | lifespan() ?>
158 |
159 |
160 |
161 |
206 |
162 | tree()->getPreference('CHART_BOX_TAGS'), 0, PREG_SPLIT_NO_EMPTY);
164 | // Show BIRT or equivalent event
165 |
166 | foreach (Gedcom::BIRTH_EVENTS as $birttag) {
167 | if (!in_array($birttag, $opt_tags, true)) {
168 | $event = $individual->facts([$birttag])->first();
169 | if ($event instanceof Fact) {
170 | echo $event->summary();
171 | break;
172 | }
173 | }
174 | }
175 | // Show optional events (before death)
176 | foreach ($opt_tags as $key => $tag) {
177 | if (!in_array($tag, Gedcom::DEATH_EVENTS, true)) {
178 | $event = $individual->facts([$tag])->first();
179 | if ($event instanceof Fact) {
180 | echo $event->summary();
181 | unset($opt_tags[$key]);
182 | }
183 | }
184 | }
185 | // Show DEAT or equivalent event
186 | foreach (Gedcom::DEATH_EVENTS as $deattag) {
187 | $event = $individual->facts([$deattag])->first();
188 | if ($event instanceof Fact) {
189 | echo $event->summary();
190 | if (in_array($deattag, $opt_tags, true)) {
191 | unset($opt_tags[array_search($deattag, $opt_tags, true)]);
192 | }
193 | break;
194 | }
195 | }
196 | // Show remaining optional events (after death)
197 | foreach ($opt_tags as $tag) {
198 | $event = $individual->facts([$tag])->first();
199 | if ($event instanceof Fact) {
200 | echo $event->summary();
201 | }
202 | }
203 | ?>
204 |
205 | ' . $matches[1] . ''; 184 | }, $full); 185 | 186 | // A suffix of “*” indicates a preferred name 187 | //[RC] this was originally adjusted, rationale: '-' is a breaking-space character, therefore break preferred name as well (this is to handle names with hyphens where only the last part is the preferred name) 188 | //(although note that 'official' german rufname must always be full hyphenated name) 189 | //explicitly use unicode 2011 'Non-Breaking Hyphen' if intended otherwise 190 | // 191 | //note: webtrees has different solution for this since fix for https://github.com/fisharebest/webtrees/issues/1010 192 | //Issue #76: we'll just align with that, everything else gets too complicated 193 | //(we would have to add config option whether to break on breaking-space characters) 194 | //anyway the more common case seems to be the one where you want all parts as preferred name 195 | $full = preg_replace('/([^ >\x{200C}]*)\*/u', '\\1', $full); 196 | 197 | // Remove prefered-name indicater - they don’t go in the database 198 | $GIVN = str_replace('*', '', $GIVN); 199 | $fullNN = str_replace('*', '', $fullNN); 200 | 201 | foreach ($SURNS as $SURN) { 202 | // Scottish 'Mc and Mac ' prefixes both sort under 'Mac' 203 | if (strcasecmp(substr($SURN, 0, 2), 'Mc') === 0) { 204 | $SURN = substr_replace($SURN, 'Mac', 0, 2); 205 | } elseif (strcasecmp(substr($SURN, 0, 4), 'Mac ') === 0) { 206 | $SURN = substr_replace($SURN, 'Mac', 0, 4); 207 | } 208 | 209 | $this->getAllNames[] = [ 210 | 'type' => $type, 211 | 'sort' => $SURN . ',' . $GIVN, 212 | 'full' => $full, 213 | // This is used for display 214 | 'fullNN' => $fullNN, 215 | // This goes into the database 216 | 'surname' => $surname, 217 | // This goes into the database 218 | 'givn' => $GIVN, 219 | // This goes into the database 220 | 'surn' => $SURN, 221 | // This goes into the database 222 | ]; 223 | } 224 | } 225 | 226 | public function fullName(): string 227 | { 228 | //[RC] adjusted: logic is configurable 229 | $handler = \Vesta\VestaUtils::get(IndividualNameHandler::class); 230 | 231 | $full = parent::fullName(); 232 | $full = $handler->addBadges($full, $this->tree(), $this->gedcom); 233 | $full = $handler->addXref($full, $this->xref()); 234 | return $full; 235 | } 236 | } 237 | -------------------------------------------------------------------------------- /metadata.json: -------------------------------------------------------------------------------- 1 | [ 2 | { 3 | "version": "2.0.13.0.0", 4 | "from": "2.0.12", 5 | "to": "2.0.18" 6 | }, 7 | { 8 | "version": "2.0.13.1.0", 9 | "from": "2.0.12", 10 | "to": "2.0.18", 11 | "changelog": ["Handling of nicknames aligned with main webtrees."] 12 | }, 13 | { 14 | "version": "2.0.15.0.0", 15 | "from": "2.0.12", 16 | "to": "2.0.18" 17 | }, 18 | { 19 | "version": "2.0.15.1.0", 20 | "from": "2.0.12", 21 | "to": "2.0.18" 22 | }, 23 | { 24 | "version": "2.0.15.2.0", 25 | "from": "2.0.12", 26 | "to": "2.0.18" 27 | }, 28 | { 29 | "version": "2.0.15.3.0", 30 | "from": "2.0.12", 31 | "to": "2.0.18", 32 | "changelog": ["Bugfix: Handle old libxml versions."] 33 | }, 34 | { 35 | "version": "2.0.15.4.0", 36 | "from": "2.0.12", 37 | "to": "2.0.18" 38 | }, 39 | { 40 | "version": "2.0.16.0.0", 41 | "from": "2.0.12", 42 | "to": "2.0.18" 43 | }, 44 | { 45 | "version": "2.0.16.0.1", 46 | "from": "2.0.12", 47 | "to": "2.0.18", 48 | "changelog": ["Small layout fix."] 49 | }, 50 | { 51 | "version": "2.0.16.0.3", 52 | "from": "2.0.12", 53 | "to": "2.0.18", 54 | "changelog": ["Small layout fix."] 55 | }, 56 | { 57 | "version": "2.0.16.0.4", 58 | "from": "2.0.12", 59 | "to": "2.0.18", 60 | "changelog": ["Small layout fix."] 61 | }, 62 | { 63 | "version": "2.0.16.1.0", 64 | "from": "2.0.12", 65 | "to": "2.0.18" 66 | }, 67 | { 68 | "version": "2.0.16.2.0", 69 | "from": "2.0.12", 70 | "to": "2.0.18" 71 | }, 72 | { 73 | "version": "2.0.16.3.0", 74 | "from": "2.0.12", 75 | "to": "2.0.18" 76 | }, 77 | { 78 | "version": "2.0.16.4.0", 79 | "from": "2.0.12", 80 | "to": "2.0.18" 81 | }, 82 | { 83 | "version": "2.0.16.5.0", 84 | "from": "2.0.12", 85 | "to": "2.0.18" 86 | }, 87 | { 88 | "version": "2.0.16.6.0", 89 | "from": "2.0.12", 90 | "to": "2.0.18" 91 | }, 92 | { 93 | "version": "2.0.17.0.0", 94 | "from": "2.0.12", 95 | "to": "2.0.18" 96 | }, 97 | { 98 | "version": "2.0.17.0.1", 99 | "from": "2.0.12", 100 | "to": "2.0.18" 101 | }, 102 | { 103 | "version": "2.0.17.1.0", 104 | "from": "2.0.12", 105 | "to": "2.0.18" 106 | }, 107 | { 108 | "version": "2.0.19.0.0", 109 | "from": "2.0.12", 110 | "to": "2.0.20", 111 | "changelog": ["Add option to preserve GEDCOM linebreaks in markdown formatted text."] 112 | }, 113 | { 114 | "version": "2.0.19.0.1", 115 | "from": "2.0.12", 116 | "to": "2.0.20", 117 | "changelog": ["Small bugfix for option introduced in 2.0.19.0.0."] 118 | }, 119 | { 120 | "version": "2.0.19.0.2", 121 | "from": "2.0.12", 122 | "to": "2.0.20", 123 | "changelog": ["Another bugfix for option introduced in 2.0.19.0.0."] 124 | }, 125 | { 126 | "version": "2.0.19.0.3", 127 | "from": "2.0.12", 128 | "to": "2.0.20", 129 | "changelog": ["Another bugfix for option introduced in 2.0.19.0.0."] 130 | }, 131 | { 132 | "version": "2.0.19.1.0", 133 | "from": "2.0.12", 134 | "to": "2.0.20" 135 | }, 136 | { 137 | "version": "2.0.19.2.0", 138 | "from": "2.0.12", 139 | "to": "2.0.20" 140 | }, 141 | { 142 | "version": "2.0.22.0.0", 143 | "from": "2.0.12", 144 | "to": "2.0.23" 145 | }, 146 | { 147 | "version": "2.0.23+2.1.0-beta.2.0.0", 148 | "from": "2.0.12", 149 | "to": "2.1.0" 150 | }, 151 | { 152 | "version": "2.0.23+2.1.0-beta.2.0.1", 153 | "from": "2.0.12", 154 | "to": "2.1.0" 155 | }, 156 | { 157 | "version": "2.0.23+2.1.0-beta.2.1.0", 158 | "from": "2.0.12", 159 | "to": "2.1.0" 160 | }, 161 | { 162 | "version": "2.0.23+2.1.0-beta.2.2.0", 163 | "from": "2.0.12", 164 | "to": "2.1.0" 165 | }, 166 | { 167 | "version": "2.0.23+2.1.0-beta.2.3.0", 168 | "from": "2.0.12", 169 | "to": "2.1.0" 170 | }, 171 | { 172 | "version": "2.1.0.0.0", 173 | "from": "2.0.12", 174 | "to": "2.1.1" 175 | }, 176 | { 177 | "version": "2.1.0.1.0", 178 | "from": "2.0.12", 179 | "to": "2.1.1" 180 | }, 181 | { 182 | "version": "2.1.1.0.0", 183 | "from": "2.0.12", 184 | "to": "2.1.2" 185 | }, 186 | { 187 | "version": "2.1.2.0.0", 188 | "from": "2.0.12", 189 | "to": "2.1.3" 190 | }, 191 | { 192 | "version": "2.1.2.1.0", 193 | "from": "2.0.12", 194 | "to": "2.1.3" 195 | }, 196 | { 197 | "version": "2.1.2.1.1", 198 | "from": "2.0.12", 199 | "to": "2.1.3" 200 | }, 201 | { 202 | "version": "2.1.2.1.2", 203 | "from": "2.0.12", 204 | "to": "2.1.3" 205 | }, 206 | { 207 | "version": "2.1.4.0.0", 208 | "from": "2.1.4", 209 | "to": "2.1.6" 210 | }, 211 | { 212 | "version": "2.1.4.1.0", 213 | "from": "2.1.4", 214 | "to": "2.1.6" 215 | }, 216 | { 217 | "version": "2.1.5.0.0", 218 | "from": "2.1.4", 219 | "to": "2.1.6", 220 | "changelog": ["Bugfix for JustLight theme integration."] 221 | }, 222 | { 223 | "version": "2.1.6.0.0", 224 | "from": "2.1.4", 225 | "to": "2.1.7", 226 | "changelog": ["New config option for name types when adding new individuals."] 227 | }, 228 | { 229 | "version": "2.1.6.1.0", 230 | "from": "2.1.4", 231 | "to": "2.1.7", 232 | "changelog": ["Preview: Advanced configuration of GEDCOM tags per event."] 233 | }, 234 | { 235 | "version": "2.1.6.1.1", 236 | "from": "2.1.4", 237 | "to": "2.1.7" 238 | }, 239 | { 240 | "version": "2.1.7.0.0", 241 | "from": "2.1.4", 242 | "to": "2.1.8" 243 | }, 244 | { 245 | "version": "2.1.7.0.1", 246 | "from": "2.1.4", 247 | "to": "2.1.8", 248 | "changelog": ["Bugfix (individual image display)."] 249 | }, 250 | { 251 | "version": "2.1.7.0.2", 252 | "from": "2.1.4", 253 | "to": "2.1.8" 254 | }, 255 | { 256 | "version": "2.1.7.1.0", 257 | "from": "2.1.4", 258 | "to": "2.1.8" 259 | }, 260 | { 261 | "version": "2.1.7.1.1", 262 | "from": "2.1.4", 263 | "to": "2.1.8" 264 | }, 265 | { 266 | "version": "2.1.8.0.0", 267 | "from": "2.1.8", 268 | "to": "2.1.13" 269 | }, 270 | { 271 | "version": "2.1.8.0.1", 272 | "from": "2.1.8", 273 | "to": "2.1.13" 274 | }, 275 | { 276 | "version": "2.1.8.0.2", 277 | "from": "2.1.8", 278 | "to": "2.1.13" 279 | }, 280 | { 281 | "version": "2.1.9.0.0", 282 | "from": "2.1.8", 283 | "to": "2.1.13" 284 | }, 285 | { 286 | "version": "2.1.9.1.0", 287 | "from": "2.1.8", 288 | "to": "2.1.13" 289 | }, 290 | { 291 | "version": "2.1.9.9.9", 292 | "from": "2.1.10", 293 | "to": "2.1.13" 294 | }, 295 | { 296 | "version": "2.1.10.0.0", 297 | "from": "2.1.10", 298 | "to": "2.1.13" 299 | }, 300 | { 301 | "version": "2.1.13.0.0", 302 | "from": "2.1.10", 303 | "to": "2.1.13" 304 | }, 305 | { 306 | "version": "2.1.13.0.2", 307 | "from": "2.1.13", 308 | "to": "2.1.14" 309 | }, 310 | { 311 | "version": "2.1.15.0.0", 312 | "from": "2.1.15", 313 | "to": "2.1.17" 314 | }, 315 | { 316 | "version": "2.1.15.0.1", 317 | "from": "2.1.15", 318 | "to": "2.1.17" 319 | }, 320 | { 321 | "version": "2.1.16.0.0", 322 | "from": "2.1.15", 323 | "to": "2.1.17" 324 | }, 325 | { 326 | "version": "2.1.16.1.0", 327 | "from": "2.1.15", 328 | "to": "2.1.17", 329 | "changelog": ["New config option for initial display of name blocks on individual page."] 330 | }, 331 | { 332 | "version": "2.1.16.1.1", 333 | "from": "2.1.15", 334 | "to": "2.1.17" 335 | }, 336 | { 337 | "version": "2.1.16.1.3", 338 | "from": "2.1.15", 339 | "to": "2.1.17", 340 | "changelog": ["New menu entry for individuals 'Edit main facts and events' (edit multiple facts at once, similar to functionality for new individuals)."] 341 | }, 342 | { 343 | "version": "2.1.16.1.4", 344 | "from": "2.1.15", 345 | "to": "2.1.17" 346 | }, 347 | { 348 | "version": "2.1.16.1.5", 349 | "from": "2.1.15", 350 | "to": "2.1.17" 351 | }, 352 | { 353 | "version": "2.1.16.2.0", 354 | "from": "2.1.15", 355 | "to": "2.1.17" 356 | }, 357 | { 358 | "version": "2.1.17.0.0", 359 | "from": "2.1.17", 360 | "to": "2.1.18" 361 | }, 362 | { 363 | "version": "2.1.17.1.0", 364 | "from": "2.1.17", 365 | "to": "2.1.18" 366 | }, 367 | { 368 | "version": "2.1.18.0.0", 369 | "from": "2.1.17", 370 | "to": "2.1.21" 371 | }, 372 | { 373 | "version": "2.1.18.0.1", 374 | "from": "2.1.17", 375 | "to": "2.1.21" 376 | }, 377 | { 378 | "version": "2.1.18.1.0", 379 | "from": "2.1.17", 380 | "to": "2.1.21" 381 | }, 382 | { 383 | "version": "2.1.18.2.0", 384 | "from": "2.1.17", 385 | "to": "2.1.21" 386 | }, 387 | { 388 | "version": "2.1.18.2.1", 389 | "from": "2.1.17", 390 | "to": "2.1.21", 391 | "changelog": ["New feature 'Name badges'."] 392 | }, 393 | { 394 | "version": "2.1.18.2.2", 395 | "from": "2.1.17", 396 | "to": "2.1.21" 397 | }, 398 | { 399 | "version": "2.1.19.0.0", 400 | "from": "2.1.17", 401 | "to": "2.1.21" 402 | }, 403 | { 404 | "version": "2.1.20.0.0", 405 | "from": "2.1.17", 406 | "to": "2.1.21" 407 | }, 408 | { 409 | "version": "2.1.20.1.0", 410 | "from": "2.1.17", 411 | "to": "2.1.21", 412 | "changelog": ["Fixed integration with 'JustLight' theme."] 413 | }, 414 | { 415 | "version": "2.1.20.1.2", 416 | "from": "2.1.17", 417 | "to": "2.1.21", 418 | "changelog": ["Fixed integration with 'JustLight' theme (from version 2.2.8)."] 419 | }, 420 | { 421 | "version": "2.1.20.2.0", 422 | "from": "2.1.17", 423 | "to": "2.1.21" 424 | }, 425 | { 426 | "version": "2.2.0.0.0", 427 | "from": "2.1.17", 428 | "to": "2.2.1" 429 | }, 430 | { 431 | "version": "2.2.1.0.0", 432 | "from": "2.1.17", 433 | "to": "2.2.2" 434 | }, 435 | { 436 | "version": "2.2.1.1.0", 437 | "from": "2.1.17", 438 | "to": "2.2.2" 439 | }, 440 | { 441 | "version": "2.2.1.2.0", 442 | "from": "2.2.1", 443 | "to": "2.2.2" 444 | }, 445 | { 446 | "version": "2.2.1.2.1", 447 | "from": "2.2.1", 448 | "to": "2.2.2", 449 | "changelog": ["Support back reference in name badges."] 450 | }, 451 | { 452 | "version": "2.2.1.3.0", 453 | "from": "2.2.1", 454 | "to": "2.2.2" 455 | }, 456 | { 457 | "version": "2.2.1.3.1", 458 | "from": "2.2.1", 459 | "to": "2.2.2" 460 | }, 461 | { 462 | "version": "2.2.1.4.0", 463 | "from": "2.2.1", 464 | "to": "2.2.2", 465 | "changelog": ["Added option to display specific name badges in front of names."] 466 | }, 467 | { 468 | "version": "2.2.1.4.1", 469 | "from": "2.2.1", 470 | "to": "2.2.2", 471 | "changelog": ["Fixed name badges display order."] 472 | }, 473 | { 474 | "version": "2.2.1.5.0", 475 | "from": "2.2.1", 476 | "to": "2.2.2", 477 | "changelog": ["Fixed issue #168 (configuration of visibility of GEDCOM tags)."] 478 | }, 479 | { 480 | "version": "2.2.2.0.0", 481 | "from": "2.2.1", 482 | "to": "2.2.4" 483 | }, 484 | { 485 | "version": "2.2.3.0.0", 486 | "from": "2.2.1", 487 | "to": "2.2.4" 488 | }, 489 | { 490 | "version": "2.2.4.0.0", 491 | "from": "2.2.1", 492 | "to": "2.2.5" 493 | }, 494 | { 495 | "version": "2.2.4.1.0", 496 | "from": "2.2.1", 497 | "to": "2.2.5" 498 | } 499 | ] 500 | -------------------------------------------------------------------------------- /resources/views/layouts/default.phtml: -------------------------------------------------------------------------------- 1 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 |
86 |
136 |
87 |
135 |
88 |
89 |
91 |
92 |
93 |
94 |
95 |
96 | title()) ?>
97 | 98 |
99 |
114 |
115 |
116 |
117 |
124 |
125 |
126 |
133 |
134 |
142 |
143 |
144 |
145 |
154 |
155 |
156 |
157 |
158 |
159 |
160 |
161 |
166 |
167 |
168 |
169 |
170 |
171 |
204 |
205 |
206 |
207 | findByInterface(ModuleGlobalInterface::class)->map(static function (ModuleGlobalInterface $module): string {
208 | return $module->bodyContent();
209 | })->implode('') ?>
210 |
211 |
212 |
--------------------------------------------------------------------------------
/patchedWebtrees/Services/GedcomEditServiceExt2.php:
--------------------------------------------------------------------------------
1 | forNewIndividual = $forNewIndividual;
34 | $this->vesta_symbol = json_decode('"\u26B6"');
35 | $this->house_symbol = json_decode('"\u2302"');
36 | }
37 |
38 | protected function insertMissingLevels(Tree $tree, string $tag, string $gedcom, bool $include_hidden): string
39 | {
40 | $next_level = substr_count($tag, ':') + 1;
41 | $factory = Registry::elementFactory();
42 | $subtags = $factory->make($tag)->subtags();
43 |
44 | // The first part is level N. The remainder are level N+1.
45 | $parts = preg_split('/\n(?=' . $next_level . ')/', $gedcom);
46 | $return = array_shift($parts) ?? '';
47 |
48 | foreach ($subtags as $subtag => $occurrences) {
49 | if (!$include_hidden) {
50 |
51 | if ("MAP" == $subtag) {
52 | //Issue #168: MAP is special (it has no own edit control)
53 | //hide only if both its subtags are hidden
54 | //(cannot unhide unconditionally: that strategy would show PLAC with empty dropdown if all others are hidden)
55 | $longHidden = $this->isHiddenTagExt(
56 | $tree,
57 | $tag . ':' . $subtag . ':LONG',
58 | false);
59 |
60 | $latiHidden = $this->isHiddenTagExt(
61 | $tree,
62 | $tag . ':' . $subtag . ':LATI',
63 | false);
64 |
65 | $hidden = $longHidden && $latiHidden;
66 | } else {
67 | $hidden = $this->isHiddenTagExt(
68 | $tree,
69 | $tag . ':' . $subtag,
70 | str_ends_with($occurrences, ':?'));
71 | }
72 |
73 |
74 | if ($hidden) {
75 |
76 | //we want to preserve overall order in any case
77 | //(in particular in the 'edit main facts and events' dialog)
78 | //therefore show existing hidden at its 'normal' position, rather than at the end
79 | $existing = false;
80 | foreach ($parts as $n => $part) {
81 | if (str_starts_with($part, $next_level . ' ' . $subtag)) {
82 | $existing = true;
83 | break;
84 | }
85 | }
86 |
87 | if (!$existing) {
88 | continue;
89 | }
90 | }
91 | }
92 |
93 | [$min, $max] = explode(':', $occurrences);
94 |
95 | $min = (int) $min;
96 |
97 | if ($max === 'M') {
98 | $max = PHP_INT_MAX;
99 | } else {
100 | $max = (int) $max;
101 | }
102 |
103 | $count = 0;
104 |
105 | // Add expected subtags in our preferred order.
106 | foreach ($parts as $n => $part) {
107 | if (str_starts_with($part, $next_level . ' ' . $subtag)) {
108 | $return .= "\n" . $this->insertMissingLevels($tree, $tag . ':' . $subtag, $part, $include_hidden);
109 | $count++;
110 | unset($parts[$n]);
111 | }
112 | }
113 |
114 | // Allowed to have more of this subtag?
115 | if ($count < $max) {
116 | // Create a new one.
117 | $gedcom = $next_level . ' ' . $subtag;
118 | $default = $factory->make($tag . ':' . $subtag)->default($tree);
119 | if ($default !== '') {
120 | $gedcom .= ' ' . $default;
121 | }
122 |
123 | $number_to_add = max(1, $min - $count);
124 | $gedcom_to_add = "\n" . $this->insertMissingLevels($tree, $tag . ':' . $subtag, $gedcom, $include_hidden);
125 |
126 | $return .= str_repeat($gedcom_to_add, $number_to_add);
127 | }
128 | }
129 |
130 | // Now add any unexpected/existing data.
131 | if ($parts !== []) {
132 | $return .= "\n" . implode("\n", $parts);
133 | }
134 |
135 | return $return;
136 | }
137 |
138 | public function getPreference(
139 | Tree $tree,
140 | string $tag): string {
141 |
142 | $tag = $this->compressTag($tag);
143 | $pref = $this->vesta_symbol . $this->house_symbol . $tag;
144 | $override = $tree->getPreference($pref);
145 | return $override;
146 | }
147 |
148 | public function setPreference(
149 | Tree $tree,
150 | string $tag,
151 | string $value) {
152 |
153 | $tag = $this->compressTag($tag);
154 | $pref = $this->vesta_symbol . $this->house_symbol . $tag;
155 | //TODO would be better to delete pref in case of empty string
156 | $tree->setPreference($pref, $value);
157 | }
158 |
159 | protected function isHiddenTagExt(
160 | Tree $tree,
161 | string $tag,
162 | bool $hiddenViaOccurrences): bool {
163 |
164 | $r = new ReflectionMethod(parent::class, 'isHiddenTag');
165 | $r->setAccessible(true);
166 | $originalRet = $hiddenViaOccurrences || $r->invokeArgs($this, [$tag]);
167 |
168 | //error_log("hidden? " . $tag . '=' . $originalRet);
169 |
170 | //check for specific override
171 | $tag = $this->compressTag($tag);
172 | $pref = $this->vesta_symbol . $this->house_symbol . $tag;
173 |
174 | //error_log("override? " . $pref);
175 |
176 | $override = $tree->getPreference($pref);
177 | if ($override !== '') {
178 | switch ($override) {
179 | //hide always
180 | case 'LEVEL0':
181 | $overrideRet = true;
182 | break;
183 | //hide for new individual, show otherwise
184 | case 'LEVEL1':
185 | case 'LEVEL1a':
186 | if ($this->forNewIndividual) {
187 | $overrideRet = true;
188 | } else {
189 | $overrideRet = false;
190 | }
191 | break;
192 | //show always
193 | case 'LEVEL2':
194 | case 'LEVEL2a':
195 | $overrideRet = false;
196 | break;
197 | //(unexpected; hide always)
198 | default:
199 | $overrideRet = true;
200 | break;
201 | }
202 |
203 | if ($originalRet !== $overrideRet) {
204 | //error_log($tag . "override specific to ".$overrideRet);
205 | }
206 |
207 | return $overrideRet;
208 | }
209 |
210 | //check for generic override
211 | $tag2parts = explode(':',$tag);
212 | $tag2parts[1] = '*';
213 | $tag2 = implode(':',$tag2parts);
214 |
215 | $tag2 = $this->compressTag($tag2);
216 | $pref = $this->vesta_symbol . $this->house_symbol . $tag2;
217 |
218 | //error_log("override? " . $pref);
219 |
220 | $override = $tree->getPreference($pref);
221 | if ($override !== '') {
222 | switch ($override) {
223 | //hide always
224 | case 'LEVEL0':
225 | $overrideRet = true;
226 | break;
227 | //hide for new individual, show otherwise
228 | case 'LEVEL1':
229 | case 'LEVEL1a':
230 | if ($this->forNewIndividual) {
231 | $overrideRet = true;
232 | } else {
233 | $overrideRet = false;
234 | }
235 | break;
236 | //show always
237 | case 'LEVEL2':
238 | case 'LEVEL2a':
239 | $overrideRet = false;
240 | break;
241 | //(unexpected; hide always)
242 | default:
243 | $overrideRet = true;
244 | break;
245 | }
246 |
247 | if ($originalRet !== $overrideRet) {
248 | //error_log($tag2 . " override generic to ".$overrideRet);
249 | }
250 |
251 | return $overrideRet;
252 | }
253 |
254 | return $originalRet;
255 | }
256 |
257 | public function alwaysExpandSubtags(
258 | Tree $tree,
259 | string $tag): bool {
260 |
261 | //check for specific override
262 | $tag = $this->compressTag($tag);
263 | $pref = $this->vesta_symbol . $this->house_symbol . $tag;
264 |
265 | //error_log("override? " . $pref);
266 |
267 | $override = $tree->getPreference($pref);
268 | if ($override !== '') {
269 | switch ($override) {
270 | case 'LEVEL1a':
271 | case 'LEVEL2a':
272 | return true;
273 | default:
274 | break;
275 | }
276 | }
277 |
278 | //check for generic override
279 | $tag2parts = explode(':',$tag);
280 | $tag2parts[1] = '*';
281 | $tag2 = implode(':',$tag2parts);
282 |
283 | $tag2 = $this->compressTag($tag2);
284 | $pref = $this->vesta_symbol . $this->house_symbol . $tag2;
285 |
286 | //error_log("override? " . $pref);
287 |
288 | $override = $tree->getPreference($pref);
289 | if ($override !== '') {
290 | switch ($override) {
291 | case 'LEVEL1a':
292 | case 'LEVEL2a':
293 | return true;
294 | default:
295 | break;
296 | }
297 | }
298 |
299 | return false;
300 | }
301 |
302 | protected function compressTag(string $tag): string {
303 | //we only have 32 chars in table column!
304 | //(first 2 of those are used for pref outside tag, i.e. 30 left
305 | //note that this may still be problematic for custom tags)
306 | $tagCompressed = $tag;
307 | $tagCompressed = str_replace("INDI","I", $tagCompressed);
308 | $tagCompressed = str_replace("FAM","F", $tagCompressed);
309 | $tagCompressed = str_replace("ASSO","A", $tagCompressed);
310 | $tagCompressed = str_replace("SOUR","S", $tagCompressed);
311 | $tagCompressed = str_replace("PLAC","P", $tagCompressed);
312 |
313 | return $tagCompressed;
314 | }
315 | }
316 |
--------------------------------------------------------------------------------