diff options
| author | Greg Roach <fisharebest@gmail.com> | 2017-10-11 17:48:46 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2017-10-11 17:48:46 +0100 |
| commit | 89713119637cb08163d7e7c318ae706e55f73c7a (patch) | |
| tree | 21c0b1497dbd3e311aa1baccbd1be390c399fe68 /app/Module | |
| parent | 29ab9f928bbbda883c893846d5b81229a938b02b (diff) | |
| download | webtrees-89713119637cb08163d7e7c318ae706e55f73c7a.tar.gz webtrees-89713119637cb08163d7e7c318ae706e55f73c7a.tar.bz2 webtrees-89713119637cb08163d7e7c318ae706e55f73c7a.zip | |
Start to refactor relationship names/calculations
Diffstat (limited to 'app/Module')
| -rw-r--r-- | app/Module/FamilyNavigatorModule.php | 6 | ||||
| -rw-r--r-- | app/Module/RelativesTabModule.php | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/app/Module/FamilyNavigatorModule.php b/app/Module/FamilyNavigatorModule.php index 7a1918be44..2f9a0393fe 100644 --- a/app/Module/FamilyNavigatorModule.php +++ b/app/Module/FamilyNavigatorModule.php @@ -123,7 +123,8 @@ class FamilyNavigatorModule extends AbstractModule implements ModuleSidebarInter <tbody> <?php foreach ($family->getSpouses() as $spouse) { - $menu = new Menu(Functions::getCloseRelationshipName($controller->record, $spouse)); + $icon = $controller->record === $spouse ? '<i class="icon-selected"></i>' : ''; + $menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $spouse)); $menu->addSubmenu(new Menu($this->getParents($spouse))); ?> <tr class="text-center wt-parent wt-gender-<?= $spouse->getSex() ?>"> @@ -149,7 +150,8 @@ class FamilyNavigatorModule extends AbstractModule implements ModuleSidebarInter } foreach ($family->getChildren() as $child) { - $menu = new Menu(Functions::getCloseRelationshipName($controller->record, $child)); + $icon = $controller->record === $child ? '<i class="icon-selected"></i>' : ''; + $menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $child)); $menu->addSubmenu(new Menu($this->getFamily($child))); ?> <tr class="text-center wt-child wt-gender-<?= $child->getSex() ?>"> diff --git a/app/Module/RelativesTabModule.php b/app/Module/RelativesTabModule.php index b32c482f61..b6fbba491a 100644 --- a/app/Module/RelativesTabModule.php +++ b/app/Module/RelativesTabModule.php @@ -137,9 +137,11 @@ class RelativesTabModule extends AbstractModule implements ModuleTabInterface { } elseif ($fact->isPendingDeletion()) { $row_class .= ' old'; } + $icon = $controller->record === $person ? '<i class="icon-selected"></i>' : ''; ?> <tr class="<?= $row_class ?>"> <th scope="row"> + <?= $icon ?> <?= Functions::getCloseRelationshipName($controller->record, $person) ?> </th> <td class="border-0 p-0"> @@ -174,10 +176,12 @@ class RelativesTabModule extends AbstractModule implements ModuleTabInterface { } elseif ($fact->isPendingDeletion()) { $row_class .= ' old'; } - ?> + $icon = $controller->record === $person ? '<i class="icon-selected"></i>' : ''; + ?> <tr class="<?= $row_class ?>"> <th scope="row"> - <?= Functions::getCloseRelationshipName($controller->record, $person) ?> + <?= $icon ?> + <?= Functions::getCloseRelationshipName($controller->record, $person) ?> </th> <td class="border-0 p-0"> <?= Theme::theme()->individualBoxLarge($person) ?> @@ -260,9 +264,11 @@ class RelativesTabModule extends AbstractModule implements ModuleTabInterface { break; } } + $icon = $controller->record === $person ? '<i class="icon-selected"></i>' : ''; ?> <tr class="<?= $row_class ?>"> <th scope="row"> + <?= $icon ?> <?= self::ageDifference($prev, $next, $child_number) ?> <?= Functions::getCloseRelationshipName($controller->record, $person) ?> </th> |