diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/views/admin/changes-log.phtml | 4 | ||||
| -rw-r--r-- | resources/views/lists/families-table.phtml | 8 | ||||
| -rw-r--r-- | resources/views/lists/individuals-table.phtml | 8 | ||||
| -rw-r--r-- | resources/views/modules/timeline-chart/chart.phtml | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/resources/views/admin/changes-log.phtml b/resources/views/admin/changes-log.phtml index e5359c599e..3083cc2834 100644 --- a/resources/views/admin/changes-log.phtml +++ b/resources/views/admin/changes-log.phtml @@ -105,12 +105,12 @@ use Fisharebest\Webtrees\Tree; <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('reset') ?> </a> - <a class="btn btn-secondary" href="<?= (route(PendingChangesLogDownload::class, ['from' => $from, 'to' => $to, 'type' => $type, 'xref' => $xref, 'oldged' => $oldged, 'newged' => $newged, 'tree' => $tree->name(), 'username' => $username])) ?>"> + <a class="btn btn-secondary" href="<?= route(PendingChangesLogDownload::class, ['from' => $from, 'to' => $to, 'type' => $type, 'xref' => $xref, 'oldged' => $oldged, 'newged' => $newged, 'tree' => $tree->name(), 'username' => $username]) ?>"> <?= view('icons/download') ?> <?= /* I18N: A button label. */ I18N::translate('download') ?> </a> - <a href="#" class="btn btn-danger" data-wt-confirm="<?= I18N::translate('Permanently delete these records?') ?>" data-wt-post-url="<?= (route(PendingChangesLogDelete::class, ['from' => $from, 'to' => $to, 'type' => $type, 'xref' => $xref, 'oldged' => $oldged, 'newged' => $newged, 'tree' => $tree->name(), 'username' => $username])) ?>"> + <a href="#" class="btn btn-danger" data-wt-confirm="<?= I18N::translate('Permanently delete these records?') ?>" data-wt-post-url="<?= route(PendingChangesLogDelete::class, ['from' => $from, 'to' => $to, 'type' => $type, 'xref' => $xref, 'oldged' => $oldged, 'newged' => $newged, 'tree' => $tree->name(), 'username' => $username]) ?>"> <?= view('icons/delete') ?> <?= I18N::translate('delete') ?> </a> diff --git a/resources/views/lists/families-table.phtml b/resources/views/lists/families-table.phtml index ab0942a68f..176c5f90d6 100644 --- a/resources/views/lists/families-table.phtml +++ b/resources/views/lists/families-table.phtml @@ -440,7 +440,7 @@ $marriageAgeData = [ </div><div class="card-body"> <?php foreach ($birt_by_decade as $century => $values) { - if (($values['M'] + $values['F']) > 0) { + if ($values['M'] + $values['F'] > 0) { $birthData[] = [ [ 'v' => 'Date(' . $century . ', 0, 1)', @@ -461,7 +461,7 @@ $marriageAgeData = [ </div><div class="card-body"> <?php foreach ($marr_by_decade as $century => $values) { - if (($values['M'] + $values['F']) > 0) { + if ($values['M'] + $values['F'] > 0) { $marriageData[] = [ [ 'v' => 'Date(' . $century . ', 0, 1)', @@ -487,8 +487,8 @@ $marriageAgeData = [ $max = 0; foreach ($marr_by_age as $age => $values) { - if (($values['M'] + $values['F']) > 0) { - if (($values['M'] + $values['F']) > $max) { + if ($values['M'] + $values['F'] > 0) { + if ($values['M'] + $values['F'] > $max) { $max = $values['M'] + $values['F']; } diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml index 5931e86374..c85e05e9b6 100644 --- a/resources/views/lists/individuals-table.phtml +++ b/resources/views/lists/individuals-table.phtml @@ -448,7 +448,7 @@ $deathAgeData = [ <div class="card-body"> <?php foreach ($birt_by_decade as $century => $values) { - if (($values['M'] + $values['F']) > 0) { + if ($values['M'] + $values['F'] > 0) { $birthData[] = [ [ 'v' => 'Date(' . $century . ', 0, 1)', @@ -470,7 +470,7 @@ $deathAgeData = [ <div class="card-body"> <?php foreach ($deat_by_decade as $century => $values) { - if (($values['M'] + $values['F']) > 0) { + if ($values['M'] + $values['F'] > 0) { $deathData[] = [ [ 'v' => 'Date(' . $century . ', 0, 1)', @@ -496,8 +496,8 @@ $deathAgeData = [ $max = 0; foreach ($deat_by_age as $age => $values) { - if (($values['M'] + $values['F']) > 0) { - if (($values['M'] + $values['F']) > $max) { + if ($values['M'] + $values['F'] > 0) { + if ($values['M'] + $values['F'] > $max) { $max = $values['M'] + $values['F']; } diff --git a/resources/views/modules/timeline-chart/chart.phtml b/resources/views/modules/timeline-chart/chart.phtml index 6c5de0e06f..9e973d1a31 100644 --- a/resources/views/modules/timeline-chart/chart.phtml +++ b/resources/views/modules/timeline-chart/chart.phtml @@ -268,7 +268,7 @@ use Fisharebest\Webtrees\Individual; } for ($i = $baseyear + 1; $i < $topyear; $i++) { if ($i % $mod === 0) { - echo '<div id="scale' . $i . '" style="position:absolute; ' . (I18N::direction() === 'ltr' ? 'left:0;' : 'right:0;') . ' top:' . ((($i - $baseyear) * $scale) - $scale / 2) . 'px; font-size: 7pt; text-align:' . (I18N::direction() === 'ltr' ? 'left' : 'right') . ';">'; + echo '<div id="scale' . $i . '" style="position:absolute; ' . (I18N::direction() === 'ltr' ? 'left:0;' : 'right:0;') . ' top:' . (($i - $baseyear) * $scale - $scale / 2) . 'px; font-size: 7pt; text-align:' . (I18N::direction() === 'ltr' ? 'left' : 'right') . ';">'; echo $i; echo '</div>'; } @@ -372,7 +372,7 @@ use Fisharebest\Webtrees\Individual; $img = asset('css/images/dline.png'); $ypos = '100%'; } - $dyoffset = ($yoffset - $tyoffset) + $bheight / 3; + $dyoffset = $yoffset - $tyoffset + $bheight / 3; if ($tyoffset < 0) { $dyoffset = $yoffset + $bheight / 3; if (I18N::direction() === 'ltr') { @@ -386,13 +386,13 @@ use Fisharebest\Webtrees\Individual; ?> <!-- diagonal line --> - <div id="dbox<?= $factcount ?>" style="position:absolute; <?= (I18N::direction() === 'ltr' ? 'left: ' . (0 + 25) : 'right: ' . (0 + 25)) ?>px; top:<?= ($dyoffset) ?>px; font-size: 8pt; height: <?= abs($tyoffset) ?>px; width: <?= abs($tyoffset) ?>px; background-image: url('<?= e($img) ?>'); background-position: 0 <?= $ypos ?>;"> + <div id="dbox<?= $factcount ?>" style="position:absolute; <?= I18N::direction() === 'ltr' ? 'left: ' . (0 + 25) : 'right: ' . (0 + 25) ?>px; top:<?= $dyoffset ?>px; font-size: 8pt; height: <?= abs($tyoffset) ?>px; width: <?= abs($tyoffset) ?>px; background-image: url('<?= e($img) ?>'); background-position: 0 <?= $ypos ?>;"> </div> <?php endforeach ?> <!-- age cursors --> <?php foreach ($individuals as $p => $indi) : ?> - <?php $ageyoffset = 0 + ($bheight * $p); ?> + <?php $ageyoffset = 0 + $bheight * $p; ?> <div id="agebox<?= $p ?>" style="cursor:move; position:absolute; <?= I18N::direction() === 'ltr' ? 'left:20px;' : 'right:20px;' ?> top:<?= $ageyoffset ?>px; height:<?= $bheight ?>px; display:none;" onmousedown="ageCursorMouseDown(this, <?= $p ?>);"> <table cellspacing="0" cellpadding="0"> <tr> @@ -401,7 +401,7 @@ use Fisharebest\Webtrees\Individual; </td> <td> <?php if (!empty($birthyears[$indi->xref()])) : ?> - <?php $tyear = round(($ageyoffset + ($bheight / 2)) / $scale) + $baseyear; ?> + <?php $tyear = round(($ageyoffset + $bheight / 2) / $scale) + $baseyear; ?> <table class="person<?= $p % 6 ?>" style="cursor: grab;"> <tr> <td> |