summaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/views/edit/paste-fact-row.phtml2
-rw-r--r--resources/views/lists/families-table.phtml4
-rw-r--r--resources/views/lists/individuals-table.phtml10
-rw-r--r--resources/views/modules/pedigree-map/events.phtml4
-rw-r--r--resources/views/modules/relatives/family.phtml2
-rw-r--r--resources/views/modules/timeline-chart/chart.phtml2
-rw-r--r--resources/views/modules/todays_events/list.phtml2
-rw-r--r--resources/views/modules/upcoming_events/list.phtml4
-rw-r--r--resources/views/place-hierarchy.phtml2
-rw-r--r--resources/views/place-list.phtml2
-rw-r--r--resources/views/place-sidebar.phtml4
-rw-r--r--resources/views/places-page.phtml4
12 files changed, 18 insertions, 24 deletions
diff --git a/resources/views/edit/paste-fact-row.phtml b/resources/views/edit/paste-fact-row.phtml
index 8baa4434cd..759f144d7f 100644
--- a/resources/views/edit/paste-fact-row.phtml
+++ b/resources/views/edit/paste-fact-row.phtml
@@ -21,7 +21,7 @@
– <?= $fact->date()->minimumDate()->format('%Y') ?>
<?php endif ?>
<?php if (!$fact->place()->isEmpty()) : ?>
- – <?= $fact->place()->getShortName() ?>
+ – <?= $fact->place()->shortName() ?>
<?php endif ?>
</option>
<?php endforeach ?>
diff --git a/resources/views/lists/families-table.phtml b/resources/views/lists/families-table.phtml
index b0a54deb9a..361c4790d2 100644
--- a/resources/views/lists/families-table.phtml
+++ b/resources/views/lists/families-table.phtml
@@ -321,9 +321,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
<!-- Marriage place -->
<td>
<?php foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) : ?>
- <a href="<?= e($marriage_place->url()) ?>" title="<?= strip_tags($marriage_place->getFullName()) ?>">
- <?= $marriage_place->getShortName() ?>
- </a>
+ <?= $marriage_place->shortName(true) ?>
<br>
<?php endforeach ?>
</td>
diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml
index f878aa4bf1..588710f130 100644
--- a/resources/views/lists/individuals-table.phtml
+++ b/resources/views/lists/individuals-table.phtml
@@ -159,7 +159,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
data-filter-value="Y100"
title="<?= I18N::translate('Show individuals who died within the last 100 years.') ?>"
>
- <?= I18N::translate('Death') ?>&lt&lt;=100
+ <?= I18N::translate('Death') ?>&lt;=100
</button>
</div>
<div class="btn-group" data-toggle="buttons">
@@ -295,9 +295,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
<!-- Birth place -->
<td>
<?php foreach ($individual->getAllBirthPlaces() as $n => $birth_place) : ?>
- <a href="<?= e($birth_place->url()) ?>" title="<?= strip_tags($birth_place->getFullName()) ?>">
- <?= $birth_place->getShortName() ?>
- </a>
+ <?= $birth_place->shortName(true) ?>
<br>
<?php endforeach ?>
</td>
@@ -342,9 +340,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
<!-- Death place -->
<td>
<?php foreach ($individual->getAllDeathPlaces() as $n => $death_place) : ?>
- <a href="<?= e($death_place->url()) ?>" title="<?= e(strip_tags($death_place->getFullName())) ?>">
- <?= $death_place->getShortName() ?>
- </a>
+ <?= $death_place->shortName(true) ?>
<br>
<?php endforeach ?>
</td>
diff --git a/resources/views/modules/pedigree-map/events.phtml b/resources/views/modules/pedigree-map/events.phtml
index df2f431386..ae60f14c00 100644
--- a/resources/views/modules/pedigree-map/events.phtml
+++ b/resources/views/modules/pedigree-map/events.phtml
@@ -22,10 +22,10 @@
<?= $date ?>
</div>
-<?php if (!$place->isEmpty()) : ?>
+<?php if ($place->gedcomName() !== '') : ?>
<div>
<a href="<?= e($place->url()) ?>">
- <?= $place->getFullName() ?>
+ <?= $place->fullName() ?>
</a>
</div>
<?php endif ?>
diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml
index a7dab7cada..72e119089d 100644
--- a/resources/views/modules/relatives/family.phtml
+++ b/resources/views/modules/relatives/family.phtml
@@ -107,7 +107,7 @@
<th scope="row">
</th>
<td>
- <?= GedcomTag::getLabelValue($fact->getTag(), $fact->date()->display() . ' — ' . $fact->place()->getFullName()) ?>
+ <?= GedcomTag::getLabelValue($fact->getTag(), $fact->date()->display() . ' — ' . $fact->place()->fullName()) ?>
</td>
</tr>
diff --git a/resources/views/modules/timeline-chart/chart.phtml b/resources/views/modules/timeline-chart/chart.phtml
index 3cc349edeb..629c01191a 100644
--- a/resources/views/modules/timeline-chart/chart.phtml
+++ b/resources/views/modules/timeline-chart/chart.phtml
@@ -356,7 +356,7 @@
}
echo ' ' . e($desc);
if (!$event->place()->isEmpty()) {
- echo ' — ' . $event->place()->getShortName();
+ echo ' — ' . $event->place()->shortName();
}
// Print spouses names for family events
if ($event->record() instanceof Family) {
diff --git a/resources/views/modules/todays_events/list.phtml b/resources/views/modules/todays_events/list.phtml
index a3796f2450..2926991a3e 100644
--- a/resources/views/modules/todays_events/list.phtml
+++ b/resources/views/modules/todays_events/list.phtml
@@ -13,7 +13,7 @@
<?= $fact->label() . ' — ' . $fact->date()->display(true); ?>
<?= ' (' . I18N::timeAgo($fact->anniv * 365 * 24 * 60 * 60) . ')'; ?>
<?php if (!$fact->place()->isEmpty()) : ?>
- <?= ' — <a href="' . e($fact->place()->url()) . '">' . $fact->place()->getFullName() . '</a>'; ?>
+ <?= ' — <a href="' . e($fact->place()->url()) . '">' . $fact->place()->fullName() . '</a>'; ?>
<?php endif ?>
</div>
<?php endforeach ?>
diff --git a/resources/views/modules/upcoming_events/list.phtml b/resources/views/modules/upcoming_events/list.phtml
index a3796f2450..c708ad8bab 100644
--- a/resources/views/modules/upcoming_events/list.phtml
+++ b/resources/views/modules/upcoming_events/list.phtml
@@ -12,8 +12,8 @@
<div class="indent">
<?= $fact->label() . ' — ' . $fact->date()->display(true); ?>
<?= ' (' . I18N::timeAgo($fact->anniv * 365 * 24 * 60 * 60) . ')'; ?>
- <?php if (!$fact->place()->isEmpty()) : ?>
- <?= ' — <a href="' . e($fact->place()->url()) . '">' . $fact->place()->getFullName() . '</a>'; ?>
+ <?php if ($fact->place()->gedcomName() !== '') : ?>
+ — <?=$fact->place()->fullName(true); ?>
<?php endif ?>
</div>
<?php endforeach ?>
diff --git a/resources/views/place-hierarchy.phtml b/resources/views/place-hierarchy.phtml
index d31579517f..453f729f67 100644
--- a/resources/views/place-hierarchy.phtml
+++ b/resources/views/place-hierarchy.phtml
@@ -12,7 +12,7 @@
<ul class="col list_value_wrap mr-1">
<?php foreach ($column as $item) : ?>
<li>
- <a href="<?= e($item->url()) ?>"><?= $item->getPlaceName() ?></a>
+ <a href="<?= e($item->url()) ?>"><?= $item->placeName() ?></a>
</li>
<?php endforeach ?>
</ul>
diff --git a/resources/views/place-list.phtml b/resources/views/place-list.phtml
index 1b3b867a6e..693589a7ff 100644
--- a/resources/views/place-list.phtml
+++ b/resources/views/place-list.phtml
@@ -11,7 +11,7 @@
<ul class="col list_value_wrap mr-1">
<?php foreach ($column as $item) : ?>
<li>
- <a href="<?= e($item->url()) ?>"><?= $item->getFullName() ?></a>
+ <a href="<?= e($item->url()) ?>"><?= $item->fullName() ?></a>
</li>
<?php endforeach ?>
</ul>
diff --git a/resources/views/place-sidebar.phtml b/resources/views/place-sidebar.phtml
index 3f19222247..daa487f1a8 100644
--- a/resources/views/place-sidebar.phtml
+++ b/resources/views/place-sidebar.phtml
@@ -5,10 +5,10 @@
<div class="d-table-cell label">
<?php if ($showlink) : ?>
<a href="<?= e($place->url()) ?>">
- <?= $place->getPlaceName() ?>
+ <?= $place->placeName() ?>
</a>
<?php else : ?>
- <?= $place->getPlaceName() ?>
+ <?= $place->placeName() ?>
<?php endif ?>
</div>
<div class="d-table-cell text-right">
diff --git a/resources/views/places-page.phtml b/resources/views/places-page.phtml
index 95c6d4b8bf..647c96ec37 100644
--- a/resources/views/places-page.phtml
+++ b/resources/views/places-page.phtml
@@ -14,11 +14,11 @@
<?php foreach ($breadcrumbs as $item) : ?>
-
- <a href="<?= e($item->url()) ?>" dir="auto"><?= $item->getPlaceName() ?></a>
+ <a href="<?= e($item->url()) ?>" dir="auto"><?= $item->placeName() ?></a>
<?php endforeach ?>
<?php if ($current) : ?>
- - <?= $current->getPlaceName() ?>
+ - <?= $current->placeName() ?>
<?php endif ?>
</h5>
<?php if ($note) : ?>
generated by cgit v1.3 (git 2.53.0) at 2026-07-05 16:03:25 +0000