@@ -706,7 +706,7 @@ discard block |
||
| 706 | 706 | <?= view('components/radios-no-yes',['name' => 'EXPAND_NOTES', 'value' => $tree->getPreference('EXPAND_NOTES')]) ?> |
| 707 | 707 | <p class="small text-muted"> |
| 708 | 708 | <?= /* I18N: Help text for the “Automatically expand notes” configuration setting */ |
| 709 | - I18N::translate('This option controls whether or not to automatically display content of a <i>Note</i> record on the Individual page.') ?> |
|
| 709 | + I18N::translate('This option controls whether or not to automatically display content of a <i>Note</i> record on the Individual page.') ?> |
|
| 710 | 710 | </p> |
| 711 | 711 | </div> |
| 712 | 712 | </div> |
@@ -722,7 +722,7 @@ discard block |
||
| 722 | 722 | <?= view('components/radios-no-yes',['name' => 'EXPAND_SOURCES', 'value' => $tree->getPreference('EXPAND_SOURCES')]) ?> |
| 723 | 723 | <p class="small text-muted"> |
| 724 | 724 | <?= /* I18N: Help text for the “Automatically expand sources” configuration setting */ |
| 725 | - I18N::translate('This option controls whether or not to automatically display content of a <i>Source</i> record on the Individual page.') ?> |
|
| 725 | + I18N::translate('This option controls whether or not to automatically display content of a <i>Source</i> record on the Individual page.') ?> |
|
| 726 | 726 | </p> |
| 727 | 727 | </div> |
| 728 | 728 | </div> |
@@ -745,13 +745,13 @@ discard block |
||
| 745 | 745 | </legend> |
| 746 | 746 | <div class="col-sm-9"> |
| 747 | 747 | <?= /* I18N: The placeholders are edit controls. Show the [first/last] [1/2/3/4/5] parts of a place name */ I18N::translate( |
| 748 | - 'Show the %1$s %2$s parts of a place name.', |
|
| 749 | - Bootstrap4::select([ |
|
| 750 | - '0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'), |
|
| 751 | - '1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'), |
|
| 752 | - ], $tree->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX'), ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX']), |
|
| 753 | - Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $tree->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES']) |
|
| 754 | - ) ?> |
|
| 748 | + 'Show the %1$s %2$s parts of a place name.', |
|
| 749 | + Bootstrap4::select([ |
|
| 750 | + '0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'), |
|
| 751 | + '1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'), |
|
| 752 | + ], $tree->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX'), ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX']), |
|
| 753 | + Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $tree->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES']) |
|
| 754 | + ) ?> |
|
| 755 | 755 | <p class="small text-muted"> |
| 756 | 756 | <?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?> |
| 757 | 757 | </p> |
@@ -327,9 +327,9 @@ |
||
| 327 | 327 | |
| 328 | 328 | // Now fetch these anniversaries |
| 329 | 329 | foreach ([ |
| 330 | - 'INDI' => $ind_sql . $where . $order_by, |
|
| 331 | - 'FAM' => $fam_sql . $where . $order_by, |
|
| 332 | - ] as $type => $sql) { |
|
| 330 | + 'INDI' => $ind_sql . $where . $order_by, |
|
| 331 | + 'FAM' => $fam_sql . $where . $order_by, |
|
| 332 | + ] as $type => $sql) { |
|
| 333 | 333 | $rows = Database::prepare($sql)->execute($args)->fetchAll(); |
| 334 | 334 | foreach ($rows as $row) { |
| 335 | 335 | if ($type === 'INDI') { |
@@ -123,49 +123,49 @@ |
||
| 123 | 123 | |
| 124 | 124 | <p class="card-text"> |
| 125 | 125 | <?php |
| 126 | - // Show file details |
|
| 127 | - $mediatype = $media_file->type(); |
|
| 128 | - if ($mediatype) { |
|
| 129 | - echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($mediatype)); |
|
| 130 | - } |
|
| 131 | - echo FunctionsPrintFacts::printFactSources($tree, $media_object->getGedcom(), 1); |
|
| 132 | - echo FunctionsPrint::printFactNotes($tree, $media_object->getGedcom(), 1); |
|
| 133 | - if ($media_file->isExternal()) { |
|
| 134 | - echo GedcomTag::getLabelValue('URL', $media_file->filename()); |
|
| 135 | - } elseif ($media_file->fileExists()) { |
|
| 136 | - ?> |
|
| 126 | + // Show file details |
|
| 127 | + $mediatype = $media_file->type(); |
|
| 128 | + if ($mediatype) { |
|
| 129 | + echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($mediatype)); |
|
| 130 | + } |
|
| 131 | + echo FunctionsPrintFacts::printFactSources($tree, $media_object->getGedcom(), 1); |
|
| 132 | + echo FunctionsPrint::printFactNotes($tree, $media_object->getGedcom(), 1); |
|
| 133 | + if ($media_file->isExternal()) { |
|
| 134 | + echo GedcomTag::getLabelValue('URL', $media_file->filename()); |
|
| 135 | + } elseif ($media_file->fileExists()) { |
|
| 136 | + ?> |
|
| 137 | 137 | <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#details-<?= e($n) ?>" aria-expanded="false" aria-controls="details-<?= e($n) ?>"> |
| 138 | 138 | <?= I18N::translate('Media file') ?> |
| 139 | 139 | </button> |
| 140 | 140 | <div class="collapse" id="details-<?= e($n) ?>"> |
| 141 | 141 | <?php |
| 142 | - if (Auth::isEditor($tree)) { |
|
| 143 | - echo GedcomTag::getLabelValue('FILE', $media_file->filename()); |
|
| 144 | - } |
|
| 145 | - echo GedcomTag::getLabelValue('FORM', $media_file->mimeType()); |
|
| 146 | - foreach ($media_file->attributes() as $tag => $value) { |
|
| 147 | - echo GedcomTag::getLabelValue($tag, $value); |
|
| 148 | - } |
|
| 149 | - ?> |
|
| 142 | + if (Auth::isEditor($tree)) { |
|
| 143 | + echo GedcomTag::getLabelValue('FILE', $media_file->filename()); |
|
| 144 | + } |
|
| 145 | + echo GedcomTag::getLabelValue('FORM', $media_file->mimeType()); |
|
| 146 | + foreach ($media_file->attributes() as $tag => $value) { |
|
| 147 | + echo GedcomTag::getLabelValue($tag, $value); |
|
| 148 | + } |
|
| 149 | + ?> |
|
| 150 | 150 | </div> |
| 151 | 151 | <?php |
| 152 | - } else { |
|
| 153 | - echo '<p class="alert alert-danger">', /* I18N: %s is a filename */ I18N::translate('The file “%s” does not exist.', $media_file->filename()), '</p>'; |
|
| 154 | - } |
|
| 155 | - ?> |
|
| 152 | + } else { |
|
| 153 | + echo '<p class="alert alert-danger">', /* I18N: %s is a filename */ I18N::translate('The file “%s” does not exist.', $media_file->filename()), '</p>'; |
|
| 154 | + } |
|
| 155 | + ?> |
|
| 156 | 156 | </p> |
| 157 | 157 | </div> |
| 158 | 158 | <div class="card-footer"> |
| 159 | 159 | <?php |
| 160 | - foreach ($media_object->linkedIndividuals('OBJE') as $individual) { |
|
| 161 | - echo '<a href="' . e($individual->url()) . '">' . FontAwesome::semanticIcon('individual', I18N::translate('Individual')) . ' ' . $individual->getFullName() . '</a><br>'; |
|
| 162 | - } |
|
| 163 | - foreach ($media_object->linkedFamilies('OBJE') as $family) { |
|
| 164 | - echo '<a href="' . e($family->url()) . '">' . FontAwesome::semanticIcon('family', I18N::translate('Family')) . ' ' . $family->getFullName() . '</a><br>'; |
|
| 165 | - } |
|
| 166 | - foreach ($media_object->linkedSources('OBJE') as $source) { |
|
| 167 | - echo '<a href="' . e($source->url()) . '">' . FontAwesome::semanticIcon('source', I18N::translate('Source')) . ' ' . $source->getFullName() . '</a><br>'; |
|
| 168 | - } ?> |
|
| 160 | + foreach ($media_object->linkedIndividuals('OBJE') as $individual) { |
|
| 161 | + echo '<a href="' . e($individual->url()) . '">' . FontAwesome::semanticIcon('individual', I18N::translate('Individual')) . ' ' . $individual->getFullName() . '</a><br>'; |
|
| 162 | + } |
|
| 163 | + foreach ($media_object->linkedFamilies('OBJE') as $family) { |
|
| 164 | + echo '<a href="' . e($family->url()) . '">' . FontAwesome::semanticIcon('family', I18N::translate('Family')) . ' ' . $family->getFullName() . '</a><br>'; |
|
| 165 | + } |
|
| 166 | + foreach ($media_object->linkedSources('OBJE') as $source) { |
|
| 167 | + echo '<a href="' . e($source->url()) . '">' . FontAwesome::semanticIcon('source', I18N::translate('Source')) . ' ' . $source->getFullName() . '</a><br>'; |
|
| 168 | + } ?> |
|
| 169 | 169 | </div> |
| 170 | 170 | </div> |
| 171 | 171 | </div> |