diff options
| author | Greg Roach <fisharebest@gmail.com> | 2016-01-15 15:55:37 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2016-01-15 15:55:37 +0000 |
| commit | 2e8014937eee9a30938ee06c5b44483750324537 (patch) | |
| tree | e8b2dfa6ce075a10a6b4ab51ae619ba1593b6db3 | |
| parent | 415113c1b3857aeec37c423f313e51af0cd2da24 (diff) | |
| download | webtrees-2e8014937eee9a30938ee06c5b44483750324537.tar.gz webtrees-2e8014937eee9a30938ee06c5b44483750324537.tar.bz2 webtrees-2e8014937eee9a30938ee06c5b44483750324537.zip | |
Fix #795 - links to private individuals
| -rw-r--r-- | app/Theme/AbstractTheme.php | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php index f47c6f352f..a71fc73e72 100644 --- a/app/Theme/AbstractTheme.php +++ b/app/Theme/AbstractTheme.php @@ -700,21 +700,28 @@ abstract class AbstractTheme { $thumbnail = ''; } + $content = '<span class="namedef name1">' . $individual->getFullName() . '</span>'; + $icons = ''; + if ($individual->canShowName()) { + $content = + '<a href="' . $individual->getHtmlUrl() . '">' . $content . '</a>' . + '<div class="namedef name1">' . $individual->getAddName() . '</div>'; + $icons = + '<div class="noprint icons">' . + '<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' . + '<div class="itr"><i class="icon-pedigree"></i><div class="popup">' . + '<ul class="' . $personBoxClass . '">' . implode('', $this->individualBoxMenu($individual)) . '</ul>' . + '</div>' . + '</div>' . + '</div>'; + } + return '<div data-pid="' . $individual->getXref() . '" class="person_box_template ' . $personBoxClass . ' box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; min-height: ' . $this->parameter('chart-box-y') . 'px">' . - '<div class="noprint icons">' . - '<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' . - '<div class="itr"><i class="icon-pedigree"></i><div class="popup">' . - '<ul class="' . $personBoxClass . '">' . implode('', $this->individualBoxMenu($individual)) . '</ul>' . - '</div>' . - '</div>' . - '</div>' . + $icons . '<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' . $thumbnail . - '<a href="' . $individual->getHtmlUrl() . '">' . - '<span class="namedef name1">' . $individual->getFullName() . '</span>' . - '</a>' . - '<div class="namedef name1">' . $individual->getAddName() . '</div>' . + $content . '<div class="inout2 details1">' . $this->individualBoxFacts($individual) . '</div>' . '</div>' . '<div class="inout"></div>' . @@ -745,21 +752,28 @@ abstract class AbstractTheme { $thumbnail = ''; } + $content = '<span class="namedef name1">' . $individual->getFullName() . '</span>'; + $icons = ''; + if ($individual->canShowName()) { + $content = + '<a href="' . $individual->getHtmlUrl() . '">' . $content . '</a>' . + '<div class="namedef name2">' . $individual->getAddName() . '</div>'; + $icons = + '<div class="noprint icons">' . + '<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' . + '<div class="itr"><i class="icon-pedigree"></i><div class="popup">' . + '<ul class="' . $personBoxClass . '">' . implode('', $this->individualBoxMenu($individual)) . '</ul>' . + '</div>' . + '</div>' . + '</div>'; + } + return '<div data-pid="' . $individual->getXref() . '" class="person_box_template ' . $personBoxClass . ' box-style2">' . - '<div class="noprint icons">' . - '<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' . - '<div class="itr"><i class="icon-pedigree"></i><div class="popup">' . - '<ul class="' . $personBoxClass . '">' . implode('', $this->individualBoxMenu($individual)) . '</ul>' . - '</div>' . - '</div>' . - '</div>' . + $icons . '<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' . $thumbnail . - '<a href="' . $individual->getHtmlUrl() . '">' . - '<span class="namedef name2">' . $individual->getFullName() . '</span>' . - '</a>' . - '<div class="namedef name2">' . $individual->getAddName() . '</div>' . + $content . '<div class="inout2 details2">' . $this->individualBoxFacts($individual) . '</div>' . '</div>' . '<div class="inout"></div>' . |