diff options
Diffstat (limited to 'resources/views/modules')
74 files changed, 2663 insertions, 2660 deletions
diff --git a/resources/views/modules/GEDFact_assistant/select-census.php b/resources/views/modules/GEDFact_assistant/select-census.php index 9f95ad87f7..1ed6f949ab 100644 --- a/resources/views/modules/GEDFact_assistant/select-census.php +++ b/resources/views/modules/GEDFact_assistant/select-census.php @@ -12,15 +12,15 @@ </script> <select id="census-selector" class="form-control" onchange="selectCensus(this)"> - <option value=""><?= I18N::translate('Census date') ?></option> + <option value=""><?= I18N::translate('Census date') ?></option> - <?php foreach ($census_places as $census_place): ?> - <option value=""></option> - <?php foreach ($census_place->allCensusDates() as $census): ?> - <option value="<?= $census->censusDate() ?>" data-place="<?= $census->censusPlace() ?>" data-census="<?= get_class($census) ?>"> - <?= (explode(', ', $census->censusPlace()))[0] ?> - <?= (new Date($census->censusDate()))->minimumDate()->format('%Y') ?> - </option> - <?php endforeach ?> - <?php endforeach ?> + <?php foreach ($census_places as $census_place) : ?> + <option value=""></option> + <?php foreach ($census_place->allCensusDates() as $census) : ?> + <option value="<?= $census->censusDate() ?>" data-place="<?= $census->censusPlace() ?>" data-census="<?= get_class($census) ?>"> + <?= (explode(', ', $census->censusPlace()))[0] ?> + <?= (new Date($census->censusDate()))->minimumDate()->format('%Y') ?> + </option> + <?php endforeach ?> + <?php endforeach ?> </select> diff --git a/resources/views/modules/batch_update/admin.php b/resources/views/modules/batch_update/admin.php index 850ab9f87e..d56426fec5 100644 --- a/resources/views/modules/batch_update/admin.php +++ b/resources/views/modules/batch_update/admin.php @@ -6,96 +6,96 @@ <h1><?= $title ?></h1> <form > - <input type="hidden" name="route" value="module"> - <input type="hidden" name="module" value="batch_update"> - <input type="hidden" name="action" value="Admin"> - <input type="hidden" name="xref" value="<?= $curr_xref ?>"> - <?= csrf_field() ?> + <input type="hidden" name="route" value="module"> + <input type="hidden" name="module" value="batch_update"> + <input type="hidden" name="action" value="Admin"> + <input type="hidden" name="xref" value="<?= $curr_xref ?>"> + <?= csrf_field() ?> - <div class="row form-group"> - <label class="col-sm-3 col-form-label"><?= I18N::translate('Family tree') ?></label> - <div class="col-sm-9"> - <?= Bootstrap4::select($trees, $tree->getName(), ['id' => 'ged', 'name' => 'ged', 'onchange' => 'this.form.submit();']) ?> - </div> - </div> - <div class="row form-group"> - <label class="col-sm-3 col-form-label"><?= I18N::translate('Batch update') ?></label> - <div class="col-sm-9"> - <select class="form-control" name="plugin" onchange="this.form.submit();"> - <?php if ($plugin === null): ?> - <option value="" selected></option> - <?php endif ?> + <div class="row form-group"> + <label class="col-sm-3 col-form-label"><?= I18N::translate('Family tree') ?></label> + <div class="col-sm-9"> + <?= Bootstrap4::select($trees, $tree->getName(), ['id' => 'ged', 'name' => 'ged', 'onchange' => 'this.form.submit();']) ?> + </div> + </div> + <div class="row form-group"> + <label class="col-sm-3 col-form-label"><?= I18N::translate('Batch update') ?></label> + <div class="col-sm-9"> + <select class="form-control" name="plugin" onchange="this.form.submit();"> + <?php if ($plugin === null) : ?> + <option value="" selected></option> + <?php endif ?> - <?php foreach ($plugins as $key => $value): ?> - <option value="<?= $key ?>" <?= ($plugin ? '\\' . get_class($plugin) : null) === $key ? 'selected' : '' ?>> - <?= $value->getName() ?> - </option> - <?php endforeach ?> - </select> + <?php foreach ($plugins as $key => $value) : ?> + <option value="<?= $key ?>" <?= ($plugin ? '\\' . get_class($plugin) : null) === $key ? 'selected' : '' ?>> + <?= $value->getName() ?> + </option> + <?php endforeach ?> + </select> - <?php if ($plugin !== null): ?> - <p class="small text-muted"><?= $plugin->getDescription() ?></p> - <?php endif ?> - </div> - </div> + <?php if ($plugin !== null) : ?> + <p class="small text-muted"><?= $plugin->getDescription() ?></p> + <?php endif ?> + </div> + </div> - <?php if ($plugin !== null): ?> - <?= $plugin->getOptionsForm() ?> + <?php if ($plugin !== null) : ?> + <?= $plugin->getOptionsForm() ?> - <hr> + <hr> - <?php if ($record !== null): ?> - <div class="row"> - <div class="col-sm-3 d-flex flex-column justify-content-between"> - <div> - <?php if ($prev_xref === null): ?> - <button class="btn btn-primary" type="submit" disabled> - <?= I18N::translate('previous') ?> - </button> - <?php else: ?> - <button class="btn btn-primary" type="submit" onclick="this.form.xref.value='<?= e($prev_xref) ?>'"> - <?= I18N::translate('previous') ?> - </button> - <?php endif ?> + <?php if ($record !== null) : ?> + <div class="row"> + <div class="col-sm-3 d-flex flex-column justify-content-between"> + <div> + <?php if ($prev_xref === null) : ?> + <button class="btn btn-primary" type="submit" disabled> + <?= I18N::translate('previous') ?> + </button> + <?php else : ?> + <button class="btn btn-primary" type="submit" onclick="this.form.xref.value='<?= e($prev_xref) ?>'"> + <?= I18N::translate('previous') ?> + </button> + <?php endif ?> - <?php if ($next_xref === null): ?> - <button class="btn btn-primary" type="submit" disabled> - <?= I18N::translate('next') ?> - </button> - <?php else: ?> - <button class="btn btn-primary" type="submit" onclick="this.form.xref.value='<?= e($next_xref) ?>'"> - <?= I18N::translate('next') ?> - </button> - <?php endif ?> - </div> + <?php if ($next_xref === null) : ?> + <button class="btn btn-primary" type="submit" disabled> + <?= I18N::translate('next') ?> + </button> + <?php else : ?> + <button class="btn btn-primary" type="submit" onclick="this.form.xref.value='<?= e($next_xref) ?>'"> + <?= I18N::translate('next') ?> + </button> + <?php endif ?> + </div> - <div> - <button class="btn btn-primary" type="submit" name="update" value="one" onclick="this.form.method='post'"> - <?= I18N::translate('Update') ?> - </button> + <div> + <button class="btn btn-primary" type="submit" name="update" value="one" onclick="this.form.method='post'"> + <?= I18N::translate('Update') ?> + </button> - <?php if ($auto_accept): ?> - <button class="btn btn-primary" type="submit" name="update" value="all" onclick="this.form.method='post'"> - <?= I18N::translate('Update all') ?> - </button> - <?php else: ?> - <button class="btn btn-primary" disabled title="<?= I18N::translate('Your user account does not have “automatically accept changes” enabled. You will only be able to change one record at a time.') ?>"> - <?= I18N::translate('Update all') ?> - </button> - <?php endif ?> - </div> - </div> - <div class="col-sm-9"> - <a class="lead" href="<?= e($record->url()) ?>"> - <?= $record->getFullName() ?> - </a> - <?= $plugin->getActionPreview($record) ?> - </div> - </div> - <?php else: ?> - <div class="alert alert-info"> - <?= I18N::translate('Nothing found.') ?> - </div> - <?php endif ?> - <?php endif ?> + <?php if ($auto_accept) : ?> + <button class="btn btn-primary" type="submit" name="update" value="all" onclick="this.form.method='post'"> + <?= I18N::translate('Update all') ?> + </button> + <?php else : ?> + <button class="btn btn-primary" disabled title="<?= I18N::translate('Your user account does not have “automatically accept changes” enabled. You will only be able to change one record at a time.') ?>"> + <?= I18N::translate('Update all') ?> + </button> + <?php endif ?> + </div> + </div> + <div class="col-sm-9"> + <a class="lead" href="<?= e($record->url()) ?>"> + <?= $record->getFullName() ?> + </a> + <?= $plugin->getActionPreview($record) ?> + </div> + </div> + <?php else : ?> + <div class="alert alert-info"> + <?= I18N::translate('Nothing found.') ?> + </div> + <?php endif ?> + <?php endif ?> </form> diff --git a/resources/views/modules/block-template.php b/resources/views/modules/block-template.php index 3c99a98c13..f6f75e182d 100644 --- a/resources/views/modules/block-template.php +++ b/resources/views/modules/block-template.php @@ -2,13 +2,13 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="card mb-4 wt-block wt-block-<?= e($block) ?>-block" id="block-<?= e($id) ?>"> - <div class="card-header wt-block-header wt-block-header-<?= e($block) ?>" dir="auto"> - <?php if ($config_url !== ''): ?> - <?= FontAwesome::linkIcon('preferences', I18N::translate('Preferences'), ['class' => 'btn btn-link', 'href' => $config_url]) ?> - <?php endif ?> - <?= $title ?> - </div> - <div class="card-body wt-block-content wt-block-content-<?= e($block) ?>"> - <?= $content ?> - </div> + <div class="card-header wt-block-header wt-block-header-<?= e($block) ?>" dir="auto"> + <?php if ($config_url !== '') : ?> + <?= FontAwesome::linkIcon('preferences', I18N::translate('Preferences'), ['class' => 'btn btn-link', 'href' => $config_url]) ?> + <?php endif ?> + <?= $title ?> + </div> + <div class="card-body wt-block-content wt-block-content-<?= e($block) ?>"> + <?= $content ?> + </div> </div> diff --git a/resources/views/modules/census-assistant.php b/resources/views/modules/census-assistant.php index 48dd540410..9aa70dbb20 100644 --- a/resources/views/modules/census-assistant.php +++ b/resources/views/modules/census-assistant.php @@ -3,86 +3,86 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div id="census-assistant-link" hidden> - <a href="#"> - <?= I18N::translate('Create a shared note using the census assistant') ?> - </a> + <a href="#"> + <?= I18N::translate('Create a shared note using the census assistant') ?> + </a> </div> <div id="census-assistant" hidden> - <input type="hidden" name="ca_census" id="census-assistant-class"> - <div class="form-group"> - <div class="input-group"> - <div class="input-group-prepend"> - <label class="input-group-text" for="census-assistant-title"> - <?= I18N::translate('Title') ?> - </label> - </div> - <input class="form-control" id="census-assistant-title" name="ca_title" value=""> - </div> - </div> + <input type="hidden" name="ca_census" id="census-assistant-class"> + <div class="form-group"> + <div class="input-group"> + <div class="input-group-prepend"> + <label class="input-group-text" for="census-assistant-title"> + <?= I18N::translate('Title') ?> + </label> + </div> + <input class="form-control" id="census-assistant-title" name="ca_title" value=""> + </div> + </div> - <div class="row"> - <div class="form-group col-sm-6"> - <div class="input-group"> - <div class="input-group-prepend"> - <label class="input-group-addon" for="census-assistant-citation"> - <?= I18N::translate('Citation') ?> - </label> - </div> - <input class="form-control" id="census-assistant-citation" name="ca_citation"> - </div> - </div> + <div class="row"> + <div class="form-group col-sm-6"> + <div class="input-group"> + <div class="input-group-prepend"> + <label class="input-group-addon" for="census-assistant-citation"> + <?= I18N::translate('Citation') ?> + </label> + </div> + <input class="form-control" id="census-assistant-citation" name="ca_citation"> + </div> + </div> - <div class="form-group col-sm-6"> - <div class="input-group"> - <div class="input-group-prepend"> - <label class="input-group-text" for="census-assistant-place"> - <?= I18N::translate('Place') ?> - </label> - </div> - <input class="form-control" id="census-assistant-place" name="ca_place"> - </div> - </div> - </div> + <div class="form-group col-sm-6"> + <div class="input-group"> + <div class="input-group-prepend"> + <label class="input-group-text" for="census-assistant-place"> + <?= I18N::translate('Place') ?> + </label> + </div> + <input class="form-control" id="census-assistant-place" name="ca_place"> + </div> + </div> + </div> - <div class="form-group"> - <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"> - <?= I18N::translate('Individuals') ?> - </span> - </div> - <?= FunctionsEdit::formControlIndividual($individual->getTree(), $individual, ['id' => 'census-assistant-individual', 'style' => 'width:100%']) ?> - <span class="input-group-btn"> - <button type="button" class="btn btn-primary" id="census-assistant-add"> - <?= FontAwesome::semanticIcon('add', I18N::translate('Add')) ?> - </button> - </span> - <span class="input-group-btn"> - <button type="button" class="btn btn-primary" id="census-assistant-head" - title="<?= I18N::translate('Head of household') ?>"> - <?= FontAwesome::semanticIcon('individual', I18N::translate('Head of household')) ?> - </button> - </span> - </div> - </div> + <div class="form-group"> + <div class="input-group"> + <div class="input-group-prepend"> + <span class="input-group-text"> + <?= I18N::translate('Individuals') ?> + </span> + </div> + <?= FunctionsEdit::formControlIndividual($individual->getTree(), $individual, ['id' => 'census-assistant-individual', 'style' => 'width:100%']) ?> + <span class="input-group-btn"> + <button type="button" class="btn btn-primary" id="census-assistant-add"> + <?= FontAwesome::semanticIcon('add', I18N::translate('Add')) ?> + </button> + </span> + <span class="input-group-btn"> + <button type="button" class="btn btn-primary" id="census-assistant-head" + title="<?= I18N::translate('Head of household') ?>"> + <?= FontAwesome::semanticIcon('individual', I18N::translate('Head of household')) ?> + </button> + </span> + </div> + </div> - <table class="table table-bordered table-small table-responsive wt-census-assistant-table" - id="census-assistant-table"> - <thead class="wt-census-assistant-header"></thead> - <tbody class="wt-census-assistant-body"></tbody> - </table> + <table class="table table-bordered table-small table-responsive wt-census-assistant-table" + id="census-assistant-table"> + <thead class="wt-census-assistant-header"></thead> + <tbody class="wt-census-assistant-body"></tbody> + </table> - <div class="form-group"> - <div class="input-group"> - <div class="input-group-prepend"> - <label class="input-group-text" for="census-assistant-notes"> - <?= I18N::translate('Notes') ?> - </label> - </div> - <input class="form-control" id="census-assistant-notes" name="ca_notes"> - </div> - </div> + <div class="form-group"> + <div class="input-group"> + <div class="input-group-prepend"> + <label class="input-group-text" for="census-assistant-notes"> + <?= I18N::translate('Notes') ?> + </label> + </div> + <input class="form-control" id="census-assistant-notes" name="ca_notes"> + </div> + </div> </div> <script> diff --git a/resources/views/modules/charts/config.php b/resources/views/modules/charts/config.php index 7664114b20..1fdb03e789 100644 --- a/resources/views/modules/charts/config.php +++ b/resources/views/modules/charts/config.php @@ -3,21 +3,21 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="type"> - <?= I18N::translate('Chart type') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($charts, $type, ['id' => 'type', 'name' => 'type']) ?> - </div> + <label class="col-sm-3 col-form-label" for="type"> + <?= I18N::translate('Chart type') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($charts, $type, ['id' => 'type', 'name' => 'type']) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="pid"> - <label for="pid"> - <?= I18N::translate('Individual') ?> - </label> - </label> - <div class="col-sm-9"> - <?= FunctionsEdit::formControlIndividual($tree, $individual, ['id' => 'pid', 'name' => 'pid']) ?> - </div> + <label class="col-sm-3 col-form-label" for="pid"> + <label for="pid"> + <?= I18N::translate('Individual') ?> + </label> + </label> + <div class="col-sm-9"> + <?= FunctionsEdit::formControlIndividual($tree, $individual, ['id' => 'pid', 'name' => 'pid']) ?> + </div> </div> diff --git a/resources/views/modules/ckeditor/ckeditor-js.php b/resources/views/modules/ckeditor/ckeditor-js.php index ec4f6ed323..30a7bf8118 100644 --- a/resources/views/modules/ckeditor/ckeditor-js.php +++ b/resources/views/modules/ckeditor/ckeditor-js.php @@ -1,12 +1,12 @@ <?php use Fisharebest\Webtrees\Module; ?> <?php use Fisharebest\Webtrees\View; ?> -<?php if (Module::getModuleByName('ckeditor')): ?> - <?php View::push('javascript') ?> - <script src="<?= e(WT_CKEDITOR_BASE_URL) ?>ckeditor.js"></script> - <script src="<?= e(WT_CKEDITOR_BASE_URL) ?>adapters/jquery.js"></script> +<?php if (Module::getModuleByName('ckeditor')) : ?> + <?php View::push('javascript') ?> + <script src="<?= e(WT_CKEDITOR_BASE_URL) ?>ckeditor.js"></script> + <script src="<?= e(WT_CKEDITOR_BASE_URL) ?>adapters/jquery.js"></script> - <script> + <script> var CKEDITOR_BASEPATH = <?= json_encode(WT_CKEDITOR_BASE_URL) ?>; // Enable for all browsers @@ -20,6 +20,6 @@ $("textarea.html-edit").ckeditor(function(config){config.removePlugins = "forms";}, { language: "<?= strtolower(WT_LOCALE) ?>" }); - </script> - <?php View::endpush() ?> + </script> + <?php View::endpush() ?> <?php endif ?> diff --git a/resources/views/modules/clippings/add-options.php b/resources/views/modules/clippings/add-options.php index 8970c13d8f..51961f6b03 100644 --- a/resources/views/modules/clippings/add-options.php +++ b/resources/views/modules/clippings/add-options.php @@ -5,29 +5,29 @@ <h2 class="wt-page-title"><?= $title ?></h2> <form class="wt-page-options wt-page-options-clippings d-print-none" method="post"> - <?= csrf_field() ?> + <?= csrf_field() ?> - <div class="row form-group"> - <div class="col-sm-3 col-form-label wt-page-options-label"> - <?= I18N::translate('Add to the clippings cart') ?> - </div> - <div class="col-sm-9 wt-page-options-value"> - <?= Bootstrap4::radioButtons('option', $options, $default, false, []) ?> - </div> - </div> + <div class="row form-group"> + <div class="col-sm-3 col-form-label wt-page-options-label"> + <?= I18N::translate('Add to the clippings cart') ?> + </div> + <div class="col-sm-9 wt-page-options-value"> + <?= Bootstrap4::radioButtons('option', $options, $default, false, []) ?> + </div> + </div> - <div class="row form-group"> - <div class="col-sm-3 wt-page-options-label"></div> - <div class="col-sm-9 wt-page-options-value"> - <button type="submit" class="btn btn-primary"> - <?= FontAwesome::decorativeIcon('save') ?> - <?= /* I18N: A button label. */ I18N::translate('continue') ?> - </button> + <div class="row form-group"> + <div class="col-sm-3 wt-page-options-label"></div> + <div class="col-sm-9 wt-page-options-value"> + <button type="submit" class="btn btn-primary"> + <?= FontAwesome::decorativeIcon('save') ?> + <?= /* I18N: A button label. */ I18N::translate('continue') ?> + </button> - <a class="btn btn-secondary" href="<?= e($record->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> - <?= /* I18N: A button label. */ I18N::translate('cancel') ?> - </a> - </div> - </div> + <a class="btn btn-secondary" href="<?= e($record->url()) ?>"> + <?= FontAwesome::decorativeIcon('cancel') ?> + <?= /* I18N: A button label. */ I18N::translate('cancel') ?> + </a> + </div> + </div> </form> diff --git a/resources/views/modules/clippings/download.php b/resources/views/modules/clippings/download.php index 869d1b9336..6b6c82aa0a 100644 --- a/resources/views/modules/clippings/download.php +++ b/resources/views/modules/clippings/download.php @@ -4,66 +4,66 @@ <h2 class="wt-page-title"><?= $title ?></h2> <form class="wt-page-options wt-page-options-clippings-download hidden-print"> - <input type="hidden" name="route" value="module"> - <input type="hidden" name="module" value="clippings"> - <input type="hidden" name="action" value="Download"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="route" value="module"> + <input type="hidden" name="module" value="clippings"> + <input type="hidden" name="action" value="Download"> + <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> - <?php if ($is_manager): ?> - <div class="row form-group"> - <div class="col-sm-3 col-form-label wt-page-options-label"> - <?= I18N::translate('Apply privacy settings') ?> - </div> - <div class="col-sm-9 wt-page-options-value"> - <input type="radio" name="privatize_export" value="none" checked> - <?= I18N::translate('None') ?> - <br> - <input type="radio" name="privatize_export" value="gedadmin"> - <?= I18N::translate('Manager') ?> - <br> - <input type="radio" name="privatize_export" value="user"> - <?= I18N::translate('Member') ?> - <br> - <input type="radio" name="privatize_export" value="visitor"> - <?= I18N::translate('Visitor') ?> - </div> - </div> - <?php elseif ($is_member): ?> - <div class="row form-group"> - <div class="col-sm-3 col-form-label wt-page-options-label"> - <?= I18N::translate('Apply privacy settings') ?> - </div> - <div class="col-sm-9 wt-page-options-value"> - <input type="radio" name="privatize_export" value="user"> - <?= I18N::translate('Member') ?> - <br> - <input type="radio" name="privatize_export" value="visitor"> - <?= I18N::translate('Visitor') ?> - </div> - </div> - <?php endif ?> + <?php if ($is_manager) : ?> + <div class="row form-group"> + <div class="col-sm-3 col-form-label wt-page-options-label"> + <?= I18N::translate('Apply privacy settings') ?> + </div> + <div class="col-sm-9 wt-page-options-value"> + <input type="radio" name="privatize_export" value="none" checked> + <?= I18N::translate('None') ?> + <br> + <input type="radio" name="privatize_export" value="gedadmin"> + <?= I18N::translate('Manager') ?> + <br> + <input type="radio" name="privatize_export" value="user"> + <?= I18N::translate('Member') ?> + <br> + <input type="radio" name="privatize_export" value="visitor"> + <?= I18N::translate('Visitor') ?> + </div> + </div> + <?php elseif ($is_member) : ?> + <div class="row form-group"> + <div class="col-sm-3 col-form-label wt-page-options-label"> + <?= I18N::translate('Apply privacy settings') ?> + </div> + <div class="col-sm-9 wt-page-options-value"> + <input type="radio" name="privatize_export" value="user"> + <?= I18N::translate('Member') ?> + <br> + <input type="radio" name="privatize_export" value="visitor"> + <?= I18N::translate('Visitor') ?> + </div> + </div> + <?php endif ?> - <div class="row form-group"> - <label class="col-sm-3 col-form-label wt-page-options-label" for="convert"> - <?= I18N::translate('Convert from UTF-8 to ISO-8859-1') ?> - </label> - <div class="col-sm-9 wt-page-options-value"> - <input type="checkbox" name="convert" id="convert"> - </div> - </div> + <div class="row form-group"> + <label class="col-sm-3 col-form-label wt-page-options-label" for="convert"> + <?= I18N::translate('Convert from UTF-8 to ISO-8859-1') ?> + </label> + <div class="col-sm-9 wt-page-options-value"> + <input type="checkbox" name="convert" id="convert"> + </div> + </div> - <div class="row form-group"> - <div class="col-sm-3 col-form-label wt-page-options-label"> - </div> - <div class="col-sm-9 wt-page-options-value"> - <button type="submit" class="btn btn-primary"> - <?= FontAwesome::decorativeIcon('download') ?> - <?= I18N::translate('download') ?> - </button> - <a href="<?= e(route('module', ['module' => 'clippings', 'action' => 'Show', 'ged' => $tree->getName()])) ?>" class="btn btn-secondary"> - <?= FontAwesome::decorativeIcon('cancel') ?> - <?= I18N::translate('cancel') ?> - </a> - </div> - </div> + <div class="row form-group"> + <div class="col-sm-3 col-form-label wt-page-options-label"> + </div> + <div class="col-sm-9 wt-page-options-value"> + <button type="submit" class="btn btn-primary"> + <?= FontAwesome::decorativeIcon('download') ?> + <?= I18N::translate('download') ?> + </button> + <a href="<?= e(route('module', ['module' => 'clippings', 'action' => 'Show', 'ged' => $tree->getName()])) ?>" class="btn btn-secondary"> + <?= FontAwesome::decorativeIcon('cancel') ?> + <?= I18N::translate('cancel') ?> + </a> + </div> + </div> </form> diff --git a/resources/views/modules/clippings/show.php b/resources/views/modules/clippings/show.php index f46214834a..c33a0d4f50 100644 --- a/resources/views/modules/clippings/show.php +++ b/resources/views/modules/clippings/show.php @@ -3,55 +3,55 @@ <h2 class="wt-page-title"><?= $title ?></h2> <p> - <?= I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.') ?> + <?= I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.') ?> </p> -<?php if (empty($records)): ?> +<?php if (empty($records)) : ?> <p> - <?= I18N::translate('Your clippings cart is empty.') ?> + <?= I18N::translate('Your clippings cart is empty.') ?> </p> -<?php else: ?> - <table class="table wt-facts-table"> - <thead> - <tr> - <th><?= I18N::translate('Record') ?></th> - <th><?= I18N::translate('Remove') ?></th> - </tr> - </thead> - <tbody> - <?php foreach ($records as $record): ?> - <tr> - <td> - <?php if ($record::RECORD_TYPE === 'INDI'): ?> - <i class="icon-indis"></i> - <?php elseif ($record::RECORD_TYPE === 'FAM'): ?> - <i class="icon-sfamily"></i> - <?php elseif ($record::RECORD_TYPE === 'SOUR'): ?> - <i class="icon-source"></i> - <?php elseif ($record::RECORD_TYPE === 'REPO'): ?> - <i class="icon-repository"></i> - <?php elseif ($record::RECORD_TYPE === 'NOTE'): ?> - <i class="icon-note"></i> - <?php elseif ($record::RECORD_TYPE === 'OBJE'): ?> - <i class="icon-media"></i> - <?php else: ?> - <i class="icon-clippings"></i> - <?php endif ?> +<?php else : ?> + <table class="table wt-facts-table"> + <thead> + <tr> + <th><?= I18N::translate('Record') ?></th> + <th><?= I18N::translate('Remove') ?></th> + </tr> + </thead> + <tbody> + <?php foreach ($records as $record) : ?> + <tr> + <td> + <?php if ($record::RECORD_TYPE === 'INDI') : ?> + <i class="icon-indis"></i> + <?php elseif ($record::RECORD_TYPE === 'FAM') : ?> + <i class="icon-sfamily"></i> + <?php elseif ($record::RECORD_TYPE === 'SOUR') : ?> + <i class="icon-source"></i> + <?php elseif ($record::RECORD_TYPE === 'REPO') : ?> + <i class="icon-repository"></i> + <?php elseif ($record::RECORD_TYPE === 'NOTE') : ?> + <i class="icon-note"></i> + <?php elseif ($record::RECORD_TYPE === 'OBJE') : ?> + <i class="icon-media"></i> + <?php else : ?> + <i class="icon-clippings"></i> + <?php endif ?> - <a href="<?= e($record->url()) ?>"> - <?= $record->getFullName() ?> - </a> - </td> - <td> - <form method="post" action="<?= e(route('module', ['module' => 'clippings', 'action' => 'Remove', 'ged' => $tree->getName(), 'xref' => $record->getXref()])) ?>"> - <?= csrf_field() ?> - <button type="submit" class="btn btn-link" title="<?= I18N::translate('Remove') ?>"> - <i class="icon-remove"></i> - </button> - </form> - </td> - </tr> - <?php endforeach ?> - </tbody> - </table> + <a href="<?= e($record->url()) ?>"> + <?= $record->getFullName() ?> + </a> + </td> + <td> + <form method="post" action="<?= e(route('module', ['module' => 'clippings', 'action' => 'Remove', 'ged' => $tree->getName(), 'xref' => $record->getXref()])) ?>"> + <?= csrf_field() ?> + <button type="submit" class="btn btn-link" title="<?= I18N::translate('Remove') ?>"> + <i class="icon-remove"></i> + </button> + </form> + </td> + </tr> + <?php endforeach ?> + </tbody> + </table> <?php endif ?> diff --git a/resources/views/modules/descendancy/sidebar.php b/resources/views/modules/descendancy/sidebar.php index 150474d210..5d8763b807 100644 --- a/resources/views/modules/descendancy/sidebar.php +++ b/resources/views/modules/descendancy/sidebar.php @@ -2,13 +2,13 @@ <?php use Fisharebest\Webtrees\View; ?> <form method="post" action="<?= e(route('module', ['module' => 'descendancy', 'action' => 'Descendants', 'ged' => $tree->getName()])) ?>" onsubmit="return false;"> - <input type="search" name="sb_desc_name" id="sb_desc_name" placeholder="<?= I18N::translate('Search') ?>"> + <input type="search" name="sb_desc_name" id="sb_desc_name" placeholder="<?= I18N::translate('Search') ?>"> </form> <div id="sb_desc_content"> - <ul> - <?= $individual_list ?> - </ul> + <ul> + <?= $individual_list ?> + </ul> </div> <?php View::push('javascript') ?> diff --git a/resources/views/modules/edit-block-config.php b/resources/views/modules/edit-block-config.php index 4aac68e87f..ae1cf54e1a 100644 --- a/resources/views/modules/edit-block-config.php +++ b/resources/views/modules/edit-block-config.php @@ -2,29 +2,29 @@ <?php use Fisharebest\Webtrees\I18N; ?> <h2 class="wt-page-title"> - <?= $title ?> + <?= $title ?> </h2> <p> - <?= $block->getDescription() ?> + <?= $block->getDescription() ?> </p> <form method="post"> - <input type="hidden" name="save" value="1"> - <?= csrf_field() ?> + <input type="hidden" name="save" value="1"> + <?= csrf_field() ?> - <?= $block->editBlockConfiguration($tree, $block_id) ?> + <?= $block->editBlockConfiguration($tree, $block_id) ?> - <div class="row form-group"> - <div class="offset-sm-3 col-sm-9"> - <button type="submit" class="btn btn-primary"> - <?= FontAwesome::decorativeIcon('save') ?> - <?= I18N::translate('save') ?> - </button> - <a class="btn btn-secondary" href="<?= e($cancel_url) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> - <?= I18N::translate('cancel') ?> - </a> - </div> - </div> + <div class="row form-group"> + <div class="offset-sm-3 col-sm-9"> + <button type="submit" class="btn btn-primary"> + <?= FontAwesome::decorativeIcon('save') ?> + <?= I18N::translate('save') ?> + </button> + <a class="btn btn-secondary" href="<?= e($cancel_url) ?>"> + <?= FontAwesome::decorativeIcon('cancel') ?> + <?= I18N::translate('cancel') ?> + </a> + </div> + </div> </form> diff --git a/resources/views/modules/family_nav/sidebar-family.php b/resources/views/modules/family_nav/sidebar-family.php index f5c60effb2..0eb3a8e188 100644 --- a/resources/views/modules/family_nav/sidebar-family.php +++ b/resources/views/modules/family_nav/sidebar-family.php @@ -2,114 +2,114 @@ <?php use Fisharebest\Webtrees\I18N; ?> <table class="table table-sm wt-facts-table wt-family-navigator-family"> - <caption class="text-center wt-family-navigator-family-heading"> - <a href="<?= e($family->url()) ?>"> - <?= $title ?> - </a> - </caption> - <tbody> - <?php foreach ($family->getSpouses() as $spouse): ?> - <tr class="text-center wt-family-navigator-parent wt-gender-<?= $spouse->getSex() ?>"> - <th class="text-nowrap align-middle wt-family-navigator-label" scope="row"> - <?php if ($spouse === $individual): ?> - <?= Functions::getCloseRelationshipName($individual, $spouse) ?> - <i class="icon-selected"></i> - <?php elseif ($spouse->getPrimaryChildFamily() !== null): ?> - <div class="dropdown"> - <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($spouse->getXref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= Functions::getCloseRelationshipName($individual, $spouse) ?> - </a> + <caption class="text-center wt-family-navigator-family-heading"> + <a href="<?= e($family->url()) ?>"> + <?= $title ?> + </a> + </caption> + <tbody> + <?php foreach ($family->getSpouses() as $spouse) : ?> + <tr class="text-center wt-family-navigator-parent wt-gender-<?= $spouse->getSex() ?>"> + <th class="text-nowrap align-middle wt-family-navigator-label" scope="row"> + <?php if ($spouse === $individual) : ?> + <?= Functions::getCloseRelationshipName($individual, $spouse) ?> + <i class="icon-selected"></i> + <?php elseif ($spouse->getPrimaryChildFamily() !== null) : ?> + <div class="dropdown"> + <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($spouse->getXref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <?= Functions::getCloseRelationshipName($individual, $spouse) ?> + </a> - <div class="dropdown-menu wt-family-navigator-dropdown"> - <div class="dropdown-header wt-family-navigator-dropdown-heading"> - <?= I18N::translate('Parents') ?> - </div> - <?php foreach ($spouse->getPrimaryChildFamily()->getSpouses() as $parent): ?> - <a class="dropdown-item" href="<?= e($parent->url()) ?>"> - <?= $parent->getFullName() ?> - </a> - <?php endforeach ?> - </div> - </div> - <?php else: ?> - <?= Functions::getCloseRelationshipName($individual, $spouse) ?> - <?php endif ?> - </th> + <div class="dropdown-menu wt-family-navigator-dropdown"> + <div class="dropdown-header wt-family-navigator-dropdown-heading"> + <?= I18N::translate('Parents') ?> + </div> + <?php foreach ($spouse->getPrimaryChildFamily()->getSpouses() as $parent) : ?> + <a class="dropdown-item" href="<?= e($parent->url()) ?>"> + <?= $parent->getFullName() ?> + </a> + <?php endforeach ?> + </div> + </div> + <?php else : ?> + <?= Functions::getCloseRelationshipName($individual, $spouse) ?> + <?php endif ?> + </th> - <td class="wt-family-navigator-name"> - <?php if ($spouse->canShow()): ?> - <a href="<?= e($spouse->url()) ?>"> - <?= $spouse->getFullName() ?> - </a> - <div class="small"> - <?= $spouse->getLifeSpan() ?> - </div> - <?php else: ?> - <?= $spouse->getFullName() ?> - <?php endif ?> - </td> - </tr> - <?php endforeach ?> + <td class="wt-family-navigator-name"> + <?php if ($spouse->canShow()) : ?> + <a href="<?= e($spouse->url()) ?>"> + <?= $spouse->getFullName() ?> + </a> + <div class="small"> + <?= $spouse->getLifeSpan() ?> + </div> + <?php else : ?> + <?= $spouse->getFullName() ?> + <?php endif ?> + </td> + </tr> + <?php endforeach ?> - <?php foreach ($family->getChildren() as $child): ?> - <tr class="text-center wt-family-navigator-child wt-gender-<?= $child->getSex() ?>"> - <th class="text-nowrap align-middle" scope="row"> - <?php if ($child === $individual): ?> - <?= Functions::getCloseRelationshipName($individual, $child) ?> - <i class="icon-selected"></i> - <?php elseif ($child->getSpouseFamilies() !== []): ?> - <div class="dropdown"> - <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($child->getXref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= Functions::getCloseRelationshipName($individual, $child) ?> - </a> + <?php foreach ($family->getChildren() as $child) : ?> + <tr class="text-center wt-family-navigator-child wt-gender-<?= $child->getSex() ?>"> + <th class="text-nowrap align-middle" scope="row"> + <?php if ($child === $individual) : ?> + <?= Functions::getCloseRelationshipName($individual, $child) ?> + <i class="icon-selected"></i> + <?php elseif ($child->getSpouseFamilies() !== []) : ?> + <div class="dropdown"> + <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($child->getXref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <?= Functions::getCloseRelationshipName($individual, $child) ?> + </a> - <div class="dropdown-menu"> - <?php foreach ($child->getSpouseFamilies() as $n => $in_laws): ?> - <?php if ($n > 0) : ?> - <div class="dropdown-divider"></div> - <?php endif ?> - <div class="dropdown-header wt-family-navigator-dropdown-heading"> - <?= I18N::translate('Family') ?> - </div> + <div class="dropdown-menu"> + <?php foreach ($child->getSpouseFamilies() as $n => $in_laws) : ?> + <?php if ($n > 0) : ?> + <div class="dropdown-divider"></div> + <?php endif ?> + <div class="dropdown-header wt-family-navigator-dropdown-heading"> + <?= I18N::translate('Family') ?> + </div> - <?php foreach ($in_laws->getSpouses() as $sibling_in_law): ?> - <?php if ($sibling_in_law !== $child): ?> - <a class="dropdown-item" href="<?= e($sibling_in_law->url()) ?>"> - <?= $sibling_in_law->getFullName() ?> - </a> - <?php endif ?> - <?php endforeach ?> + <?php foreach ($in_laws->getSpouses() as $sibling_in_law) : ?> + <?php if ($sibling_in_law !== $child) : ?> + <a class="dropdown-item" href="<?= e($sibling_in_law->url()) ?>"> + <?= $sibling_in_law->getFullName() ?> + </a> + <?php endif ?> + <?php endforeach ?> - <ul> - <?php foreach ($in_laws->getChildren() as $child_in_law): ?> - <li> - <a class="dropdown-item" href="<?= e($child_in_law->url()) ?>"> - <?= $child_in_law->getFullName() ?> - </a> - </li> - <?php endforeach ?> - </ul> - <?php endforeach ?> - </div> - </div> - <?php else: ?> - <?= Functions::getCloseRelationshipName($individual, $child) ?> - <?php endif ?> - </th> + <ul> + <?php foreach ($in_laws->getChildren() as $child_in_law) : ?> + <li> + <a class="dropdown-item" href="<?= e($child_in_law->url()) ?>"> + <?= $child_in_law->getFullName() ?> + </a> + </li> + <?php endforeach ?> + </ul> + <?php endforeach ?> + </div> + </div> + <?php else : ?> + <?= Functions::getCloseRelationshipName($individual, $child) ?> + <?php endif ?> + </th> - <td> - <?php if ($child->canShow()): ?> - <a href="<?= e($child->url()) ?>"> - <?= $child->getFullName() ?> - </a> - <div class="small"> - <?= $child->getLifeSpan() ?> - </div> - <?php else: ?> - <?= $child->getFullName() ?> - <?php endif ?> - </td> - </tr> - <?php endforeach ?> - </tbody> + <td> + <?php if ($child->canShow()) : ?> + <a href="<?= e($child->url()) ?>"> + <?= $child->getFullName() ?> + </a> + <div class="small"> + <?= $child->getLifeSpan() ?> + </div> + <?php else : ?> + <?= $child->getFullName() ?> + <?php endif ?> + </td> + </tr> + <?php endforeach ?> + </tbody> </table> diff --git a/resources/views/modules/family_nav/sidebar.php b/resources/views/modules/family_nav/sidebar.php index 7e4db8edd3..40032542c1 100644 --- a/resources/views/modules/family_nav/sidebar.php +++ b/resources/views/modules/family_nav/sidebar.php @@ -1,21 +1,21 @@ <div class="wt-sidebar-content wt-sidebar-family-navigator"> - <!-- parent families --> - <?php foreach ($individual->getChildFamilies() as $family): ?> - <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->getChildFamilyLabel($family)]) ?> - <?php endforeach ?> + <!-- parent families --> + <?php foreach ($individual->getChildFamilies() as $family) : ?> + <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->getChildFamilyLabel($family)]) ?> + <?php endforeach ?> - <!-- step parents --> - <?php foreach ($individual->getChildStepFamilies() as $family): ?> - <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->getStepFamilyLabel($family)]) ?> - <?php endforeach ?> + <!-- step parents --> + <?php foreach ($individual->getChildStepFamilies() as $family) : ?> + <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->getStepFamilyLabel($family)]) ?> + <?php endforeach ?> - <!-- spouse and children --> - <?php foreach ($individual->getSpouseFamilies() as $family): ?> - <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->getSpouseFamilyLabel($family)]) ?> - <?php endforeach ?> + <!-- spouse and children --> + <?php foreach ($individual->getSpouseFamilies() as $family) : ?> + <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->getSpouseFamilyLabel($family)]) ?> + <?php endforeach ?> - <!-- step children --> - <?php foreach ($individual->getSpouseStepFamilies() as $family): ?> - <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $family->getFullName()]) ?> - <?php endforeach ?> + <!-- step children --> + <?php foreach ($individual->getSpouseStepFamilies() as $family) : ?> + <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $family->getFullName()]) ?> + <?php endforeach ?> </div> diff --git a/resources/views/modules/faq/config.php b/resources/views/modules/faq/config.php index 1ff5211e61..6c20ef39ee 100644 --- a/resources/views/modules/faq/config.php +++ b/resources/views/modules/faq/config.php @@ -6,98 +6,98 @@ <h1><?= $title ?></h1> <p> - <?= /* I18N: FAQ = “Frequently Asked Question” */ - I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.') ?> - <?= I18N::translate('You may use HTML to format the answer and to add links to other websites.') ?> + <?= /* I18N: FAQ = “Frequently Asked Question” */ + I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.') ?> + <?= I18N::translate('You may use HTML to format the answer and to add links to other websites.') ?> </p> <p> <form class="form form-inline"> - <input type="hidden" name="route" value="module"> - <input type="hidden" name="module" value="faq"> - <input type="hidden" name="action" value="Admin"> - <label for="ged" class="sr-only"> - <?= I18N::translate('Family tree') ?> - </label> - <?= Bootstrap4::select($tree_names, $tree->getName(), ['id' => 'ged', 'name' => 'ged']) ?> - <input type="submit" class="btn btn-primary" value="<?= I18N::translate('show') ?>"> + <input type="hidden" name="route" value="module"> + <input type="hidden" name="module" value="faq"> + <input type="hidden" name="action" value="Admin"> + <label for="ged" class="sr-only"> + <?= I18N::translate('Family tree') ?> + </label> + <?= Bootstrap4::select($tree_names, $tree->getName(), ['id' => 'ged', 'name' => 'ged']) ?> + <input type="submit" class="btn btn-primary" value="<?= I18N::translate('show') ?>"> </form> </p> <p> - <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link"> + <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link"> <?= view('icons/add') ?> - <?= /* I18N: FAQ = “Frequently Asked Question” */ - I18N::translate('Add an FAQ') ?> - </a> + <?= /* I18N: FAQ = “Frequently Asked Question” */ + I18N::translate('Add an FAQ') ?> + </a> </p> <table class="table table-bordered"> - <thead> - <tr> - <th><?= I18N::translate('Sort order') ?></th> - <th><?= I18N::translate('Family tree') ?></th> - <th><?= I18N::translate('Question') ?></th> - <th><span class="sr-only"><?= I18N::translate('Move up') ?></span></th> - <th><span class="sr-only"><?= I18N::translate('Move down') ?></span></th> - <th><span class="sr-only"><?= I18N::translate('Edit') ?></span></th> - <th><span class="sr-only"><?= I18N::translate('Delete') ?></span></th> - </tr> - </thead> - <tbody> - <?php foreach ($faqs as $faq): ?> - <tr class="faq_edit_pos"> - <td> - <?= I18N::number($faq->block_order + 1) ?> - </td> - <td> - <?php if ($faq->gedcom_id === null): ?> - <?= I18N::translate('All') ?> - <?php else: ?> - <?= e($tree->getTitle()) ?> - <?php endif ?> - </td> - <td> - <?= e($faq->header) ?> - </td> - <td> - <?php if ($faq->block_order != $min_block_order): ?> - <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveUp', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> - <?= csrf_field() ?> - <button type="submit" class="btn btn-secondary"> + <thead> + <tr> + <th><?= I18N::translate('Sort order') ?></th> + <th><?= I18N::translate('Family tree') ?></th> + <th><?= I18N::translate('Question') ?></th> + <th><span class="sr-only"><?= I18N::translate('Move up') ?></span></th> + <th><span class="sr-only"><?= I18N::translate('Move down') ?></span></th> + <th><span class="sr-only"><?= I18N::translate('Edit') ?></span></th> + <th><span class="sr-only"><?= I18N::translate('Delete') ?></span></th> + </tr> + </thead> + <tbody> + <?php foreach ($faqs as $faq) : ?> + <tr class="faq_edit_pos"> + <td> + <?= I18N::number($faq->block_order + 1) ?> + </td> + <td> + <?php if ($faq->gedcom_id === null) : ?> + <?= I18N::translate('All') ?> + <?php else : ?> + <?= e($tree->getTitle()) ?> + <?php endif ?> + </td> + <td> + <?= e($faq->header) ?> + </td> + <td> + <?php if ($faq->block_order != $min_block_order) : ?> + <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveUp', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> + <?= csrf_field() ?> + <button type="submit" class="btn btn-secondary"> <?= view('icons/arrow-up') ?> - <?= I18N::translate('Move up') ?> - </button> - </form> - <?php endif ?> - </td> - <td> - <?php if ($faq->block_order != $max_block_order): ?> - <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveDown', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> - <?= csrf_field() ?> - <button type="submit" class="btn btn-secondary"> + <?= I18N::translate('Move up') ?> + </button> + </form> + <?php endif ?> + </td> + <td> + <?php if ($faq->block_order != $max_block_order) : ?> + <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveDown', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> + <?= csrf_field() ?> + <button type="submit" class="btn btn-secondary"> <?= view('icons/arrow-down') ?> - <?= I18N::translate('Move down') ?> - </button> - </form> - <?php endif ?> - </td> - <td> - <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" class="btn btn-primary"> + <?= I18N::translate('Move down') ?> + </button> + </form> + <?php endif ?> + </td> + <td> + <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" class="btn btn-primary"> <?= view('icons/edit') ?> - <?= I18N::translate('Edit') ?> - </a> - </td> - <td> - <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminDelete', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> - <?= csrf_field() ?> - <button type="submit" class="btn btn-danger" onclick="return confirm(this.dataset.confirm);" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($faq->header)) ?>"> + <?= I18N::translate('Edit') ?> + </a> + </td> + <td> + <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminDelete', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> + <?= csrf_field() ?> + <button type="submit" class="btn btn-danger" onclick="return confirm(this.dataset.confirm);" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($faq->header)) ?>"> <?= view('icons/delete') ?> - <?= I18N::translate('delete') ?> - </button> - </form> - </td> - </tr> - <?php endforeach ?> - </tbody> + <?= I18N::translate('delete') ?> + </button> + </form> + </td> + </tr> + <?php endforeach ?> + </tbody> </table> diff --git a/resources/views/modules/faq/edit.php b/resources/views/modules/faq/edit.php index 63cda98afd..206f1109aa 100644 --- a/resources/views/modules/faq/edit.php +++ b/resources/views/modules/faq/edit.php @@ -7,73 +7,73 @@ <h1><?= $title ?></h1> <form name="faq" class="form-horizontal" method="post"> - <?= csrf_field() ?> - <input type="hidden" name="block_id" value="<?= $block_id ?>"> + <?= csrf_field() ?> + <input type="hidden" name="block_id" value="<?= $block_id ?>"> - <div class="row form-group"> - <label for="header" class="col-sm-3 col-form-label"> - <?= I18N::translate('Question') ?> - </label> + <div class="row form-group"> + <label for="header" class="col-sm-3 col-form-label"> + <?= I18N::translate('Question') ?> + </label> - <div class="col-sm-9"> - <input type="text" class="form-control" name="header" id="header" - value="<?= e($header) ?>"> - </div> - </div> + <div class="col-sm-9"> + <input type="text" class="form-control" name="header" id="header" + value="<?= e($header) ?>"> + </div> + </div> - <div class="row form-group"> - <label for="faqbody" class="col-sm-3 col-form-label"> - <?= I18N::translate('Answer') ?> - </label> + <div class="row form-group"> + <label for="faqbody" class="col-sm-3 col-form-label"> + <?= I18N::translate('Answer') ?> + </label> - <div class="col-sm-9"> - <textarea name="faqbody" id="faqbody" class="form-control html-edit" rows="10"><?= e($faqbody) ?></textarea> - </div> - </div> + <div class="col-sm-9"> + <textarea name="faqbody" id="faqbody" class="form-control html-edit" rows="10"><?= e($faqbody) ?></textarea> + </div> + </div> - <div class="row form-group"> - <label for="xref" class="col-sm-3 col-form-label"> - <?= /* I18N: Label for a configuration option */ - I18N::translate('Show this block for which languages') ?> - </label> + <div class="row form-group"> + <label for="xref" class="col-sm-3 col-form-label"> + <?= /* I18N: Label for a configuration option */ + I18N::translate('Show this block for which languages') ?> + </label> - <div class="col-sm-9"> - <?= FunctionsEdit::editLanguageCheckboxes('languages', $languages) ?> - </div> - </div> + <div class="col-sm-9"> + <?= FunctionsEdit::editLanguageCheckboxes('languages', $languages) ?> + </div> + </div> - <div class="row form-group"> - <label for="block_order" class="col-sm-3 col-form-label"> - <?= I18N::translate('Sort order') ?> - </label> + <div class="row form-group"> + <label for="block_order" class="col-sm-3 col-form-label"> + <?= I18N::translate('Sort order') ?> + </label> - <div class="col-sm-9"> - <input type="text" name="block_order" id="block_order" class="form-control" value="<?= $block_order ?>"> - </div> - </div> + <div class="col-sm-9"> + <input type="text" name="block_order" id="block_order" class="form-control" value="<?= $block_order ?>"> + </div> + </div> - <div class="row form-group"> - <label for="gedcom_id" class="col-sm-3 col-form-label"> - <?= I18N::translate('Family tree') ?> - </label> + <div class="row form-group"> + <label for="gedcom_id" class="col-sm-3 col-form-label"> + <?= I18N::translate('Family tree') ?> + </label> - <div class="col-sm-9"> - <?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->getName(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?> - <p class="small text-muted"> - <?= /* I18N: FAQ = “Frequently Asked Question” */ - I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?> - </p> - </div> - </div> + <div class="col-sm-9"> + <?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->getName(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?> + <p class="small text-muted"> + <?= /* I18N: FAQ = “Frequently Asked Question” */ + I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?> + </p> + </div> + </div> - <div class="row form-group"> - <div class="offset-sm-3 col-sm-9"> - <button type="submit" class="btn btn-primary"> + <div class="row form-group"> + <div class="offset-sm-3 col-sm-9"> + <button type="submit" class="btn btn-primary"> <?= view('icons/save') ?> - <?= I18N::translate('save') ?> - </button> - </div> - </div> + <?= I18N::translate('save') ?> + </button> + </div> + </div> </form> <?= view('modules/ckeditor/ckeditor-js') ?> diff --git a/resources/views/modules/faq/list.php b/resources/views/modules/faq/list.php index c4a18b74b2..fd394ba5fd 100644 --- a/resources/views/modules/faq/list.php +++ b/resources/views/modules/faq/list.php @@ -4,26 +4,26 @@ <h2 class="wt-page-title"><?= $title ?></h2> <table id="story_table" class="w-100"> - <thead> - <tr> - <th><?= I18N::translate('Story title') ?></th> - <th><?= I18N::translate('Individual') ?></th> - </tr> - </thead> - <tbody> - <?php foreach ($stories as $story): ?> - <tr> - <td> - <?= e($story->title) ?> - </td> - <td> - <a href="<?= e($story->individual->url()) ?>#tab-stories"> - <?= $story->individual->getFullName() ?> - </a> - </td> - </tr> - <?php endforeach ?> - </tbody> + <thead> + <tr> + <th><?= I18N::translate('Story title') ?></th> + <th><?= I18N::translate('Individual') ?></th> + </tr> + </thead> + <tbody> + <?php foreach ($stories as $story) : ?> + <tr> + <td> + <?= e($story->title) ?> + </td> + <td> + <a href="<?= e($story->individual->url()) ?>#tab-stories"> + <?= $story->individual->getFullName() ?> + </a> + </td> + </tr> + <?php endforeach ?> + </tbody> </table> <?php View::push('javascript') ?> @@ -38,7 +38,7 @@ info: true, sorting: [[0,"asc"]], columns: [ - /* 0-name */ null, + /* 0-name */ null, /* 1-NAME */ null ], <?= I18N::datatablesI18N() ?> diff --git a/resources/views/modules/faq/show.php b/resources/views/modules/faq/show.php index 323432b01d..e1c15db4f8 100644 --- a/resources/views/modules/faq/show.php +++ b/resources/views/modules/faq/show.php @@ -3,24 +3,24 @@ <h2 class="wt-page-title"><?= $title ?></h2> <table class="faq"> - <?php foreach ($faqs as $id => $faq): ?> - <tr> - <td style="padding: 5px;"> - <a href="#faq<?= e($id) ?>"><?= e($faq->header) ?></a> - </td> - </tr> - <?php endforeach ?> + <?php foreach ($faqs as $id => $faq) : ?> + <tr> + <td style="padding: 5px;"> + <a href="#faq<?= e($id) ?>"><?= e($faq->header) ?></a> + </td> + </tr> + <?php endforeach ?> </table> -<?php foreach ($faqs as $id => $faq): ?> - <hr> - <div class="faq_title" id="faq<?= $id ?>"> - <?= e($faq->header) ?> - <div class="faq_top faq_italic"> - <a href="#content"><?= I18N::translate('back to top') ?></a> - </div> - </div> - <div class="faq_body"> - <?= substr($faq->body, 0, 1) == '<' ? e($faq->body) : nl2br(e($faq->body), false) ?> - </div> +<?php foreach ($faqs as $id => $faq) : ?> + <hr> + <div class="faq_title" id="faq<?= $id ?>"> + <?= e($faq->header) ?> + <div class="faq_top faq_italic"> + <a href="#content"><?= I18N::translate('back to top') ?></a> + </div> + </div> + <div class="faq_body"> + <?= substr($faq->body, 0, 1) == '<' ? e($faq->body) : nl2br(e($faq->body), false) ?> + </div> <?php endforeach ?> diff --git a/resources/views/modules/gedcom_block/welcome.php b/resources/views/modules/gedcom_block/welcome.php index 293867ec60..ef54eaf536 100644 --- a/resources/views/modules/gedcom_block/welcome.php +++ b/resources/views/modules/gedcom_block/welcome.php @@ -1,11 +1,11 @@ <div class="d-flex flex-wrap justify-content-around"> - <?php foreach ($links as $link): ?> - <div class="text-center m-1"> - <a href="<?= e($link['url']) ?>"> - <i class="<?= $link['icon'] ?>"></i> - <br> - <?= $link['title'] ?> - </a> - </div> - <?php endforeach ?> + <?php foreach ($links as $link) : ?> + <div class="text-center m-1"> + <a href="<?= e($link['url']) ?>"> + <i class="<?= $link['icon'] ?>"></i> + <br> + <?= $link['title'] ?> + </a> + </div> + <?php endforeach ?> </div> diff --git a/resources/views/modules/gedcom_favorites/favorites.php b/resources/views/modules/gedcom_favorites/favorites.php index e514764e4d..70349925f6 100644 --- a/resources/views/modules/gedcom_favorites/favorites.php +++ b/resources/views/modules/gedcom_favorites/favorites.php @@ -2,58 +2,58 @@ <?php use Fisharebest\Webtrees\Individual; ?> <?php use Fisharebest\Webtrees\Theme; ?> -<?php foreach ($favorites as $favorite): ?> - <div class="person_box action_header<?= $favorite->record instanceof Individual ? $favorite->record->getSex() : '' ?>"> - <?php if ($favorite->favorite_type === 'URL'): ?> - <a href="<?= e($favorite->url) ?>"><b><?= e($favorite->title) ?></b></a> - <?php elseif ($favorite->record instanceof Individual): ?> - <?= Theme::theme()->individualBoxLarge($favorite->record) ?> - <?php elseif ($favorite->record !== null) : ?> - <?= $favorite->record->formatList() ?> - <?php endif ?> +<?php foreach ($favorites as $favorite) : ?> + <div class="person_box action_header<?= $favorite->record instanceof Individual ? $favorite->record->getSex() : '' ?>"> + <?php if ($favorite->favorite_type === 'URL') : ?> + <a href="<?= e($favorite->url) ?>"><b><?= e($favorite->title) ?></b></a> + <?php elseif ($favorite->record instanceof Individual) : ?> + <?= Theme::theme()->individualBoxLarge($favorite->record) ?> + <?php elseif ($favorite->record !== null) : ?> + <?= $favorite->record->formatList() ?> + <?php endif ?> - <?= e((string) $favorite->note) ?> - </div> + <?= e((string) $favorite->note) ?> + </div> - <?php if ($is_manager): ?> - <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->getName(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> - <?= csrf_field() ?> - <button type="submit" class="btn btn-link btn-sm" data-confirm="<?= I18N::translate('Are you sure you want to remove this item from your list of favorites?') ?>" onclick="return confirm(this.dataset.confirm);"> - <?= I18N::translate('Remove') ?> - </button> - </form> - <?php endif ?> + <?php if ($is_manager) : ?> + <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->getName(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> + <?= csrf_field() ?> + <button type="submit" class="btn btn-link btn-sm" data-confirm="<?= I18N::translate('Are you sure you want to remove this item from your list of favorites?') ?>" onclick="return confirm(this.dataset.confirm);"> + <?= I18N::translate('Remove') ?> + </button> + </form> + <?php endif ?> <?php endforeach ?> -<?php if ($is_manager): ?> - <div class="add_fav_head"> - <a href="#" onclick="return expand_layer('add_fav<?= e($block_id) ?>');"> - <?= I18N::translate('Add a favorite') ?> - <i id="add_fav<?= e($block_id) ?>_img" class="icon-plus"></i> - </a> - </div> - <div id="add_fav<?= e($block_id) ?>" style="display: none;"> - <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'AddFavorite', 'ged' => $tree->getName()])) ?>" method="post"> - <?= csrf_field() ?> - <div class="add_fav_ref"> - <input type="radio" name="fav_category" value="record" checked onclick="$('#xref<?= e($block_id) ?>').removeAttr('disabled'); $('#url, #title').attr('disabled','disabled').val('');"> - <label for="xref<?= e($block_id) ?>"> - <?= I18N::translate('Record') ?> - </label> - <input class="pedigree_form" data-autocomplete-type="IFSRO" type="text" name="xref" id="xref<?= e($block_id) ?>" size="5"> - </div> - <div class="add_fav_url"> - <input type="radio" name="fav_category" value="url" onclick="$('#url, #title').removeAttr('disabled'); $('#xref<?= e($block_id) ?>').attr('disabled','disabled').val('');"> - <input type="text" name="url" id="url" size="20" value="" placeholder="<?= I18N::translate('URL') ?>" disabled> - <input type="text" name="title" id="title" size="20" value="" placeholder="<?= I18N::translate('Title') ?>" disabled> - <p> - <?= I18N::translate('Enter an optional note about this favorite') ?> - </p> - <textarea name="note" rows="6" cols="50"></textarea> - </div> - <button type="submit" class="btn btn-primary"> - <?= /* I18N: A button label. */ I18N::translate('add') ?> - </button> - </form> - </div> +<?php if ($is_manager) : ?> + <div class="add_fav_head"> + <a href="#" onclick="return expand_layer('add_fav<?= e($block_id) ?>');"> + <?= I18N::translate('Add a favorite') ?> + <i id="add_fav<?= e($block_id) ?>_img" class="icon-plus"></i> + </a> + </div> + <div id="add_fav<?= e($block_id) ?>" style="display: none;"> + <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'AddFavorite', 'ged' => $tree->getName()])) ?>" method="post"> + <?= csrf_field() ?> + <div class="add_fav_ref"> + <input type="radio" name="fav_category" value="record" checked onclick="$('#xref<?= e($block_id) ?>').removeAttr('disabled'); $('#url, #title').attr('disabled','disabled').val('');"> + <label for="xref<?= e($block_id) ?>"> + <?= I18N::translate('Record') ?> + </label> + <input class="pedigree_form" data-autocomplete-type="IFSRO" type="text" name="xref" id="xref<?= e($block_id) ?>" size="5"> + </div> + <div class="add_fav_url"> + <input type="radio" name="fav_category" value="url" onclick="$('#url, #title').removeAttr('disabled'); $('#xref<?= e($block_id) ?>').attr('disabled','disabled').val('');"> + <input type="text" name="url" id="url" size="20" value="" placeholder="<?= I18N::translate('URL') ?>" disabled> + <input type="text" name="title" id="title" size="20" value="" placeholder="<?= I18N::translate('Title') ?>" disabled> + <p> + <?= I18N::translate('Enter an optional note about this favorite') ?> + </p> + <textarea name="note" rows="6" cols="50"></textarea> + </div> + <button type="submit" class="btn btn-primary"> + <?= /* I18N: A button label. */ I18N::translate('add') ?> + </button> + </form> + </div> <?php endif ?> diff --git a/resources/views/modules/gedcom_news/edit.php b/resources/views/modules/gedcom_news/edit.php index d25be2948f..1da2e6525b 100644 --- a/resources/views/modules/gedcom_news/edit.php +++ b/resources/views/modules/gedcom_news/edit.php @@ -3,44 +3,44 @@ <h2><?= $title ?></h2> <form method="post"> - <?= csrf_field() ?> + <?= csrf_field() ?> - <table> - <tr> - <th> - <label for="subject"> - <?= I18N::translate('Title') ?> - </label> - </th> - <tr> - <tr> - <td> - <input type="text" id="subject" name="subject" size="50" dir="auto" autofocus value="<?= e($subject) ?>"> - </td> - </tr> - <tr> - <th> - <label for="body"> - <?= I18N::translate('Content') ?> - </label> - </th> - </tr> - <tr> - <td> - <textarea id="body" name="body" class="html-edit form-control" rows="10" dir="auto"><?= e($body) ?></textarea> - </td> - </tr> + <table> + <tr> + <th> + <label for="subject"> + <?= I18N::translate('Title') ?> + </label> + </th> + <tr> + <tr> + <td> + <input type="text" id="subject" name="subject" size="50" dir="auto" autofocus value="<?= e($subject) ?>"> + </td> + </tr> + <tr> + <th> + <label for="body"> + <?= I18N::translate('Content') ?> + </label> + </th> + </tr> + <tr> + <td> + <textarea id="body" name="body" class="html-edit form-control" rows="10" dir="auto"><?= e($body) ?></textarea> + </td> + </tr> - <tr> - <td> - <button class="btn btn-primary" type="submit"> - <?= I18N::translate('save') ?> - </button> + <tr> + <td> + <button class="btn btn-primary" type="submit"> + <?= I18N::translate('save') ?> + </button> - <a class="btn btn-secondary" href="<?= e(route('tree-page', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('cancel') ?> - </a> - </td> - </tr> - </table> + <a class="btn btn-secondary" href="<?= e(route('tree-page', ['ged' => $tree->getName()])) ?>"> + <?= I18N::translate('cancel') ?> + </a> + </td> + </tr> + </table> </form> diff --git a/resources/views/modules/gedcom_news/list.php b/resources/views/modules/gedcom_news/list.php index 422ecef150..979e917fb3 100644 --- a/resources/views/modules/gedcom_news/list.php +++ b/resources/views/modules/gedcom_news/list.php @@ -2,48 +2,48 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsDate; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?php if (empty($articles)): ?> - <?= I18N::translate('No news articles have been submitted.') ?> +<?php if (empty($articles)) : ?> + <?= I18N::translate('No news articles have been submitted.') ?> <?php endif ?> -<?php foreach ($articles as $n => $article): ?> - <?php if ($n === 5 && count($articles) > 5): ?> - <p> - <a class="btn btn-link" data-toggle="collapse" data-target="#more-news-<?= e($block_id) ?>" role="button" aria-expanded="false" aria-controls="more-news-<?= e($block_id) ?>"><?= I18N::translate('More news articles') ?> - </a> - </p> - <div class="collapse" id="more-news-<?= e($block_id) ?>"> - <?php endif ?> +<?php foreach ($articles as $n => $article) : ?> + <?php if ($n === 5 && count($articles) > 5) : ?> + <p> + <a class="btn btn-link" data-toggle="collapse" data-target="#more-news-<?= e($block_id) ?>" role="button" aria-expanded="false" aria-controls="more-news-<?= e($block_id) ?>"><?= I18N::translate('More news articles') ?> + </a> + </p> + <div class="collapse" id="more-news-<?= e($block_id) ?>"> + <?php endif ?> - <div class="news_box"> - <div class="news_title"><?= e($article->subject) ?></div> - <div class="news_date"><?= FunctionsDate::formatTimestamp($article->updated) ?></div> - <div style="white-space: pre-wrap"><?= e($article->body) ?></div> + <div class="news_box"> + <div class="news_title"><?= e($article->subject) ?></div> + <div class="news_date"><?= FunctionsDate::formatTimestamp($article->updated) ?></div> + <div style="white-space: pre-wrap"><?= e($article->body) ?></div> - <?php if (Auth::isManager($tree)): ?> - <hr> - <form action="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'DeleteNews', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>" method="post"> - <?= csrf_field() ?> - <a class="btn btn-link" href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Edit') ?> - </a> - | - <button class="btn btn-link" type="submit" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($article->subject)) ?>" onclick="return confirm(this.dataset.confirm);"> - <?= I18N::translate('Delete') ?> - </button> - </form> - <?php endif ?> - </div> + <?php if (Auth::isManager($tree)) : ?> + <hr> + <form action="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'DeleteNews', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>" method="post"> + <?= csrf_field() ?> + <a class="btn btn-link" href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>"> + <?= I18N::translate('Edit') ?> + </a> + | + <button class="btn btn-link" type="submit" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($article->subject)) ?>" onclick="return confirm(this.dataset.confirm);"> + <?= I18N::translate('Delete') ?> + </button> + </form> + <?php endif ?> + </div> <?php endforeach ?> -<?php if (count($articles) > 5): ?> - </div> +<?php if (count($articles) > 5) : ?> + </div> <?php endif ?> -<?php if (Auth::isManager($tree)): ?> - <p> - <a href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Add a news article') ?> - </a> - </p> +<?php if (Auth::isManager($tree)) : ?> + <p> + <a href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'ged' => $tree->getName()])) ?>"> + <?= I18N::translate('Add a news article') ?> + </a> + </p> <?php endif ?> diff --git a/resources/views/modules/gedcom_stats/config.php b/resources/views/modules/gedcom_stats/config.php index 4ebebcdb0f..b330f7bc7a 100644 --- a/resources/views/modules/gedcom_stats/config.php +++ b/resources/views/modules/gedcom_stats/config.php @@ -2,66 +2,69 @@ <?php use Fisharebest\Webtrees\I18N; ?> <fieldset class="form-group"> - <div class="row"> - <legend class="col-form-label col-sm-3"> - <?= I18N::translate('Last change') ?> - </legend> - <div class="col-sm-9"> - <?= Bootstrap4::checkbox(/* I18N: label for yes/no option */ - I18N::translate('Show date of last update'), false, ['name' => 'show_last_update', 'checked' => (bool) $show_last_update]) ?> - </div> - </div> + <div class="row"> + <legend class="col-form-label col-sm-3"> + <?= I18N::translate('Last change') ?> + </legend> + <div class="col-sm-9"> + <?= Bootstrap4::checkbox(/* I18N: label for yes/no option */ + I18N::translate('Show date of last update'), + false, + ['name' => 'show_last_update', 'checked' => (bool) $show_last_update] + ) ?> + </div> + </div> </fieldset> <fieldset class="form-group"> - <div class="row"> - <legend class="col-form-label col-sm-3"> - <?= I18N::translate('Statistics') ?> - </legend> - <div class="col-sm-9"> - <?= Bootstrap4::checkbox(I18N::translate('Individuals'), false, ['name' => 'stat_indi', 'checked' => (bool) $stat_indi]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Total surnames'), false, ['name' => 'stat_surname', 'checked' => (bool) $stat_surname]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Families'), false, ['name' => 'stat_fam', 'checked' => (bool) $stat_fam]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Sources'), false, ['name' => 'stat_sour', 'checked' => (bool) $stat_sour]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Media objects'), false, ['name' => 'stat_media', 'checked' => (bool) $stat_media]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Repositories'), false, ['name' => 'stat_repo', 'checked' => (bool) $stat_repo]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Total events'), false, ['name' => 'stat_events', 'checked' => (bool) $stat_events]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Total users'), false, ['name' => 'stat_users', 'checked' => (bool) $stat_users]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Earliest birth'), false, ['name' => 'stat_first_birth', 'checked' => (bool) $stat_first_birth]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Latest birth'), false, ['name' => 'stat_last_birth', 'checked' => (bool) $stat_last_birth]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Earliest death'), false, ['name' => 'stat_first_death', 'checked' => (bool) $stat_first_death]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Latest death'), false, ['name' => 'stat_last_death', 'checked' => (bool) $stat_last_death]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Individual who lived the longest'), false, ['name' => 'stat_long_life', 'checked' => (bool) $stat_long_life]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Average age at death'), false, ['name' => 'stat_avg_life', 'checked' => (bool) $stat_avg_life]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Family with the most children'), false, ['name' => 'stat_most_chil', 'checked' => (bool) $stat_most_chil]) ?> - <?= Bootstrap4::checkbox(I18N::translate('Average number of children per family'), false, ['name' => 'stat_avg_chil', 'checked' => (bool) $stat_avg_chil]) ?> - </div> - </div> + <div class="row"> + <legend class="col-form-label col-sm-3"> + <?= I18N::translate('Statistics') ?> + </legend> + <div class="col-sm-9"> + <?= Bootstrap4::checkbox(I18N::translate('Individuals'), false, ['name' => 'stat_indi', 'checked' => (bool) $stat_indi]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Total surnames'), false, ['name' => 'stat_surname', 'checked' => (bool) $stat_surname]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Families'), false, ['name' => 'stat_fam', 'checked' => (bool) $stat_fam]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Sources'), false, ['name' => 'stat_sour', 'checked' => (bool) $stat_sour]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Media objects'), false, ['name' => 'stat_media', 'checked' => (bool) $stat_media]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Repositories'), false, ['name' => 'stat_repo', 'checked' => (bool) $stat_repo]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Total events'), false, ['name' => 'stat_events', 'checked' => (bool) $stat_events]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Total users'), false, ['name' => 'stat_users', 'checked' => (bool) $stat_users]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Earliest birth'), false, ['name' => 'stat_first_birth', 'checked' => (bool) $stat_first_birth]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Latest birth'), false, ['name' => 'stat_last_birth', 'checked' => (bool) $stat_last_birth]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Earliest death'), false, ['name' => 'stat_first_death', 'checked' => (bool) $stat_first_death]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Latest death'), false, ['name' => 'stat_last_death', 'checked' => (bool) $stat_last_death]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Individual who lived the longest'), false, ['name' => 'stat_long_life', 'checked' => (bool) $stat_long_life]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Average age at death'), false, ['name' => 'stat_avg_life', 'checked' => (bool) $stat_avg_life]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Family with the most children'), false, ['name' => 'stat_most_chil', 'checked' => (bool) $stat_most_chil]) ?> + <?= Bootstrap4::checkbox(I18N::translate('Average number of children per family'), false, ['name' => 'stat_avg_chil', 'checked' => (bool) $stat_avg_chil]) ?> + </div> + </div> </fieldset> <fieldset class="form-group"> - <div class="row"> - <legend class="col-form-label col-sm-3"> - <label for="show_common_surnames"> - <?= I18N::translate('Surnames') ?> - </label> - </legend> - <div class="col-sm-9"> - <?= Bootstrap4::checkbox(I18N::translate('Most common surnames'), false, ['name' => 'show_common_surnames', 'checked' => (bool) $show_common_surnames]) ?> - <label for="number_of_surnames"> - <?= /* I18N: ... to show in a list */ - I18N::translate('Number of surnames') ?> - <input - class="form-control" - id="number_of_surnames" - maxlength="5" - name="number_of_surnames" - pattern="[1-9][0-9]*" - required - type="text" - value="<?= e($number_of_surnames) ?>" - > - </label> - </div> - </div> + <div class="row"> + <legend class="col-form-label col-sm-3"> + <label for="show_common_surnames"> + <?= I18N::translate('Surnames') ?> + </label> + </legend> + <div class="col-sm-9"> + <?= Bootstrap4::checkbox(I18N::translate('Most common surnames'), false, ['name' => 'show_common_surnames', 'checked' => (bool) $show_common_surnames]) ?> + <label for="number_of_surnames"> + <?= /* I18N: ... to show in a list */ + I18N::translate('Number of surnames') ?> + <input + class="form-control" + id="number_of_surnames" + maxlength="5" + name="number_of_surnames" + pattern="[1-9][0-9]*" + required + type="text" + value="<?= e($number_of_surnames) ?>" + > + </label> + </div> + </div> </fieldset> diff --git a/resources/views/modules/gedcom_stats/statistics.php b/resources/views/modules/gedcom_stats/statistics.php index 91948dd753..927b1a4fd0 100644 --- a/resources/views/modules/gedcom_stats/statistics.php +++ b/resources/views/modules/gedcom_stats/statistics.php @@ -1,247 +1,247 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<?php if ($show_last_update): ?> - <p class="card-text"> - <?= I18N::translate('This family tree was last updated on %s.', strip_tags($stats->gedcomUpdated())) ?> - </p> +<?php if ($show_last_update) : ?> + <p class="card-text"> + <?= I18N::translate('This family tree was last updated on %s.', strip_tags($stats->gedcomUpdated())) ?> + </p> <?php endif ?> <div class="row"> - <div class="col-sm-4"> - <table class="table wt-facts-table"> - <caption class="sr-only"> - <?= I18N::translate('Statistics') ?> - </caption> - <tbody> - <?php if ($stat_indi): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Individuals') ?> - </th> - <td> - <?= $stats->totalIndividuals() ?> - </td> - </tr> + <div class="col-sm-4"> + <table class="table wt-facts-table"> + <caption class="sr-only"> + <?= I18N::translate('Statistics') ?> + </caption> + <tbody> + <?php if ($stat_indi) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Individuals') ?> + </th> + <td> + <?= $stats->totalIndividuals() ?> + </td> + </tr> - <tr> - <th scope="row"> - <?= I18N::translate('Males') ?> - </th> - <td> - <?= $stats->totalSexMales() ?> - <br> - <?= $stats->totalSexMalesPercentage() ?> - </td> - </tr> + <tr> + <th scope="row"> + <?= I18N::translate('Males') ?> + </th> + <td> + <?= $stats->totalSexMales() ?> + <br> + <?= $stats->totalSexMalesPercentage() ?> + </td> + </tr> - <tr> - <th scope="row"> - <?= I18N::translate('Females') ?> - </th> - <td> - <?= $stats->totalSexFemales() ?> - <br> - <?= $stats->totalSexFemalesPercentage() ?> - </td> - </tr> - <?php endif ?> + <tr> + <th scope="row"> + <?= I18N::translate('Females') ?> + </th> + <td> + <?= $stats->totalSexFemales() ?> + <br> + <?= $stats->totalSexFemalesPercentage() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_surname): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Surnames') ?> - </th> - <td> - <?= $stats->totalSurnames() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_surname) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Surnames') ?> + </th> + <td> + <?= $stats->totalSurnames() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_fam): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Families') ?> - </th> - <td> - <?= $stats->totalFamilies() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_fam) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Families') ?> + </th> + <td> + <?= $stats->totalFamilies() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_sour): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Sources') ?> - </th> - <td> - <?= $stats->totalSources() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_sour) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Sources') ?> + </th> + <td> + <?= $stats->totalSources() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_media): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Media objects') ?> - </th> - <td> - <?= $stats->totalMedia() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_media) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Media objects') ?> + </th> + <td> + <?= $stats->totalMedia() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_repo): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Repositories') ?> - </th> - <td> - <?= $stats->totalRepositories() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_repo) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Repositories') ?> + </th> + <td> + <?= $stats->totalRepositories() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_events): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Events') ?> - </th> - <td> - <?= $stats->totalEvents() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_events) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Events') ?> + </th> + <td> + <?= $stats->totalEvents() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_users): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Users') ?> - </th> - <td> - <?= $stats->totalUsers() ?> - </td> - </tr> - <?php endif ?> - </tbody> - </table> - </div> + <?php if ($stat_users) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Users') ?> + </th> + <td> + <?= $stats->totalUsers() ?> + </td> + </tr> + <?php endif ?> + </tbody> + </table> + </div> - <div class="col-sm-8"> - <table class="table wt-facts-table"> - <caption class="sr-only"> - <?= I18N::translate('Statistics') ?> - </caption> + <div class="col-sm-8"> + <table class="table wt-facts-table"> + <caption class="sr-only"> + <?= I18N::translate('Statistics') ?> + </caption> - <tbody> - <?php if ($stat_first_birth): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Earliest birth') ?> - </th> - <td> - <?= $stats->firstBirth() ?> - </td> - </tr> - <?php endif ?> + <tbody> + <?php if ($stat_first_birth) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Earliest birth') ?> + </th> + <td> + <?= $stats->firstBirth() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_last_birth): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Latest birth') ?> - </th> - <td> - <?= $stats->lastBirth() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_last_birth) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Latest birth') ?> + </th> + <td> + <?= $stats->lastBirth() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_first_death): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Earliest death') ?> - </th> - <td> - <?= $stats->firstDeath() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_first_death) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Earliest death') ?> + </th> + <td> + <?= $stats->firstDeath() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_last_death): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Latest death') ?> - </th> - <td> - <?= $stats->lastDeath() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_last_death) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Latest death') ?> + </th> + <td> + <?= $stats->lastDeath() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_long_life): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Individual who lived the longest') ?> - </th> - <td> - <?= $stats->longestLife() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_long_life) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Individual who lived the longest') ?> + </th> + <td> + <?= $stats->longestLife() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_avg_life): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Average age at death') ?> - </th> - <td> - <?= $stats->averageLifespan() ?> - <br> - <?= I18N::translate('Males') ?>: <?= $stats->averageLifespanMale() ?> - <br> - <?= I18N::translate('Females') ?> <?= $stats->averageLifespanFemale() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_avg_life) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Average age at death') ?> + </th> + <td> + <?= $stats->averageLifespan() ?> + <br> + <?= I18N::translate('Males') ?>: <?= $stats->averageLifespanMale() ?> + <br> + <?= I18N::translate('Females') ?> <?= $stats->averageLifespanFemale() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_most_chil): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Family with the most children') ?> - </th> - <td> - <?= e($stats->largestFamilySize()) ?> - <br> - <?= $stats->largestFamily() ?> - </td> - </tr> - <?php endif ?> + <?php if ($stat_most_chil) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Family with the most children') ?> + </th> + <td> + <?= e($stats->largestFamilySize()) ?> + <br> + <?= $stats->largestFamily() ?> + </td> + </tr> + <?php endif ?> - <?php if ($stat_avg_chil): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Average number of children per family') ?> - </th> - <td> - <?= $stats->averageChildren() ?> - </td> - </tr> - <?php endif ?> - </tbody> - </table> - </div> + <?php if ($stat_avg_chil) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Average number of children per family') ?> + </th> + <td> + <?= $stats->averageChildren() ?> + </td> + </tr> + <?php endif ?> + </tbody> + </table> + </div> </div> -<?php if (!empty($surnames)): ?> - <div class="clearfloat"> - <p> - <strong> - <?= I18N::translate('Most common surnames') ?> - </strong> - <br> - <span class="common_surnames"> - <?= $surnames ?> - </span> - </p> - </div> +<?php if (!empty($surnames)) : ?> + <div class="clearfloat"> + <p> + <strong> + <?= I18N::translate('Most common surnames') ?> + </strong> + <br> + <span class="common_surnames"> + <?= $surnames ?> + </span> + </p> + </div> <?php endif ?> diff --git a/resources/views/modules/html/config.php b/resources/views/modules/html/config.php index 693193805f..ca7166b263 100644 --- a/resources/views/modules/html/config.php +++ b/resources/views/modules/html/config.php @@ -3,58 +3,58 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="row form-group"> - <label class="col-sm-3 col-form-label" for="title"> - <?= I18N::translate('Title') ?> - </label> - <div class="col-sm-9"> - <input class="form-control" type="text" id="title" name="title" value="<?= e($title) ?>"> - </div> + <label class="col-sm-3 col-form-label" for="title"> + <?= I18N::translate('Title') ?> + </label> + <div class="col-sm-9"> + <input class="form-control" type="text" id="title" name="title" value="<?= e($title) ?>"> + </div> </div> <div class="row form-group"> - <label class="col-sm-3 col-form-label" for="template"> - <?= I18N::translate('Templates') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select([$html => I18N::translate('Custom')] + array_flip($templates), '', ['onchange' => 'this.form.html.value=this.options[this.selectedIndex].value; CKEDITOR.instances.html.setData(document.getElementById("html").value);', 'id' => 'template']) ?> - <p class="small text-muted"> - <?= I18N::translate('To assist you in getting started with this block, we have created several standard templates. When you select one of these templates, the text area will contain a copy that you can then alter to suit your site’s requirements.') ?> - </p> - </div> + <label class="col-sm-3 col-form-label" for="template"> + <?= I18N::translate('Templates') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select([$html => I18N::translate('Custom')] + array_flip($templates), '', ['onchange' => 'this.form.html.value=this.options[this.selectedIndex].value; CKEDITOR.instances.html.setData(document.getElementById("html").value);', 'id' => 'template']) ?> + <p class="small text-muted"> + <?= I18N::translate('To assist you in getting started with this block, we have created several standard templates. When you select one of these templates, the text area will contain a copy that you can then alter to suit your site’s requirements.') ?> + </p> + </div> </div> <div class="row form-group"> - <label class="col-sm-3 col-form-label" for="html"> - <?= I18N::translate('Content') ?> - </label> - <div class="col-sm-9"> - <p> - <?= I18N::translate('As well as using the toolbar to apply HTML formatting, you can insert database fields which are updated automatically. These special fields are marked with <b>#</b> characters. For example <b>#totalFamilies#</b> will be replaced with the actual number of families in the database. Advanced users may wish to apply CSS classes to their text, so that the formatting matches the currently selected theme.') ?> - </p> - <textarea name="html" id="html" class="html-edit form-control" rows="10"><?= e($html) ?></textarea> - </div> + <label class="col-sm-3 col-form-label" for="html"> + <?= I18N::translate('Content') ?> + </label> + <div class="col-sm-9"> + <p> + <?= I18N::translate('As well as using the toolbar to apply HTML formatting, you can insert database fields which are updated automatically. These special fields are marked with <b>#</b> characters. For example <b>#totalFamilies#</b> will be replaced with the actual number of families in the database. Advanced users may wish to apply CSS classes to their text, so that the formatting matches the currently selected theme.') ?> + </p> + <textarea name="html" id="html" class="html-edit form-control" rows="10"><?= e($html) ?></textarea> + </div> </div> <fieldset class="form-group"> - <div class="row"> - <legend class="form-control-legend col-sm-3"> - <?= I18N::translate('Show the date and time of update') ?> - </legend> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('show_timestamp', FunctionsEdit::optionsNoYes(), $show_timestamp, true) ?> - </div> - </div> + <div class="row"> + <legend class="form-control-legend col-sm-3"> + <?= I18N::translate('Show the date and time of update') ?> + </legend> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('show_timestamp', FunctionsEdit::optionsNoYes(), $show_timestamp, true) ?> + </div> + </div> </fieldset> <fieldset class="form-group"> - <div class="row"> - <legend class="form-control-legend col-sm-3"> - <?= I18N::translate('Show this block for which languages') ?> - </legend> - <div class="col-sm-9"> - <?= FunctionsEdit::editLanguageCheckboxes('lang', $languages) ?> - </div> - </div> + <div class="row"> + <legend class="form-control-legend col-sm-3"> + <?= I18N::translate('Show this block for which languages') ?> + </legend> + <div class="col-sm-9"> + <?= FunctionsEdit::editLanguageCheckboxes('lang', $languages) ?> + </div> + </div> </fieldset> <?= view('modules/ckeditor/ckeditor-js') ?> diff --git a/resources/views/modules/html/template-narrative.php b/resources/views/modules/html/template-narrative.php index 470b466a27..78cdd7fc2f 100644 --- a/resources/views/modules/html/template-narrative.php +++ b/resources/views/modules/html/template-narrative.php @@ -1,4 +1,4 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<?= /* I18N: do not translate the #keywords# */ I18N::translate('This family tree was last updated on #gedcomUpdated#. There are #totalSurnames# surnames in this family tree. The earliest recorded event is the #firstEventType# of #firstEventName# in #firstEventYear#. The most recent event is the #lastEventType# of #lastEventName# in #lastEventYear#.<br><br>If you have any comments or feedback please contact #contactWebmaster#.') ?> +<?= /* I18N: do not translate the #keywords# */ I18N::translate('This family tree was last updated on #gedcomUpdated#. There are #totalSurnames# surnames in this family tree. The earliest recorded event is the #firstEventType# of #firstEventName# in #firstEventYear#. The most recent event is the #lastEventType# of #lastEventName# in #lastEventYear#.<br><br>If you have any comments or feedback please contact #contactWebmaster#.'); diff --git a/resources/views/modules/html/template-statistics.php b/resources/views/modules/html/template-statistics.php index b1c6fa5696..255c28e78c 100644 --- a/resources/views/modules/html/template-statistics.php +++ b/resources/views/modules/html/template-statistics.php @@ -1,101 +1,101 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="gedcom_stats"> - <p> - <a href="<?= e(route('tree-page', [])) ?>">#gedcomTitle#</a> - </p> + <p> + <a href="<?= e(route('tree-page', [])) ?>">#gedcomTitle#</a> + </p> - <?= I18N::translate('This family tree was last updated on %s.', '#gedcomUpdated#') ?> + <?= I18N::translate('This family tree was last updated on %s.', '#gedcomUpdated#') ?> - <div class="row"> - <div class="col col-sm-4"> - <table class="table wt-facts-table"> - <tr> - <th scope="row"><?= I18N::translate('Individuals') ?></th> - <td>#totalIndividuals#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Males') ?></th> - <td>#totalSexMales#<br>#totalSexMalesPercentage#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Females') ?></th> - <td>#totalSexFemales#<br>#totalSexFemalesPercentage#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Total surnames') ?></th> - <td>#totalSurnames#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Families') ?></th> - <td>#totalFamilies#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Sources') ?></th> - <td>#totalSources#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Media objects') ?></th> - <td>#totalMedia#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Repositories') ?></th> - <td>#totalRepositories#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Events') ?></th> - <td>#totalEvents#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Users') ?></th> - <td>#totalUsers#</td> - </tr> - </table> - </div> + <div class="row"> + <div class="col col-sm-4"> + <table class="table wt-facts-table"> + <tr> + <th scope="row"><?= I18N::translate('Individuals') ?></th> + <td>#totalIndividuals#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Males') ?></th> + <td>#totalSexMales#<br>#totalSexMalesPercentage#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Females') ?></th> + <td>#totalSexFemales#<br>#totalSexFemalesPercentage#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Total surnames') ?></th> + <td>#totalSurnames#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Families') ?></th> + <td>#totalFamilies#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Sources') ?></th> + <td>#totalSources#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Media objects') ?></th> + <td>#totalMedia#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Repositories') ?></th> + <td>#totalRepositories#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Events') ?></th> + <td>#totalEvents#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Users') ?></th> + <td>#totalUsers#</td> + </tr> + </table> + </div> - <div class="col col-sm-8"> - <table class="table wt-facts-table"> - <tr> - <th scope="row"><?= I18N::translate('Earliest birth') ?></th> - <td>#firstBirth#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Latest birth') ?></th> - <td>#lastBirth#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Earliest death') ?></th> - <td>#firstDeath#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Latest death') ?></th> - <td>#lastDeath#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Individual who lived the longest') ?></th> - <td>#longestLife#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Average age at death') ?></th> - <td>#averageLifespan#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Family with the most children') ?></th> - <td>#largestFamilySize#<br>#largestFamily#</td> - </tr> - <tr> - <th scope="row"><?= I18N::translate('Average number of children per family') ?></th> - <td>#averageChildren#</td> - </tr> - </table> - </div> - </div> + <div class="col col-sm-8"> + <table class="table wt-facts-table"> + <tr> + <th scope="row"><?= I18N::translate('Earliest birth') ?></th> + <td>#firstBirth#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Latest birth') ?></th> + <td>#lastBirth#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Earliest death') ?></th> + <td>#firstDeath#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Latest death') ?></th> + <td>#lastDeath#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Individual who lived the longest') ?></th> + <td>#longestLife#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Average age at death') ?></th> + <td>#averageLifespan#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Family with the most children') ?></th> + <td>#largestFamilySize#<br>#largestFamily#</td> + </tr> + <tr> + <th scope="row"><?= I18N::translate('Average number of children per family') ?></th> + <td>#averageChildren#</td> + </tr> + </table> + </div> + </div> - <p> - <b><?= I18N::translate('Most common surnames') ?></b> - </p> + <p> + <b><?= I18N::translate('Most common surnames') ?></b> + </p> - <p> - #commonSurnames# - </p> + <p> + #commonSurnames# + </p> </div> diff --git a/resources/views/modules/lightbox/tab.php b/resources/views/modules/lightbox/tab.php index 9c11577793..cbc96eb9e9 100644 --- a/resources/views/modules/lightbox/tab.php +++ b/resources/views/modules/lightbox/tab.php @@ -1,16 +1,16 @@ <div class="wt-album-tab py-4"> - <?php foreach ($media_list as $media): ?> - <figure class="figure text-center col-sm-6 col-md-4 col-lg-3 col-xl-2 wt-album-tab-figure"> - <?php foreach ($media->mediaFiles() as $media_file): ?> - <?php if ($media_file->isImage()): ?> - <?= $media_file->displayImage(100, 100, 'contain', ['class' => 'img-thumbnail wt-album-tab-image']) ?> - <?php endif ?> - <?php endforeach ?> - <figcaption class="figure-caption wt-album-tab-caption"> - <a href="<?= e($media->url()) ?>"> - <?= $media->getFullName() ?> - </a> - </figcaption> - </figure> - <?php endforeach ?> + <?php foreach ($media_list as $media) : ?> + <figure class="figure text-center col-sm-6 col-md-4 col-lg-3 col-xl-2 wt-album-tab-figure"> + <?php foreach ($media->mediaFiles() as $media_file) : ?> + <?php if ($media_file->isImage()) : ?> + <?= $media_file->displayImage(100, 100, 'contain', ['class' => 'img-thumbnail wt-album-tab-image']) ?> + <?php endif ?> + <?php endforeach ?> + <figcaption class="figure-caption wt-album-tab-caption"> + <a href="<?= e($media->url()) ?>"> + <?= $media->getFullName() ?> + </a> + </figcaption> + </figure> + <?php endforeach ?> </div> diff --git a/resources/views/modules/login_block/sign-in.php b/resources/views/modules/login_block/sign-in.php index fe43997a60..d1c04d42c8 100644 --- a/resources/views/modules/login_block/sign-in.php +++ b/resources/views/modules/login_block/sign-in.php @@ -1,55 +1,55 @@ <?php use Fisharebest\Webtrees\I18N; ?> <form name="login-form" method="POST" action="<?= route('login', ['url' => route('user-page')]) ?>"> - <?= csrf_field() ?> + <?= csrf_field() ?> - <div class="form-group"> - <label for="username"> - <?= I18N::translate('Username') ?> - </label> - <input type="text" id="username" name="username" class="form-control"> - </div> + <div class="form-group"> + <label for="username"> + <?= I18N::translate('Username') ?> + </label> + <input type="text" id="username" name="username" class="form-control"> + </div> - <div class="form-group"> - <label for="password"> - <?= I18N::translate('Password') ?> - </label> - <input type="password" id="password" name="password" class="form-control" autocomplete="current-password"> - </div> + <div class="form-group"> + <label for="password"> + <?= I18N::translate('Password') ?> + </label> + <input type="password" id="password" name="password" class="form-control" autocomplete="current-password"> + </div> - <div> - <button type="submit" class="btn btn-primary"> - <?= /* I18N: A button label. */ I18N::translate('sign in') ?> - </button> + <div> + <button type="submit" class="btn btn-primary"> + <?= /* I18N: A button label. */ I18N::translate('sign in') ?> + </button> - <button type="button" class="btn btn-secondary" data-toggle="collapse" data-target="#forgot-password" aria-expanded="false" aria-controls="forgot-password"> - <?= I18N::translate('Forgot password?') ?> - </button> - </div> + <button type="button" class="btn btn-secondary" data-toggle="collapse" data-target="#forgot-password" aria-expanded="false" aria-controls="forgot-password"> + <?= I18N::translate('Forgot password?') ?> + </button> + </div> </form> -<?php if ($allow_register): ?> - <a class="btn btn-link" href="<?= e(route('register')) ?>"> - <?= I18N::translate('Request a new user account') ?> - </a> +<?php if ($allow_register) : ?> + <a class="btn btn-link" href="<?= e(route('register')) ?>"> + <?= I18N::translate('Request a new user account') ?> + </a> <?php endif ?> <div class="collapse" id="forgot-password"> - <form action="<?= e(route('login')) ?>" method="POST"> - <input type="hidden" name="time" value=""> - <input type="hidden" name="action" value="requestpw"> - <?= I18N::translate('Request a new password') ?> - <div class="form-group"> - <label for="new_passwd_username"> - <?= I18N::translate('Username or email address') ?> - <input type="text" id="new_passwd_username" name="new_passwd_username" class="form-control"> - </label> - </div> - <div> - <button type="submit" class="btn btn-primary"> - <?= /* I18N: A button label. */ I18N::translate('continue') ?> - </button> - </div> - </form> + <form action="<?= e(route('login')) ?>" method="POST"> + <input type="hidden" name="time" value=""> + <input type="hidden" name="action" value="requestpw"> + <?= I18N::translate('Request a new password') ?> + <div class="form-group"> + <label for="new_passwd_username"> + <?= I18N::translate('Username or email address') ?> + <input type="text" id="new_passwd_username" name="new_passwd_username" class="form-control"> + </label> + </div> + <div> + <button type="submit" class="btn btn-primary"> + <?= /* I18N: A button label. */ I18N::translate('continue') ?> + </button> + </div> + </form> </div> diff --git a/resources/views/modules/login_block/sign-out.php b/resources/views/modules/login_block/sign-out.php index 47062796f5..a5f824b6ef 100644 --- a/resources/views/modules/login_block/sign-out.php +++ b/resources/views/modules/login_block/sign-out.php @@ -5,9 +5,9 @@ </p> <form method="POST" action="<?= e(route('logout')) ?>"> - <?= csrf_field() ?> + <?= csrf_field() ?> - <button type="submit" class="btn btn-primary"> - <?= /* I18N: A button label. */ I18N::translate('sign out') ?> - </button> + <button type="submit" class="btn btn-primary"> + <?= /* I18N: A button label. */ I18N::translate('sign out') ?> + </button> </form> diff --git a/resources/views/modules/media/tab.php b/resources/views/modules/media/tab.php index 86343b3701..5b4421070e 100644 --- a/resources/views/modules/media/tab.php +++ b/resources/views/modules/media/tab.php @@ -2,20 +2,20 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="wt-media-tab py-4"> - <table class="table wt-facts-table"> - <?php foreach ($facts as $fact): ?> - <?php FunctionsPrintFacts::printMainMedia($fact, 1) ?> - <?php FunctionsPrintFacts::printMainMedia($fact, 2) ?> - <?php FunctionsPrintFacts::printMainMedia($fact, 3) ?> - <?php FunctionsPrintFacts::printMainMedia($fact, 4) ?> - <?php endforeach ?> + <table class="table wt-facts-table"> + <?php foreach ($facts as $fact) : ?> + <?php FunctionsPrintFacts::printMainMedia($fact, 1) ?> + <?php FunctionsPrintFacts::printMainMedia($fact, 2) ?> + <?php FunctionsPrintFacts::printMainMedia($fact, 3) ?> + <?php FunctionsPrintFacts::printMainMedia($fact, 4) ?> + <?php endforeach ?> - <?php if (empty($facts)): ?> - <tr> - <td colspan="2"> - <?= I18N::translate('There are no media objects for this individual.') ?> - </td> - </tr> - <?php endif ?> - </table> + <?php if (empty($facts)) : ?> + <tr> + <td colspan="2"> + <?= I18N::translate('There are no media objects for this individual.') ?> + </td> + </tr> + <?php endif ?> + </table> </div> diff --git a/resources/views/modules/notes/tab.php b/resources/views/modules/notes/tab.php index f8323e3e7f..bbb5b1e216 100644 --- a/resources/views/modules/notes/tab.php +++ b/resources/views/modules/notes/tab.php @@ -3,54 +3,54 @@ <?php use Fisharebest\Webtrees\View; ?> <div class="wt-notes-tab py-4"> - <table class="table wt-facts-table"> - <tr> - <td colspan="2"> - <label> - <input id="show-level-2-notes" type="checkbox"> - <?= I18N::translate('Show all notes') ?> - </label> - </td> - </tr> + <table class="table wt-facts-table"> + <tr> + <td colspan="2"> + <label> + <input id="show-level-2-notes" type="checkbox"> + <?= I18N::translate('Show all notes') ?> + </label> + </td> + </tr> - <?php foreach ($facts as $fact): ?> - <?php FunctionsPrintFacts::printMainNotes($fact, 1) ?> - <?php FunctionsPrintFacts::printMainNotes($fact, 2) ?> - <?php FunctionsPrintFacts::printMainNotes($fact, 3) ?> - <?php FunctionsPrintFacts::printMainNotes($fact, 4) ?> - <?php endforeach ?> + <?php foreach ($facts as $fact) : ?> + <?php FunctionsPrintFacts::printMainNotes($fact, 1) ?> + <?php FunctionsPrintFacts::printMainNotes($fact, 2) ?> + <?php FunctionsPrintFacts::printMainNotes($fact, 3) ?> + <?php FunctionsPrintFacts::printMainNotes($fact, 4) ?> + <?php endforeach ?> - <?php if (empty($facts)): ?> - <tr> - <td colspan="2"> - <?= I18N::translate('There are no notes for this individual.') ?> - </td> - </tr> - <?php endif ?> + <?php if (empty($facts)) : ?> + <tr> + <td colspan="2"> + <?= I18N::translate('There are no notes for this individual.') ?> + </td> + </tr> + <?php endif ?> - <?php if ($can_edit): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Note') ?> - </th> - <td> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'NOTE'])) ?>"> - <?= I18N::translate('Add a note') ?> - </a> - </td> - </tr> - <tr> - <th scope="row"> - <?= I18N::translate('Shared note') ?> - </th> - <td> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> - <?= I18N::translate('Add a shared note') ?> - </a> - </td> - </tr> - <?php endif ?> - </table> + <?php if ($can_edit) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Note') ?> + </th> + <td> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'NOTE'])) ?>"> + <?= I18N::translate('Add a note') ?> + </a> + </td> + </tr> + <tr> + <th scope="row"> + <?= I18N::translate('Shared note') ?> + </th> + <td> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <?= I18N::translate('Add a shared note') ?> + </a> + </td> + </tr> + <?php endif ?> + </table> </div> <?php View::push('javascript') ?> diff --git a/resources/views/modules/pedigree-map/event-sidebar.php b/resources/views/modules/pedigree-map/event-sidebar.php index 71ffe579d3..8b647768f1 100644 --- a/resources/views/modules/pedigree-map/event-sidebar.php +++ b/resources/views/modules/pedigree-map/event-sidebar.php @@ -3,26 +3,26 @@ <?= $tag ?> </div> -<?php if ($url): ?> +<?php if ($url) : ?> <a href="<?= e($url) ?>"> <?= $name ?> </a> <?php endif ?> -<?php if($value): ?> +<?php if ($value) : ?> <span> <?= $value ?> </span> <?php endif ?> <div> - <?php if($addtag): ?> + <?php if ($addtag) : ?> <?= GedcomTag::getLabel('BIRT') ?>: <?php endif ?> <?= $date ?> </div> -<?php if (!$place->isEmpty()): ?> +<?php if (!$place->isEmpty()) : ?> <div> <a href="<?= e($place->getUrl()) ?>"> <?= $place->getFullName() ?> diff --git a/resources/views/modules/pedigree-map/pedigree-map-page.php b/resources/views/modules/pedigree-map/pedigree-map-page.php index c282b420b2..fc85f6dffa 100644 --- a/resources/views/modules/pedigree-map/pedigree-map-page.php +++ b/resources/views/modules/pedigree-map/pedigree-map-page.php @@ -5,47 +5,47 @@ <h2 class="wt-page-title"><?= $title ?></h2> <form class="wt-page-options wt-page-options-pedigreemap-chart d-print-none"> - <input type="hidden" name="route" value="module"> - <input type="hidden" name="module" value="<?= $module ?>"> - <input type="hidden" name="action" value="PedigreeMap"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="route" value="module"> + <input type="hidden" name="module" value="<?= $module ?>"> + <input type="hidden" name="action" value="PedigreeMap"> + <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> - <div class="form-group row"> - <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> - <?= I18N::translate('Individual') ?> - </label> - <div class="col-sm-9 wt-page-options-value"> - <?= FunctionsEdit::formControlIndividual($tree, $individual, ['id' => 'xref', 'name' => 'xref']) ?> - </div> - </div> + <div class="form-group row"> + <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> + <?= I18N::translate('Individual') ?> + </label> + <div class="col-sm-9 wt-page-options-value"> + <?= FunctionsEdit::formControlIndividual($tree, $individual, ['id' => 'xref', 'name' => 'xref']) ?> + </div> + </div> - <div class="form-group row"> - <label class="col-sm-3 col-form-label wt-page-options-label" for="generations"> - <?= I18N::translate('Generations') ?> - </label> - <div class="col-sm-9 wt-page-options-value"> - <?= - Bootstrap4::select( - FunctionsEdit::numericOptions(range(2, $maxgenerations)), - $generations, - ['id' => 'generations', 'name' => 'generations'] - ) - ?> - </div> - </div> + <div class="form-group row"> + <label class="col-sm-3 col-form-label wt-page-options-label" for="generations"> + <?= I18N::translate('Generations') ?> + </label> + <div class="col-sm-9 wt-page-options-value"> + <?= + Bootstrap4::select( + FunctionsEdit::numericOptions(range(2, $maxgenerations)), + $generations, + ['id' => 'generations', 'name' => 'generations'] + ) +?> + </div> + </div> - <div class="form-group row"> - <div class="col-sm-3 wt-page-options-label"></div> - <div class="col-sm-9 wt-page-options-value"> - <input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */ - I18N::translate('view') - ?>"> - </div> - </div> + <div class="form-group row"> + <div class="col-sm-3 wt-page-options-label"></div> + <div class="col-sm-9 wt-page-options-value"> + <input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */ + I18N::translate('view') + ?>"> + </div> + </div> </form> <div class="wt-ajax-load wt-page-content"> - <?= $map ?> + <?= $map ?> </div> diff --git a/resources/views/modules/pedigree-map/pedigree-map.php b/resources/views/modules/pedigree-map/pedigree-map.php index e76baea1b5..411903b049 100644 --- a/resources/views/modules/pedigree-map/pedigree-map.php +++ b/resources/views/modules/pedigree-map/pedigree-map.php @@ -2,66 +2,66 @@ <?php use Fisharebest\Webtrees\View; ?> <div class="py-4"> - <div class="row gchart osm-wrapper"> - <div id="osm-map" class="col-sm-9 wt-ajax-load osm-user-map"></div> - <ul class='col-sm-3 osm-sidebar wt-page-options-value'></ul> - </div> + <div class="row gchart osm-wrapper"> + <div id="osm-map" class="col-sm-9 wt-ajax-load osm-user-map"></div> + <ul class='col-sm-3 osm-sidebar wt-page-options-value'></ul> + </div> </div> <?php View::push('styles') ?> <style> - .osm-wrapper, .osm-user-map { - height: 45vh - } + .osm-wrapper, .osm-user-map { + height: 45vh + } - .osm-admin-map { - height: 55vh; - border: 1px solid darkGrey - } + .osm-admin-map { + height: 55vh; + border: 1px solid darkGrey + } - .osm-sidebar { - height: 100%; - overflow-y: auto; - padding: 0; - margin: 0; - border: 0; - display: none; - font-size: small; - } + .osm-sidebar { + height: 100%; + overflow-y: auto; + padding: 0; + margin: 0; + border: 0; + display: none; + font-size: small; + } - .osm-sidebar .gchart { - margin: 1px; - padding: 2px - } + .osm-sidebar .gchart { + margin: 1px; + padding: 2px + } - .osm-sidebar .gchart img { - height: 15px; - width: 25px - } + .osm-sidebar .gchart img { + height: 15px; + width: 25px + } - .osm-sidebar .border-danger:hover { - cursor: not-allowed - } + .osm-sidebar .border-danger:hover { + cursor: not-allowed + } - [dir=rtl] .leaflet-right { - right: auto; - left: 0 - } + [dir=rtl] .leaflet-right { + right: auto; + left: 0 + } - [dir=rtl] .leaflet-right .leaflet-control { - margin-right: 0; - margin-left: 10px - } + [dir=rtl] .leaflet-right .leaflet-control { + margin-right: 0; + margin-left: 10px + } - [dir=rtl] .leaflet-left { - left: auto; - right: 0 - } + [dir=rtl] .leaflet-left { + left: auto; + right: 0 + } - [dir=rtl] .leaflet-left .leaflet-control { - margin-left: 0; - margin-right: 10px - } + [dir=rtl] .leaflet-left .leaflet-control { + margin-left: 0; + margin-right: 10px + } </style> <?php View::endpush() ?> @@ -174,7 +174,7 @@ }) .on('popupopen', function (e) { let sidebar = $('.osm-sidebar'); - let item = sidebar.children(".gchart[data-id=" + e.target.feature.id + "]"); + let item = sidebar.children(".gchart[data-id=" + e.target.feature.id + "]"); item.addClass('messagebox'); sidebar.scrollTo(item); }) @@ -289,6 +289,6 @@ }; })(); - WT_OSM.drawMap(<?= json_encode($ref) ?>, <?= json_encode($type) ?>, <?= json_encode($generations ?? null) ?>); + WT_OSM.drawMap(<?= json_encode($ref) ?>, <?= json_encode($type) ?>, <?= json_encode($generations ?? null) ?>); </script> <?php View::endpush() ?> diff --git a/resources/views/modules/personal_facts/tab.php b/resources/views/modules/personal_facts/tab.php index 652d367721..f06f44482a 100644 --- a/resources/views/modules/personal_facts/tab.php +++ b/resources/views/modules/personal_facts/tab.php @@ -4,40 +4,40 @@ <?php use Fisharebest\Webtrees\View; ?> <div class="wt-facts-tab py-4"> - <table class="table wt-facts-table"> - <tbody> - <tr> - <td colspan="2"> - <label> - <input id="show-relatives-facts" type="checkbox" data-toggle="collapse" data-target=".wt-relation-fact"> - <?= I18N::translate('Events of close relatives') ?> - </label> - <?php if ($has_historical_facts): ?> - <label> - <input id="show-historical-facts" type="checkbox" data-toggle="collapse" data-target=".wt-historic-fact"> - <?= I18N::translate('Historical facts') ?> - </label> - <?php endif ?> - </td> - </tr> + <table class="table wt-facts-table"> + <tbody> + <tr> + <td colspan="2"> + <label> + <input id="show-relatives-facts" type="checkbox" data-toggle="collapse" data-target=".wt-relation-fact"> + <?= I18N::translate('Events of close relatives') ?> + </label> + <?php if ($has_historical_facts) : ?> + <label> + <input id="show-historical-facts" type="checkbox" data-toggle="collapse" data-target=".wt-historic-fact"> + <?= I18N::translate('Historical facts') ?> + </label> + <?php endif ?> + </td> + </tr> - <?php foreach ($facts as $fact): ?> - <?php FunctionsPrintFacts::printFact($fact, $individual) ?> - <?php endforeach ?> + <?php foreach ($facts as $fact) : ?> + <?php FunctionsPrintFacts::printFact($fact, $individual) ?> + <?php endforeach ?> - <?php if (empty($facts)): ?> - <tr> - <td colspan="2"> - <?= I18N::translate('There are no facts for this individual.') ?> - </td> - </tr> - <?php endif ?> + <?php if (empty($facts)) : ?> + <tr> + <td colspan="2"> + <?= I18N::translate('There are no facts for this individual.') ?> + </td> + </tr> + <?php endif ?> - <?php if ($individual->canEdit()): ?> - <?php FunctionsPrint::printAddNewFact($individual, $facts, 'INDI') ?> - <?php endif ?> - </tbody> - </table> + <?php if ($individual->canEdit()) : ?> + <?php FunctionsPrint::printAddNewFact($individual, $facts, 'INDI') ?> + <?php endif ?> + </tbody> + </table> </div> <?php View::push('javascript') ?> diff --git a/resources/views/modules/places/event-sidebar.php b/resources/views/modules/places/event-sidebar.php index ff8b72fd8f..8b647768f1 100644 --- a/resources/views/modules/places/event-sidebar.php +++ b/resources/views/modules/places/event-sidebar.php @@ -3,26 +3,26 @@ <?= $tag ?> </div> -<?php if ($url): ?> +<?php if ($url) : ?> <a href="<?= e($url) ?>"> <?= $name ?> </a> <?php endif ?> -<?php if ($value): ?> +<?php if ($value) : ?> <span> <?= $value ?> </span> <?php endif ?> <div> - <?php if ($addtag): ?> + <?php if ($addtag) : ?> <?= GedcomTag::getLabel('BIRT') ?>: <?php endif ?> <?= $date ?> </div> -<?php if (!$place->isEmpty()): ?> +<?php if (!$place->isEmpty()) : ?> <div> <a href="<?= e($place->getUrl()) ?>"> <?= $place->getFullName() ?> diff --git a/resources/views/modules/random_media/config.php b/resources/views/modules/random_media/config.php index ef4b3725ff..d7810cc0f6 100644 --- a/resources/views/modules/random_media/config.php +++ b/resources/views/modules/random_media/config.php @@ -3,41 +3,41 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="filter"> - <?= I18N::translate('Show only individuals, events, or all') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select(['indi' => I18N::translate('Individuals'), 'event' => I18N::translate('Facts and events'), 'all' => I18N::translate('All')], $filter, ['id' => 'filter', 'name' => 'filter']) ?> - </div> + <label class="col-sm-3 col-form-label" for="filter"> + <?= I18N::translate('Show only individuals, events, or all') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select(['indi' => I18N::translate('Individuals'), 'event' => I18N::translate('Facts and events'), 'all' => I18N::translate('All')], $filter, ['id' => 'filter', 'name' => 'filter']) ?> + </div> </div> <fieldset class="form-group"> - <div class="row"> - <legend class="col-form-label col-sm-3"> - <?= I18N::translate('Type') ?> - </legend> - <div class="col-sm-9"> - <?php foreach ($formats as $typeName => $typeValue): ?> - <?= Bootstrap4::checkbox($typeValue, false, ['name' => 'filter_' . $typeName, 'checked' => (bool) $filters[$typeName]]) ?> - <?php endforeach ?> - </div> - </div> + <div class="row"> + <legend class="col-form-label col-sm-3"> + <?= I18N::translate('Type') ?> + </legend> + <div class="col-sm-9"> + <?php foreach ($formats as $typeName => $typeValue) : ?> + <?= Bootstrap4::checkbox($typeValue, false, ['name' => 'filter_' . $typeName, 'checked' => (bool) $filters[$typeName]]) ?> + <?php endforeach ?> + </div> + </div> </fieldset> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="controls"> - <?= I18N::translate('Show slide show controls') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('controls', FunctionsEdit::optionsNoYes(), $controls, true) ?> - </div> + <label class="col-sm-3 col-form-label" for="controls"> + <?= I18N::translate('Show slide show controls') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('controls', FunctionsEdit::optionsNoYes(), $controls, true) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="start"> - <?= I18N::translate('Start slide show on page load') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('start', FunctionsEdit::optionsNoYes(), $start, true) ?> - </div> + <label class="col-sm-3 col-form-label" for="start"> + <?= I18N::translate('Start slide show on page load') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('start', FunctionsEdit::optionsNoYes(), $start, true) ?> + </div> </div> diff --git a/resources/views/modules/random_media/slide-show.php b/resources/views/modules/random_media/slide-show.php index c3c95087da..7616663c82 100644 --- a/resources/views/modules/random_media/slide-show.php +++ b/resources/views/modules/random_media/slide-show.php @@ -3,86 +3,86 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="text-center slide-show-container"> - <?php if ($show_controls): ?> - <div class="slide-show-controls"> - <?= FontAwesome::linkIcon('media-play', I18N::translate('Play'), ['href' => '#', 'hidden' => $start_automatically]) ?> - <?= FontAwesome::linkIcon('media-stop', I18N::translate('Stop'), ['href' => '#', 'hidden' => !$start_automatically]) ?> - <?= FontAwesome::linkIcon('media-next', I18N::translate('Next image'), ['href' => '#']) ?> - </div> - <?php endif ?> + <?php if ($show_controls) : ?> + <div class="slide-show-controls"> + <?= FontAwesome::linkIcon('media-play', I18N::translate('Play'), ['href' => '#', 'hidden' => $start_automatically]) ?> + <?= FontAwesome::linkIcon('media-stop', I18N::translate('Stop'), ['href' => '#', 'hidden' => !$start_automatically]) ?> + <?= FontAwesome::linkIcon('media-next', I18N::translate('Next image'), ['href' => '#']) ?> + </div> + <?php endif ?> - <figure class="text-center slide-show-figure"> - <?= $media_file->displayImage(200, 200, '', ['class' => 'slide-show-image']) ?> - <figcaption class="slide-show-figcaption"> - <a href="<?= e($media->url()) ?>"> - <b><?= $media->getFullName() ?></b> - </a> - </figcaption> - </figure> + <figure class="text-center slide-show-figure"> + <?= $media_file->displayImage(200, 200, '', ['class' => 'slide-show-image']) ?> + <figcaption class="slide-show-figcaption"> + <a href="<?= e($media->url()) ?>"> + <b><?= $media->getFullName() ?></b> + </a> + </figcaption> + </figure> - <p class="slide-show-notes"> - <?= FunctionsPrint::printFactNotes($tree, $media->getGedcom(), 1) ?> - </p> + <p class="slide-show-notes"> + <?= FunctionsPrint::printFactNotes($tree, $media->getGedcom(), 1) ?> + </p> - <ul class="slide-show-links"> - <?php foreach ($media->linkedIndividuals('OBJE') as $individual): ?> - <?= I18N::translate('Individual') ?> — - <a href="<?= e($individual->url()) ?>" class="slide-show-link"> - <?= $individual->getFullName() ?> - </a> - <br> - <?php endforeach ?> + <ul class="slide-show-links"> + <?php foreach ($media->linkedIndividuals('OBJE') as $individual) : ?> + <?= I18N::translate('Individual') ?> — + <a href="<?= e($individual->url()) ?>" class="slide-show-link"> + <?= $individual->getFullName() ?> + </a> + <br> + <?php endforeach ?> - <?php foreach ($media->linkedFamilies('OBJE') as $family): ?> - <?= I18N::translate('View this family') ?> — - <a href="<?= e($family->url()) ?>" class="slide-show-link"> - <?= $family->getFullName() ?> - </a> - <br> - <?php endforeach ?> + <?php foreach ($media->linkedFamilies('OBJE') as $family) : ?> + <?= I18N::translate('View this family') ?> — + <a href="<?= e($family->url()) ?>" class="slide-show-link"> + <?= $family->getFullName() ?> + </a> + <br> + <?php endforeach ?> - <?php foreach ($media->linkedSources('OBJE') as $source): ?> - <?= I18N::translate('View this source') ?> — - <a href="<?= e($source->url()) ?>" class="slide-show-link"> - <?= $source->getFullName() ?> - </a> - <br> - <?php endforeach ?> - </ul> + <?php foreach ($media->linkedSources('OBJE') as $source) : ?> + <?= I18N::translate('View this source') ?> — + <a href="<?= e($source->url()) ?>" class="slide-show-link"> + <?= $source->getFullName() ?> + </a> + <br> + <?php endforeach ?> + </ul> </div> <script> - // Reload automatically? - var play = <?= json_encode($start_automatically); ?>; + // Reload automatically? + var play = <?= json_encode($start_automatically); ?>; - function slideShowReload() { - if (play) { - var block = $("#block-<?= $block_id ?>").parent(); - clearTimeout(timeout); - block.load(block.data('ajaxUrl') + '&start=' + (play ? '1' : '0')); - } + function slideShowReload() { + if (play) { + var block = $("#block-<?= $block_id ?>").parent(); + clearTimeout(timeout); + block.load(block.data('ajaxUrl') + '&start=' + (play ? '1' : '0')); + } - return false; - } + return false; + } - $(".wt-icon-media-play").on('click', function () { - $(".wt-icon-media-play").parent().attr('hidden', true); - $(".wt-icon-media-stop").parent().attr('hidden', false); - play = true; - return slideShowReload(); - }); + $(".wt-icon-media-play").on('click', function () { + $(".wt-icon-media-play").parent().attr('hidden', true); + $(".wt-icon-media-stop").parent().attr('hidden', false); + play = true; + return slideShowReload(); + }); - $(".wt-icon-media-stop").on('click', function () { - $(".wt-icon-media-stop").parent().attr('hidden', true); - $(".wt-icon-media-play").parent().attr('hidden', false); - play = false; - return false; - }); + $(".wt-icon-media-stop").on('click', function () { + $(".wt-icon-media-stop").parent().attr('hidden', true); + $(".wt-icon-media-play").parent().attr('hidden', false); + play = false; + return false; + }); - $(".wt-icon-media-next").on('click', function () { - play = true; - return slideShowReload(); - }); + $(".wt-icon-media-next").on('click', function () { + play = true; + return slideShowReload(); + }); - var timeout = setTimeout(slideShowReload, 6000); + var timeout = setTimeout(slideShowReload, 6000); </script> diff --git a/resources/views/modules/recent_changes/changes-list.php b/resources/views/modules/recent_changes/changes-list.php index 4837279906..4c67b10788 100644 --- a/resources/views/modules/recent_changes/changes-list.php +++ b/resources/views/modules/recent_changes/changes-list.php @@ -1,16 +1,16 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<?php foreach ($records as $record): ?> - <a href="<?= e($record->url()) ?>" class="list_item name2"> - <?= $record->getFullName() ?> - </a> - <div class="indent mb-1"> - <?php if ($record->lastChangeTimestamp() !== ''): ?> - <?php if ($show_user): ?> - <?= /* I18N: [a record was] Changed on <date/time> by <user> */I18N::translate('Changed on %1$s by %2$s', $record->lastChangeTimestamp(), e($record->lastChangeUser())) ?> - <?php else: ?> - <?= /* I18N: [a record was] Changed on <date/time> */ I18N::translate('Changed on %1$s', $record->lastChangeTimestamp()) ?> - <?php endif ?> - <?php endif ?> - </div> +<?php foreach ($records as $record) : ?> + <a href="<?= e($record->url()) ?>" class="list_item name2"> + <?= $record->getFullName() ?> + </a> + <div class="indent mb-1"> + <?php if ($record->lastChangeTimestamp() !== '') : ?> + <?php if ($show_user) : ?> + <?= /* I18N: [a record was] Changed on <date/time> by <user> */I18N::translate('Changed on %1$s by %2$s', $record->lastChangeTimestamp(), e($record->lastChangeUser())) ?> + <?php else : ?> + <?= /* I18N: [a record was] Changed on <date/time> */ I18N::translate('Changed on %1$s', $record->lastChangeTimestamp()) ?> + <?php endif ?> + <?php endif ?> + </div> <?php endforeach ?> diff --git a/resources/views/modules/recent_changes/changes-table.php b/resources/views/modules/recent_changes/changes-table.php index 896746bf37..e09677e89b 100644 --- a/resources/views/modules/recent_changes/changes-table.php +++ b/resources/views/modules/recent_changes/changes-table.php @@ -3,60 +3,60 @@ <?php use Fisharebest\Webtrees\View; ?> <table class="table table-sm datatables wt-table-changes" data-filter="false" data-info="false" data-paging="false"> - <thead> - <tr> - <th> - <span class="sr-only"> - <?= I18N::translate('Type') ?> - </span> - </th> - <th> - <?= I18N::translate('Record') ?> - </th> - <th> - <?= I18N::translate('Last change') ?> - </th> - <?php if ($show_user): ?> - <th> - <?= I18N::translate('User') ?> - </th> - <?php endif ?> - </tr> - </thead> - <tbody> - <?php foreach ($records as $record): ?> - <tr> - <td data-sort="<?= $record::RECORD_TYPE ?>" class="text-centre"> - <?php if ($record::RECORD_TYPE === 'INDI') : ?> - <?= FontAwesome::semanticIcon('individual', I18N::translate('Individual')) ?> - <?php elseif ($record::RECORD_TYPE === 'FAM'): ?> - <?= FontAwesome::semanticIcon('family', I18N::translate('Family')) ?> - <?php elseif ($record::RECORD_TYPE === 'OBJE'): ?> - <?= FontAwesome::semanticIcon('media', I18N::translate('Media')) ?> - <?php elseif ($record::RECORD_TYPE === 'NOTE'): ?> - <?= FontAwesome::semanticIcon('note', I18N::translate('Note')) ?> - <?php elseif ($record::RECORD_TYPE === 'SOUR'): ?> - <?= FontAwesome::semanticIcon('source', I18N::translate('Source')) ?> - <?php elseif ($record::RECORD_TYPE === 'SUBM'): ?> - <?= FontAwesome::semanticIcon('submitter', I18N::translate('Submitter')) ?> - <?php elseif ($record::RECORD_TYPE === 'REPO'): ?> - <?= FontAwesome::semanticIcon('repository', I18N::translate('Repository')) ?> - <?php endif ?> - </td> - <td data-sort="<?= e($record->getSortName()) ?>"> - <a href="<?= e($record->url()) ?>"><?= $record->getFullName() ?></a> - </td> - <td data-sort="<?= $record->lastChangeTimestamp(true) ?>"> - <?= $record->lastChangeTimestamp() ?> - </td> - <?php if ($show_user): ?> - <td> - <?= e($record->lastChangeUser()) ?> - </td> - <?php endif ?> - </tr> - <?php endforeach ?> - </tbody> + <thead> + <tr> + <th> + <span class="sr-only"> + <?= I18N::translate('Type') ?> + </span> + </th> + <th> + <?= I18N::translate('Record') ?> + </th> + <th> + <?= I18N::translate('Last change') ?> + </th> + <?php if ($show_user) : ?> + <th> + <?= I18N::translate('User') ?> + </th> + <?php endif ?> + </tr> + </thead> + <tbody> + <?php foreach ($records as $record) : ?> + <tr> + <td data-sort="<?= $record::RECORD_TYPE ?>" class="text-centre"> + <?php if ($record::RECORD_TYPE === 'INDI') : ?> + <?= FontAwesome::semanticIcon('individual', I18N::translate('Individual')) ?> + <?php elseif ($record::RECORD_TYPE === 'FAM') : ?> + <?= FontAwesome::semanticIcon('family', I18N::translate('Family')) ?> + <?php elseif ($record::RECORD_TYPE === 'OBJE') : ?> + <?= FontAwesome::semanticIcon('media', I18N::translate('Media')) ?> + <?php elseif ($record::RECORD_TYPE === 'NOTE') : ?> + <?= FontAwesome::semanticIcon('note', I18N::translate('Note')) ?> + <?php elseif ($record::RECORD_TYPE === 'SOUR') : ?> + <?= FontAwesome::semanticIcon('source', I18N::translate('Source')) ?> + <?php elseif ($record::RECORD_TYPE === 'SUBM') : ?> + <?= FontAwesome::semanticIcon('submitter', I18N::translate('Submitter')) ?> + <?php elseif ($record::RECORD_TYPE === 'REPO') : ?> + <?= FontAwesome::semanticIcon('repository', I18N::translate('Repository')) ?> + <?php endif ?> + </td> + <td data-sort="<?= e($record->getSortName()) ?>"> + <a href="<?= e($record->url()) ?>"><?= $record->getFullName() ?></a> + </td> + <td data-sort="<?= $record->lastChangeTimestamp(true) ?>"> + <?= $record->lastChangeTimestamp() ?> + </td> + <?php if ($show_user) : ?> + <td> + <?= e($record->lastChangeUser()) ?> + </td> + <?php endif ?> + </tr> + <?php endforeach ?> + </tbody> </table> <?php View::push('javascript') ?> diff --git a/resources/views/modules/recent_changes/config.php b/resources/views/modules/recent_changes/config.php index 32bfd9f2b8..cf44fd55e8 100644 --- a/resources/views/modules/recent_changes/config.php +++ b/resources/views/modules/recent_changes/config.php @@ -3,38 +3,38 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="days"> - <?= I18N::translate('Number of days to show') ?> - </label> - <div class="col-sm-9"> - <input class="form-control" id="days" name="days" type="text" value="<?= e($days) ?>"> - <?= I18N::plural('maximum %s day', 'maximum %s days', $max_days, I18N::number($max_days)) ?> - </div> + <label class="col-sm-3 col-form-label" for="days"> + <?= I18N::translate('Number of days to show') ?> + </label> + <div class="col-sm-9"> + <input class="form-control" id="days" name="days" type="text" value="<?= e($days) ?>"> + <?= I18N::plural('maximum %s day', 'maximum %s days', $max_days, I18N::number($max_days)) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="infoStyle"> - <?= I18N::translate('Presentation style') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> - </div> + <label class="col-sm-3 col-form-label" for="infoStyle"> + <?= I18N::translate('Presentation style') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="sortStyle"> - <?= I18N::translate('Sort order') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($sort_styles, $sortStyle, ['id' => 'sortStyle', 'name' => 'sortStyle']) ?> - </div> + <label class="col-sm-3 col-form-label" for="sortStyle"> + <?= I18N::translate('Sort order') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($sort_styles, $sortStyle, ['id' => 'sortStyle', 'name' => 'sortStyle']) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="show_usere"> - <?= /* I18N: label for a yes/no option */ I18N::translate('Show the user who made the change') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('show_user', FunctionsEdit::optionsNoYes(), $show_user, true) ?> - </div> + <label class="col-sm-3 col-form-label" for="show_usere"> + <?= /* I18N: label for a yes/no option */ I18N::translate('Show the user who made the change') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('show_user', FunctionsEdit::optionsNoYes(), $show_user, true) ?> + </div> </div> diff --git a/resources/views/modules/relationships_chart/config.php b/resources/views/modules/relationships_chart/config.php index 862e115761..13c20ce21d 100644 --- a/resources/views/modules/relationships_chart/config.php +++ b/resources/views/modules/relationships_chart/config.php @@ -5,42 +5,42 @@ <h1><?= $title ?></h1> <p> - <?= I18N::translate('Searching for all possible relationships can take a lot of time in complex trees.') ?> + <?= I18N::translate('Searching for all possible relationships can take a lot of time in complex trees.') ?> </p> <form method="post"> - <?= csrf_field() ?> - <?php foreach ($all_trees as $tree): ?> - <h2><?= e($tree->getTitle()) ?></h2> - <div class="row form-group"> - <label class="col-sm-3 col-form-label" for="relationship-ancestors-<?= $tree->getTreeId() ?>"> - <?= /* I18N: Configuration option */ - I18N::translate('Relationships') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($ancestors_options, $tree->getPreference('RELATIONSHIP_ANCESTORS', $default_ancestors), ['id' => 'relationship-ancestors-' . $tree->getTreeId(), 'name' => 'relationship-ancestors-' . $tree->getTreeId()]) ?> - </div> - </div> + <?= csrf_field() ?> + <?php foreach ($all_trees as $tree) : ?> + <h2><?= e($tree->getTitle()) ?></h2> + <div class="row form-group"> + <label class="col-sm-3 col-form-label" for="relationship-ancestors-<?= $tree->getTreeId() ?>"> + <?= /* I18N: Configuration option */ + I18N::translate('Relationships') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($ancestors_options, $tree->getPreference('RELATIONSHIP_ANCESTORS', $default_ancestors), ['id' => 'relationship-ancestors-' . $tree->getTreeId(), 'name' => 'relationship-ancestors-' . $tree->getTreeId()]) ?> + </div> + </div> - <fieldset class="form-group"> - <div class="row"> - <legend class="col-form-label col-sm-3"> - <?= /* I18N: Configuration option */ - I18N::translate('How much recursion to use when searching for relationships') ?> - </legend> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('relationship-recursion-' . $tree->getTreeId(), $recursion_options, $tree->getPreference('RELATIONSHIP_RECURSION', $default_recursion), true) ?> - </div> - </div> - </fieldset> - <?php endforeach ?> + <fieldset class="form-group"> + <div class="row"> + <legend class="col-form-label col-sm-3"> + <?= /* I18N: Configuration option */ + I18N::translate('How much recursion to use when searching for relationships') ?> + </legend> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('relationship-recursion-' . $tree->getTreeId(), $recursion_options, $tree->getPreference('RELATIONSHIP_RECURSION', $default_recursion), true) ?> + </div> + </div> + </fieldset> + <?php endforeach ?> - <div class="row form-group"> - <div class="offset-sm-3 col-sm-9"> - <button type="submit" class="btn btn-primary"> + <div class="row form-group"> + <div class="offset-sm-3 col-sm-9"> + <button type="submit" class="btn btn-primary"> <?= view('icons/save') ?> - <?= I18N::translate('save') ?> - </button> - </div> - </div> + <?= I18N::translate('save') ?> + </button> + </div> + </div> </form> diff --git a/resources/views/modules/relatives/family.php b/resources/views/modules/relatives/family.php index 1a1e82099c..51727f8fc5 100644 --- a/resources/views/modules/relatives/family.php +++ b/resources/views/modules/relatives/family.php @@ -6,209 +6,209 @@ <?php use Fisharebest\Webtrees\Theme; ?> <table class="table table-sm wt-facts-table"> - <caption> - <i class="icon-cfamily"></i> - <a href="<?= e($family->url()) ?>"><?= $label ?></a> - </caption> + <caption> + <i class="icon-cfamily"></i> + <a href="<?= e($family->url()) ?>"><?= $label ?></a> + </caption> - <tbody> - <?php - $found = false; - foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) { - $found |= !$fact->isPendingDeletion(); - $person = $fact->getTarget(); - if ($person instanceof Individual) { - $row_class = 'wt-gender-' . $person->getSex(); - if ($fact->isPendingAddition()) { - $row_class .= ' new'; - } elseif ($fact->isPendingDeletion()) { - $row_class .= ' old'; - } - ?> - <tr class="<?= $row_class ?>"> - <th scope="row"> - <?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?> - <?= Functions::getCloseRelationshipName($individual, $person) ?> - </th> - <td class="border-0 p-0"> - <?= Theme::theme()->individualBoxLarge($person) ?> - </td> - </tr> - <?php - } - } - if (!$found && $family->canEdit()) { - ?> - <tr> - <th scope="row"></th> - <td> - <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'famtag' => 'HUSB'])) ?>"> - <?= I18N::translate('Add a husband to this family') ?> - </a> - </td> - </tr> - <?php - } + <tbody> + <?php + $found = false; + foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) { + $found |= !$fact->isPendingDeletion(); + $person = $fact->getTarget(); + if ($person instanceof Individual) { + $row_class = 'wt-gender-' . $person->getSex(); + if ($fact->isPendingAddition()) { + $row_class .= ' new'; + } elseif ($fact->isPendingDeletion()) { + $row_class .= ' old'; + } + ?> + <tr class="<?= $row_class ?>"> + <th scope="row"> + <?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?> + <?= Functions::getCloseRelationshipName($individual, $person) ?> + </th> + <td class="border-0 p-0"> + <?= Theme::theme()->individualBoxLarge($person) ?> + </td> + </tr> + <?php + } + } + if (!$found && $family->canEdit()) { + ?> + <tr> + <th scope="row"></th> + <td> + <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'famtag' => 'HUSB'])) ?>"> + <?= I18N::translate('Add a husband to this family') ?> + </a> + </td> + </tr> + <?php + } - $found = false; - foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) { - $person = $fact->getTarget(); - if ($person instanceof Individual) { - $found |= !$fact->isPendingDeletion(); - $row_class = 'wt-gender-' . $person->getSex(); - if ($fact->isPendingAddition()) { - $row_class .= ' new'; - } elseif ($fact->isPendingDeletion()) { - $row_class .= ' old'; - } - ?> + $found = false; + foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) { + $person = $fact->getTarget(); + if ($person instanceof Individual) { + $found |= !$fact->isPendingDeletion(); + $row_class = 'wt-gender-' . $person->getSex(); + if ($fact->isPendingAddition()) { + $row_class .= ' new'; + } elseif ($fact->isPendingDeletion()) { + $row_class .= ' old'; + } + ?> - <tr class="<?= $row_class ?>"> - <th scope="row"> - <?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?> - <?= Functions::getCloseRelationshipName($individual, $person) ?> - </th> - <td class="border-0 p-0"> - <?= Theme::theme()->individualBoxLarge($person) ?> - </td> - </tr> - <?php - } - } - if (!$found && $family->canEdit()) { ?> - <tr> - <th scope="row"></th> - <td> - <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'famtag' => 'WIFE'])) ?>"> - <?= I18N::translate('Add a wife to this family') ?> - </a> - </td> - </tr> + <tr class="<?= $row_class ?>"> + <th scope="row"> + <?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?> + <?= Functions::getCloseRelationshipName($individual, $person) ?> + </th> + <td class="border-0 p-0"> + <?= Theme::theme()->individualBoxLarge($person) ?> + </td> + </tr> + <?php + } + } + if (!$found && $family->canEdit()) { ?> + <tr> + <th scope="row"></th> + <td> + <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'famtag' => 'WIFE'])) ?>"> + <?= I18N::translate('Add a wife to this family') ?> + </a> + </td> + </tr> - <?php } ?> + <?php } ?> - <?php - ///// MARR ///// - $found = false; - $prev = new Date(''); - foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) { - $found |= !$fact->isPendingDeletion(); - if ($fact->isPendingAddition()) { - $row_class = 'new'; - } elseif ($fact->isPendingDeletion()) { - $row_class = 'old'; - } else { - $row_class = ''; - } - ?> + <?php + ///// MARR ///// + $found = false; + $prev = new Date(''); + foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) { + $found |= !$fact->isPendingDeletion(); + if ($fact->isPendingAddition()) { + $row_class = 'new'; + } elseif ($fact->isPendingDeletion()) { + $row_class = 'old'; + } else { + $row_class = ''; + } + ?> - <tr class="<?= $row_class ?>"> - <th scope="row"> - </th> - <td> - <?= GedcomTag::getLabelValue($fact->getTag(), $fact->getDate()->display() . ' — ' . $fact->getPlace()->getFullName()) ?> - </td> - </tr> + <tr class="<?= $row_class ?>"> + <th scope="row"> + </th> + <td> + <?= GedcomTag::getLabelValue($fact->getTag(), $fact->getDate()->display() . ' — ' . $fact->getPlace()->getFullName()) ?> + </td> + </tr> - <?php - if (!$prev->isOK() && $fact->getDate()->isOK()) { - $prev = $fact->getDate(); - } - } + <?php + if (!$prev->isOK() && $fact->getDate()->isOK()) { + $prev = $fact->getDate(); + } + } - if (!$found && $family->canShow() && $family->canEdit()) { - ?> - <tr> - <th scope="row"> - </th> - <td> - <a href="<?= e(route('add-fact', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'fact' => 'MARR'])) ?>"> - <?= I18N::translate('Add marriage details') ?> - </a> - </td> - </tr> - <?php - } + if (!$found && $family->canShow() && $family->canEdit()) { + ?> + <tr> + <th scope="row"> + </th> + <td> + <a href="<?= e(route('add-fact', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'fact' => 'MARR'])) ?>"> + <?= I18N::translate('Add marriage details') ?> + </a> + </td> + </tr> + <?php + } - ///// CHIL ///// - $child_number = 0; - foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) { - $person = $fact->getTarget(); - if ($person instanceof Individual) { - $row_class = 'wt-gender-' . $person->getSex(); - if ($fact->isPendingAddition()) { - $child_number++; - $row_class .= ' new'; - } elseif ($fact->isPendingDeletion()) { - $row_class .= ' old'; - } else { - $child_number++; - } - $next = new Date(''); - foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) { - if ($bfact->getDate()->isOK()) { - $next = $bfact->getDate(); - break; - } - } - ?> + ///// CHIL ///// + $child_number = 0; + foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) { + $person = $fact->getTarget(); + if ($person instanceof Individual) { + $row_class = 'wt-gender-' . $person->getSex(); + if ($fact->isPendingAddition()) { + $child_number++; + $row_class .= ' new'; + } elseif ($fact->isPendingDeletion()) { + $row_class .= ' old'; + } else { + $child_number++; + } + $next = new Date(''); + foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) { + if ($bfact->getDate()->isOK()) { + $next = $bfact->getDate(); + break; + } + } + ?> - <tr class="<?= $row_class ?>"> - <th scope="row"> - <?php if ($individual === $person): ?> - <i class="icon-selected"></i> - <?php endif ?> + <tr class="<?= $row_class ?>"> + <th scope="row"> + <?php if ($individual === $person) : ?> + <i class="icon-selected"></i> + <?php endif ?> - <?php if ($prev->isOK() && $next->isOK()): ?> - <div class="elderdate age"> - <?php $days = $next->maximumJulianDay() - $prev->minimumJulianDay(); ?> - <?php if ($days < 0 || $child_number > 1 && $days > 1 && $days < 240): ?> - <i class="icon-warning"></i> - <?php endif ?> + <?php if ($prev->isOK() && $next->isOK()) : ?> + <div class="elderdate age"> + <?php $days = $next->maximumJulianDay() - $prev->minimumJulianDay(); ?> + <?php if ($days < 0 || $child_number > 1 && $days > 1 && $days < 240) : ?> + <i class="icon-warning"></i> + <?php endif ?> - <?php $months = round($days / 30); ?> - <?php if (abs($months) === 12 || abs($months) >= 24): ?> - <?= I18N::plural('%s year', '%s years', round($months / 12), I18N::number(round($months / 12))) ?> - <?php elseif ($months !== 0): ?> - <?= I18N::plural('%s month', '%s months', $months, I18N::number($months)) ?> - <?php endif ?> - </div> - <?php endif ?> + <?php $months = round($days / 30); ?> + <?php if (abs($months) === 12 || abs($months) >= 24) : ?> + <?= I18N::plural('%s year', '%s years', round($months / 12), I18N::number(round($months / 12))) ?> + <?php elseif ($months !== 0) : ?> + <?= I18N::plural('%s month', '%s months', $months, I18N::number($months)) ?> + <?php endif ?> + </div> + <?php endif ?> - <?= Functions::getCloseRelationshipName($individual, $person) ?> - </th> - <td class="border-0 p-0"> - <?= Theme::theme()->individualBoxLarge($person) ?> - </td> - </tr> - <?php - $prev = $next; - } - } ?> + <?= Functions::getCloseRelationshipName($individual, $person) ?> + </th> + <td class="border-0 p-0"> + <?= Theme::theme()->individualBoxLarge($person) ?> + </td> + </tr> + <?php + $prev = $next; + } + } ?> - <?php if ($family->canEdit()): ?> - <tr> - <th scope="row"> - <?php if (count($family->getChildren()) > 1): ?> - <a href="<?= e(route('reorder-children', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>"> - <i class="icon-media-shuffle"></i> <?= I18N::translate('Re-order children') ?> - </a> - <?php endif; ?> - </th> - <td> - <a href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>"> - <?php if ($type == 'FAMS'): ?> - <?= I18N::translate('Add a son or daughter') ?> - <?php else: ?> - <?= I18N::translate('Add a brother or sister') ?> - <?php endif ?> - </a> + <?php if ($family->canEdit()) : ?> + <tr> + <th scope="row"> + <?php if (count($family->getChildren()) > 1) : ?> + <a href="<?= e(route('reorder-children', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>"> + <i class="icon-media-shuffle"></i> <?= I18N::translate('Re-order children') ?> + </a> + <?php endif; ?> + </th> + <td> + <a href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>"> + <?php if ($type == 'FAMS') : ?> + <?= I18N::translate('Add a son or daughter') ?> + <?php else : ?> + <?= I18N::translate('Add a brother or sister') ?> + <?php endif ?> + </a> - <a href="<?= e(route('add-child-to-family', ['gender' => 'M', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>" class="icon-sex_m_15x15"></a> + <a href="<?= e(route('add-child-to-family', ['gender' => 'M', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>" class="icon-sex_m_15x15"></a> - <a href="<?= e(route('add-child-to-family', ['gender' => 'F', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>" class="icon-sex_f_15x15"></a> - </td> - </tr> - <?php endif ?> - </tbody> + <a href="<?= e(route('add-child-to-family', ['gender' => 'F', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>" class="icon-sex_f_15x15"></a> + </td> + </tr> + <?php endif ?> + </tbody> </table> diff --git a/resources/views/modules/relatives/tab.php b/resources/views/modules/relatives/tab.php index 88d97f9ee3..38e1fd4692 100644 --- a/resources/views/modules/relatives/tab.php +++ b/resources/views/modules/relatives/tab.php @@ -2,138 +2,138 @@ <?php use Fisharebest\Webtrees\View; ?> <div class="wt-sources-tab py-4"> - <table class="table table-sm wt-facts-table" role="presentation"> - <tbody> - <tr> - <td> - <label> - <input id="show-date-differences" type="checkbox" checked> - <?= I18N::translate('Date differences') ?> - </label> - </td> - </tr> - </tbody> + <table class="table table-sm wt-facts-table" role="presentation"> + <tbody> + <tr> + <td> + <label> + <input id="show-date-differences" type="checkbox" checked> + <?= I18N::translate('Date differences') ?> + </label> + </td> + </tr> + </tbody> </table> -<?php if (empty($parent_families) && $can_edit): ?> - <table class="table table-sm wt-facts-table" role="presentation"> - <tbody> - <tr> - <td> - <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'M'])) ?>"> - <?= I18N::translate('Add a father') ?> - </a> - </td> - </tr> - <tr> - <td> - <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'F'])) ?>"> - <?= I18N::translate('Add a mother') ?> - </a> - </td> - </tr> - </tbody> - </table> +<?php if (empty($parent_families) && $can_edit) : ?> + <table class="table table-sm wt-facts-table" role="presentation"> + <tbody> + <tr> + <td> + <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'M'])) ?>"> + <?= I18N::translate('Add a father') ?> + </a> + </td> + </tr> + <tr> + <td> + <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'F'])) ?>"> + <?= I18N::translate('Add a mother') ?> + </a> + </td> + </tr> + </tbody> + </table> <?php endif ?> <!-- Parents --> -<?php foreach ($parent_families as $family): ?> - <?= view('modules/relatives/family', [ - 'individual' => $individual, - 'family' => $family, - 'type' => 'FAMC', - 'label' => $individual->getChildFamilyLabel($family), - 'fam_access_level' => $fam_access_level, - ]) ?> +<?php foreach ($parent_families as $family) : ?> + <?= view('modules/relatives/family', [ + 'individual' => $individual, + 'family' => $family, + 'type' => 'FAMC', + 'label' => $individual->getChildFamilyLabel($family), + 'fam_access_level' => $fam_access_level, + ]) ?> <?php endforeach ?> <!-- step-parents --> -<?php foreach ($step_parent_families as $family): ?> - <?= view('modules/relatives/family', [ - 'individual' => $individual, - 'family' => $family, - 'type' => 'FAMC', - 'label' => $individual->getStepFamilyLabel($family), - 'fam_access_level' => $fam_access_level, - ]) ?> +<?php foreach ($step_parent_families as $family) : ?> + <?= view('modules/relatives/family', [ + 'individual' => $individual, + 'family' => $family, + 'type' => 'FAMC', + 'label' => $individual->getStepFamilyLabel($family), + 'fam_access_level' => $fam_access_level, + ]) ?> <?php endforeach ?> <!-- spouses --> -<?php foreach ($spouse_families as $family): ?> - <?= view('modules/relatives/family', [ - 'individual' => $individual, - 'family' => $family, - 'type' => 'FAMS', - 'label' => $individual->getSpouseFamilyLabel($family), - 'fam_access_level' => $fam_access_level, - ]) ?> +<?php foreach ($spouse_families as $family) : ?> + <?= view('modules/relatives/family', [ + 'individual' => $individual, + 'family' => $family, + 'type' => 'FAMS', + 'label' => $individual->getSpouseFamilyLabel($family), + 'fam_access_level' => $fam_access_level, + ]) ?> <?php endforeach ?> <!-- step-children --> -<?php foreach ($step_child_familiess as $family): ?> - <?= view('modules/relatives/family', [ - 'individual' => $individual, - 'family' => $family, - 'type' => 'FAMS', - 'label' => $family->getFullName(), - 'fam_access_level' => $fam_access_level, - ]) ?> +<?php foreach ($step_child_familiess as $family) : ?> + <?= view('modules/relatives/family', [ + 'individual' => $individual, + 'family' => $family, + 'type' => 'FAMS', + 'label' => $family->getFullName(), + 'fam_access_level' => $fam_access_level, + ]) ?> <?php endforeach ?> -<?php if ($can_edit): ?> - <br> - <table class="table table-sm wt-facts-table" role="presentation"> - <tbody> - <?php if (count($spouse_families) > 1): ?> - <tr> - <td> - <a href="<?= e(route('reorder-spouses', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> - <?= I18N::translate('Re-order families') ?> - </a> - </td> - </tr> - <?php endif ?> - <tr> - <td> - <a href="<?= e(route('link-child-to-family', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> - <?= I18N::translate('Link this individual to an existing family as a child') ?> - </a> - </td> - </tr> +<?php if ($can_edit) : ?> + <br> + <table class="table table-sm wt-facts-table" role="presentation"> + <tbody> + <?php if (count($spouse_families) > 1) : ?> + <tr> + <td> + <a href="<?= e(route('reorder-spouses', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <?= I18N::translate('Re-order families') ?> + </a> + </td> + </tr> + <?php endif ?> + <tr> + <td> + <a href="<?= e(route('link-child-to-family', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <?= I18N::translate('Link this individual to an existing family as a child') ?> + </a> + </td> + </tr> - <tr> - <td> - <a href="<?= e(route('add-spouse-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> - <?php if ($individual->getSex() !== 'F'): ?> - <?= I18N::translate('Add a wife') ?> - <?php else: ?> - <?= I18N::translate('Add a husband') ?> - <?php endif ?> - </a> - </td> - </tr> + <tr> + <td> + <a href="<?= e(route('add-spouse-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <?php if ($individual->getSex() !== 'F') : ?> + <?= I18N::translate('Add a wife') ?> + <?php else : ?> + <?= I18N::translate('Add a husband') ?> + <?php endif ?> + </a> + </td> + </tr> - <tr> - <td> - <a href="<?= e(route('link-spouse-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> - <?php if ($individual->getSex() !== 'F'): ?> - <?= I18N::translate('Add a wife using an existing individual') ?> - <?php else: ?> - <?= I18N::translate('Add a husband using an existing individual') ?> - <?php endif ?> - </a> - </td> - </tr> + <tr> + <td> + <a href="<?= e(route('link-spouse-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <?php if ($individual->getSex() !== 'F') : ?> + <?= I18N::translate('Add a wife using an existing individual') ?> + <?php else : ?> + <?= I18N::translate('Add a husband using an existing individual') ?> + <?php endif ?> + </a> + </td> + </tr> - <tr> - <td> - <a href="<?= e(route('add-child-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'U'])) ?>"> - <?= I18N::translate('Add a child to create a one-parent family') ?> - </a> - </td> - </tr> - </tbody> - </table> + <tr> + <td> + <a href="<?= e(route('add-child-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'U'])) ?>"> + <?= I18N::translate('Add a child to create a one-parent family') ?> + </a> + </td> + </tr> + </tbody> + </table> <?php endif ?> </div> diff --git a/resources/views/modules/review_changes/config.php b/resources/views/modules/review_changes/config.php index c02a3880f2..551d7bd112 100644 --- a/resources/views/modules/review_changes/config.php +++ b/resources/views/modules/review_changes/config.php @@ -3,25 +3,25 @@ <?php use Fisharebest\Webtrees\I18N; ?> <p> - <?= I18N::translate('This block will show editors a list of records with pending changes that need to be reviewed by a moderator. It also generates daily emails to moderators whenever pending changes exist.') ?> + <?= I18N::translate('This block will show editors a list of records with pending changes that need to be reviewed by a moderator. It also generates daily emails to moderators whenever pending changes exist.') ?> </p> <fieldset class="form-group"> - <div class="row"> - <legend class="col-form-label col-sm-3"> - <?= /* I18N: Label for a configuration option */ I18N::translate('Send out reminder emails') ?> - </legend> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('sendmail', FunctionsEdit::optionsNoYes(), $sendmail, true) ?> - </div> - </div> + <div class="row"> + <legend class="col-form-label col-sm-3"> + <?= /* I18N: Label for a configuration option */ I18N::translate('Send out reminder emails') ?> + </legend> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('sendmail', FunctionsEdit::optionsNoYes(), $sendmail, true) ?> + </div> + </div> </fieldset> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="days"> - <?= I18N::translate('Reminder email frequency (days)') ?> - </label> - <div class="col-sm-9"> - <input class="form-control" type="text" name="days" id="days" value="<?= e($days) ?>"> - </div> + <label class="col-sm-3 col-form-label" for="days"> + <?= I18N::translate('Reminder email frequency (days)') ?> + </label> + <div class="col-sm-9"> + <input class="form-control" type="text" name="days" id="days" value="<?= e($days) ?>"> + </div> </div> diff --git a/resources/views/modules/sitemap/config.php b/resources/views/modules/sitemap/config.php index 412a1f0e9a..5f3f12e255 100644 --- a/resources/views/modules/sitemap/config.php +++ b/resources/views/modules/sitemap/config.php @@ -6,22 +6,22 @@ <h1><?= $title ?></h1> <p> - <?= /* I18N: The www.sitemaps.org site is translated into many languages (e.g. http://www.sitemaps.org/fr/) - choose an appropriate URL. */ I18N::translate('Sitemaps are a way for webmasters to tell search engines about the pages on a website that are available for crawling. All major search engines support sitemaps. For more information, see <a href="http://www.sitemaps.org/">www.sitemaps.org</a>.') ?> + <?= /* I18N: The www.sitemaps.org site is translated into many languages (e.g. http://www.sitemaps.org/fr/) - choose an appropriate URL. */ I18N::translate('Sitemaps are a way for webmasters to tell search engines about the pages on a website that are available for crawling. All major search engines support sitemaps. For more information, see <a href="http://www.sitemaps.org/">www.sitemaps.org</a>.') ?> </p> <p> - <?= /* I18N: Label for a configuration option */ I18N::translate('Which family trees should be included in the sitemaps') ?> + <?= /* I18N: Label for a configuration option */ I18N::translate('Which family trees should be included in the sitemaps') ?> </p> <form action="<?= e(route('module', ['module' => 'sitemap', 'action' => 'Admin'])) ?>" method="post"> - <?= csrf_field() ?> + <?= csrf_field() ?> - <?php foreach ($all_trees as $tree): ?> - <?= Bootstrap4::checkbox($tree->getTitle(), false, ['name' => 'sitemap' . $tree->getTreeId(), 'checked' => (bool) $tree->getPreference('include_in_sitemap')]) ?> -<?php endforeach ?> + <?php foreach ($all_trees as $tree) : ?> + <?= Bootstrap4::checkbox($tree->getTitle(), false, ['name' => 'sitemap' . $tree->getTreeId(), 'checked' => (bool) $tree->getPreference('include_in_sitemap')]) ?> + <?php endforeach ?> <button type="submit" class="btn btn-primary"> - <?= I18N::translate('save') ?> + <?= I18N::translate('save') ?> </button> </form> @@ -29,7 +29,7 @@ <hr> <p> - <?= I18N::translate('To tell search engines that sitemaps are available, you should add the following line to your robots.txt file.') ?> + <?= I18N::translate('To tell search engines that sitemaps are available, you should add the following line to your robots.txt file.') ?> </p> <pre>Sitemap: <?= e($sitemap_url) ?></pre> @@ -37,15 +37,15 @@ <hr> <p> - <?= I18N::translate('To tell search engines that sitemaps are available, you can use the following links.') ?> + <?= I18N::translate('To tell search engines that sitemaps are available, you can use the following links.') ?> </p> <ul> - <?php foreach ($submit_urls as $search_engine => $url): ?> - <li> - <a href="<?= e($url) ?>"> - <?= e($search_engine) ?> - </a> - </li> - <?php endforeach ?> + <?php foreach ($submit_urls as $search_engine => $url) : ?> + <li> + <a href="<?= e($url) ?>"> + <?= e($search_engine) ?> + </a> + </li> + <?php endforeach ?> </ul> diff --git a/resources/views/modules/sitemap/sitemap-file.xml.php b/resources/views/modules/sitemap/sitemap-file.xml.php index d81137909b..451ff3cc32 100644 --- a/resources/views/modules/sitemap/sitemap-file.xml.php +++ b/resources/views/modules/sitemap/sitemap-file.xml.php @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> - <?php foreach ($records as $record): ?> - <url> - <loc><?= e($record->url()) ?></loc> - <?php if ($record->getFirstFact('CHAN') !== null): ?> - <lastmod><?= $record->getFirstFact('CHAN')->getDate()->minimumDate()->Format('%Y-%m-%d') ?></lastmod> - <?php endif ?> - </url> - <?php endforeach ?> + <?php foreach ($records as $record) : ?> + <url> + <loc><?= e($record->url()) ?></loc> + <?php if ($record->getFirstFact('CHAN') !== null) : ?> + <lastmod><?= $record->getFirstFact('CHAN')->getDate()->minimumDate()->Format('%Y-%m-%d') ?></lastmod> + <?php endif ?> + </url> + <?php endforeach ?> </urlset> diff --git a/resources/views/modules/sitemap/sitemap-index.xml.php b/resources/views/modules/sitemap/sitemap-index.xml.php index 4daf2fe59c..62b5e79643 100644 --- a/resources/views/modules/sitemap/sitemap-index.xml.php +++ b/resources/views/modules/sitemap/sitemap-index.xml.php @@ -1,68 +1,68 @@ <?xml version="1.0" encoding="UTF-8" ?> <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> - <?php foreach ($count_individuals as $tree_id => $count): ?> - <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i): ?> - <sitemap> - <loc> - <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-i-' . $i])) ?> - </loc> - <lastmod> - <?= $last_mod ?> - </lastmod> - </sitemap> - <?php endfor ?> - <?php endforeach ?> - - <?php foreach ($count_media as $tree_id => $count): ?> - <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i): ?> - <sitemap> - <loc> - <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-m-' . $i])) ?> - </loc> - <lastmod> - <?= $last_mod ?> - </lastmod> - </sitemap> - <?php endfor ?> - <?php endforeach ?> + <?php foreach ($count_individuals as $tree_id => $count) : ?> + <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i) : ?> + <sitemap> + <loc> + <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-i-' . $i])) ?> + </loc> + <lastmod> + <?= $last_mod ?> + </lastmod> + </sitemap> + <?php endfor ?> + <?php endforeach ?> + + <?php foreach ($count_media as $tree_id => $count) : ?> + <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i) : ?> + <sitemap> + <loc> + <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-m-' . $i])) ?> + </loc> + <lastmod> + <?= $last_mod ?> + </lastmod> + </sitemap> + <?php endfor ?> + <?php endforeach ?> - <?php foreach ($count_notes as $tree_id => $count): ?> - <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i): ?> - <sitemap> - <loc> - <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-i-' . $i])) ?> - </loc> - <lastmod> - <?= $last_mod ?> - </lastmod> - </sitemap> - <?php endfor ?> - <?php endforeach ?> - - <?php foreach ($count_repositories as $tree_id => $count): ?> - <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i): ?> - <sitemap> - <loc> - <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-r-' . $i])) ?> - </loc> - <lastmod> - <?= $last_mod ?> - </lastmod> - </sitemap> - <?php endfor ?> - <?php endforeach ?> + <?php foreach ($count_notes as $tree_id => $count) : ?> + <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i) : ?> + <sitemap> + <loc> + <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-i-' . $i])) ?> + </loc> + <lastmod> + <?= $last_mod ?> + </lastmod> + </sitemap> + <?php endfor ?> + <?php endforeach ?> + + <?php foreach ($count_repositories as $tree_id => $count) : ?> + <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i) : ?> + <sitemap> + <loc> + <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-r-' . $i])) ?> + </loc> + <lastmod> + <?= $last_mod ?> + </lastmod> + </sitemap> + <?php endfor ?> + <?php endforeach ?> - <?php foreach ($count_sources as $tree_id => $count): ?> - <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i): ?> - <sitemap> - <loc> - <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-s-' . $i])) ?> - </loc> - <lastmod> - <?= $last_mod ?> - </lastmod> - </sitemap> - <?php endfor ?> - <?php endforeach ?> + <?php foreach ($count_sources as $tree_id => $count) : ?> + <?php for ($i = 0; $i <= $count / $records_per_volume; ++$i) : ?> + <sitemap> + <loc> + <?= e(route('module', ['module' => 'sitemap', 'action' => 'File', 'file' => $tree_id . '-s-' . $i])) ?> + </loc> + <lastmod> + <?= $last_mod ?> + </lastmod> + </sitemap> + <?php endfor ?> + <?php endforeach ?> </sitemapindex> diff --git a/resources/views/modules/sources_tab/tab.php b/resources/views/modules/sources_tab/tab.php index 2132edf4e8..7bb486123a 100644 --- a/resources/views/modules/sources_tab/tab.php +++ b/resources/views/modules/sources_tab/tab.php @@ -3,42 +3,42 @@ <?php use Fisharebest\Webtrees\View; ?> <div class="wt-sources-tab py-4"> - <table class="table wt-facts-table"> - <tr> - <td colspan="2"> - <label> - <input id="show-level-2-sources" type="checkbox"> - <?= I18N::translate('Show all sources') ?> - </label> - </td> - </tr> + <table class="table wt-facts-table"> + <tr> + <td colspan="2"> + <label> + <input id="show-level-2-sources" type="checkbox"> + <?= I18N::translate('Show all sources') ?> + </label> + </td> + </tr> - <?php foreach ($facts as $fact): ?> - <?php FunctionsPrintFacts::printMainSources($fact, 1) ?> - <?php FunctionsPrintFacts::printMainSources($fact, 2) ?> - <?php endforeach ?> + <?php foreach ($facts as $fact) : ?> + <?php FunctionsPrintFacts::printMainSources($fact, 1) ?> + <?php FunctionsPrintFacts::printMainSources($fact, 2) ?> + <?php endforeach ?> - <?php if (empty($facts)): ?> - <tr> - <td colspan="2"> - <?= I18N::translate('There are no source citations for this individual.') ?> - </td> - </tr> - <?php endif ?> + <?php if (empty($facts)) : ?> + <tr> + <td colspan="2"> + <?= I18N::translate('There are no source citations for this individual.') ?> + </td> + </tr> + <?php endif ?> - <?php if ($can_edit): ?> - <tr> - <th scope="row"> - <?= I18N::translate('Source') ?> - </th> - <td> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'SOUR'])) ?>"> - <?= I18N::translate('Add a source citation') ?> - </a> - </td> - </tr> - <?php endif ?> - </table> + <?php if ($can_edit) : ?> + <tr> + <th scope="row"> + <?= I18N::translate('Source') ?> + </th> + <td> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'SOUR'])) ?>"> + <?= I18N::translate('Add a source citation') ?> + </a> + </td> + </tr> + <?php endif ?> + </table> </div> <?php View::push('javascript') ?> diff --git a/resources/views/modules/stories/config.php b/resources/views/modules/stories/config.php index 84878a8c6c..82026dd0a8 100644 --- a/resources/views/modules/stories/config.php +++ b/resources/views/modules/stories/config.php @@ -6,67 +6,67 @@ <h1><?= $title ?></h1> <form class="form-inline mb-4"> - <input type="hidden" name="route" value="module"> - <input type="hidden" name="module" value="stories"> - <input type="hidden" name="action" value="Admin"> + <input type="hidden" name="route" value="module"> + <input type="hidden" name="module" value="stories"> + <input type="hidden" name="action" value="Admin"> - <label for="ged" class="sr-only"> - <?= I18N::translate('Family tree') ?> - </label> + <label for="ged" class="sr-only"> + <?= I18N::translate('Family tree') ?> + </label> - <?= Bootstrap4::select($tree_names, $tree->getName(), ['id' => 'ged', 'name' => 'ged']) ?> - <button type="submit" class="btn btn-primary"> - <?= I18N::translate('show') ?> - </button> + <?= Bootstrap4::select($tree_names, $tree->getName(), ['id' => 'ged', 'name' => 'ged']) ?> + <button type="submit" class="btn btn-primary"> + <?= I18N::translate('show') ?> + </button> </form> <p> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link"> <?= view('icons/add') ?> - <?= I18N::translate('Add a story') ?> - </a> + <?= I18N::translate('Add a story') ?> + </a> </p> <table class="table table-bordered table-sm"> - <thead> - <tr> - <th><?= I18N::translate('Individual') ?></th> - <th><?= I18N::translate('Story title') ?></th> - <th><?= I18N::translate('Edit') ?></th> - <th><?= I18N::translate('Delete') ?></th> - </tr> - </thead> - <tbody> - <?php foreach ($stories as $story): ?> - <tr> - <td> - <?php if ($story->individual !== null): ?> - <a href="<?= e($story->individual->url()) ?>#tab-stories"> - <?= $story->individual->getFullName() ?> - </a> - <?php else: ?> - <?= $story->xref ?> - <?php endif ?> - </td> - <td> - <?= e($story->title) ?> - </td> - <td> - <a class="btn btn-primary" href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>"> + <thead> + <tr> + <th><?= I18N::translate('Individual') ?></th> + <th><?= I18N::translate('Story title') ?></th> + <th><?= I18N::translate('Edit') ?></th> + <th><?= I18N::translate('Delete') ?></th> + </tr> + </thead> + <tbody> + <?php foreach ($stories as $story) : ?> + <tr> + <td> + <?php if ($story->individual !== null) : ?> + <a href="<?= e($story->individual->url()) ?>#tab-stories"> + <?= $story->individual->getFullName() ?> + </a> + <?php else : ?> + <?= $story->xref ?> + <?php endif ?> + </td> + <td> + <?= e($story->title) ?> + </td> + <td> + <a class="btn btn-primary" href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>"> <?= view('icons/edit') ?> <?= I18N::translate('Edit') ?> - </a> - </td> - <td> - <form action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminDelete', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>" method="post"> - <?= csrf_field() ?> - <button type="submit" class="btn btn-danger" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($story->title)) ?>" onclick="return confirm(this.dataset.confirm);"> + </a> + </td> + <td> + <form action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminDelete', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>" method="post"> + <?= csrf_field() ?> + <button type="submit" class="btn btn-danger" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($story->title)) ?>" onclick="return confirm(this.dataset.confirm);"> <?= view('icons/delete') ?> <?= I18N::translate('Delete') ?> - </button> - </form> - </td> - </tr> - <?php endforeach ?> - </tbody> + </button> + </form> + </td> + </tr> + <?php endforeach ?> + </tbody> </table> diff --git a/resources/views/modules/stories/edit.php b/resources/views/modules/stories/edit.php index f369cd4f7f..7265dd04cc 100644 --- a/resources/views/modules/stories/edit.php +++ b/resources/views/modules/stories/edit.php @@ -6,57 +6,57 @@ <h1><?= $title ?></h1> <form class="form-horizontal" method="post" action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $block_id, 'ged' => $tree->getName()])) ?>"> - <?= csrf_field() ?> + <?= csrf_field() ?> - <div class="row form-group"> - <label for="xref" class="col-sm-3 col-form-label"> - <?= I18N::translate('Individual') ?> - </label> - <div class="col-sm-9"> - <?= FunctionsEdit::formControlIndividual($tree, $individual, ['id' => 'xref', 'name' => 'xref']) ?> - </div> - </div> + <div class="row form-group"> + <label for="xref" class="col-sm-3 col-form-label"> + <?= I18N::translate('Individual') ?> + </label> + <div class="col-sm-9"> + <?= FunctionsEdit::formControlIndividual($tree, $individual, ['id' => 'xref', 'name' => 'xref']) ?> + </div> + </div> - <div class="row form-group"> - <label for="story-title" class="col-sm-3 col-form-label"> - <?= I18N::translate('Story title') ?> - </label> - <div class="col-sm-9"> - <input type="text" class="form-control" name="story_title" id="story-title" value="<?= e($story_title) ?>"> - </div> - </div> + <div class="row form-group"> + <label for="story-title" class="col-sm-3 col-form-label"> + <?= I18N::translate('Story title') ?> + </label> + <div class="col-sm-9"> + <input type="text" class="form-control" name="story_title" id="story-title" value="<?= e($story_title) ?>"> + </div> + </div> - <div class="row form-group"> - <label for="story-body" class="col-sm-3 col-form-label"> - <?= I18N::translate('Story') ?> - </label> - <div class="col-sm-9"> - <textarea name="story_body" id="story-body" class="html-edit form-control" rows="10"><?= e($story_body) ?></textarea> - </div> - </div> + <div class="row form-group"> + <label for="story-body" class="col-sm-3 col-form-label"> + <?= I18N::translate('Story') ?> + </label> + <div class="col-sm-9"> + <textarea name="story_body" id="story-body" class="html-edit form-control" rows="10"><?= e($story_body) ?></textarea> + </div> + </div> - <div class="row form-group"> - <label class="col-sm-3 col-form-label"> - <?= I18N::translate('Show this block for which languages') ?> - </label> - <div class="col-sm-9"> - <?= FunctionsEdit::editLanguageCheckboxes('languages', $languages) ?> - </div> - </div> + <div class="row form-group"> + <label class="col-sm-3 col-form-label"> + <?= I18N::translate('Show this block for which languages') ?> + </label> + <div class="col-sm-9"> + <?= FunctionsEdit::editLanguageCheckboxes('languages', $languages) ?> + </div> + </div> - <div class="row form-group"> - <div class="offset-sm-3 col-sm-9"> - <button type="submit" class="btn btn-primary"> + <div class="row form-group"> + <div class="offset-sm-3 col-sm-9"> + <button type="submit" class="btn btn-primary"> <?= view('icons/save') ?> - <?= I18N::translate('save') ?> - </button> + <?= I18N::translate('save') ?> + </button> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->getName()])) ?>" class="btn btn-secondary"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->getName()])) ?>" class="btn btn-secondary"> <?= view('icons/cancel') ?> - <?= I18N::translate('cancel') ?> - </a> - </div> - </div> + <?= I18N::translate('cancel') ?> + </a> + </div> + </div> </form> <?= view('modules/ckeditor/ckeditor-js') ?> diff --git a/resources/views/modules/stories/list.php b/resources/views/modules/stories/list.php index c4a18b74b2..fd394ba5fd 100644 --- a/resources/views/modules/stories/list.php +++ b/resources/views/modules/stories/list.php @@ -4,26 +4,26 @@ <h2 class="wt-page-title"><?= $title ?></h2> <table id="story_table" class="w-100"> - <thead> - <tr> - <th><?= I18N::translate('Story title') ?></th> - <th><?= I18N::translate('Individual') ?></th> - </tr> - </thead> - <tbody> - <?php foreach ($stories as $story): ?> - <tr> - <td> - <?= e($story->title) ?> - </td> - <td> - <a href="<?= e($story->individual->url()) ?>#tab-stories"> - <?= $story->individual->getFullName() ?> - </a> - </td> - </tr> - <?php endforeach ?> - </tbody> + <thead> + <tr> + <th><?= I18N::translate('Story title') ?></th> + <th><?= I18N::translate('Individual') ?></th> + </tr> + </thead> + <tbody> + <?php foreach ($stories as $story) : ?> + <tr> + <td> + <?= e($story->title) ?> + </td> + <td> + <a href="<?= e($story->individual->url()) ?>#tab-stories"> + <?= $story->individual->getFullName() ?> + </a> + </td> + </tr> + <?php endforeach ?> + </tbody> </table> <?php View::push('javascript') ?> @@ -38,7 +38,7 @@ info: true, sorting: [[0,"asc"]], columns: [ - /* 0-name */ null, + /* 0-name */ null, /* 1-NAME */ null ], <?= I18N::datatablesI18N() ?> diff --git a/resources/views/modules/stories/tab.php b/resources/views/modules/stories/tab.php index 8ed4205ece..f22a01abce 100644 --- a/resources/views/modules/stories/tab.php +++ b/resources/views/modules/stories/tab.php @@ -1,27 +1,27 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="wt-stories-tab py-4"> - <?php foreach ($stories as $story): ?> - <div class="story_title descriptionbox center rela"> - <?= e($story->title) ?> - </div> - <div class="story_body optionbox"> - <?= $story->story_body ?> - </div> - <?php if ($is_admin): ?> - <div class="story_edit"> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $story->block_id, 'ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Edit the story') ?> - </a> - </div> - <?php endif ?> - <?php endforeach ?> + <?php foreach ($stories as $story) : ?> + <div class="story_title descriptionbox center rela"> + <?= e($story->title) ?> + </div> + <div class="story_body optionbox"> + <?= $story->story_body ?> + </div> + <?php if ($is_admin) : ?> + <div class="story_edit"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $story->block_id, 'ged' => $tree->getName()])) ?>"> + <?= I18N::translate('Edit the story') ?> + </a> + </div> + <?php endif ?> + <?php endforeach ?> - <?php if ($is_admin && empty($stories)): ?> - <div> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'xref' => $individual->getXref(), 'ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Add a story') ?> - </a> - </div> - <?php endif ?> + <?php if ($is_admin && empty($stories)) : ?> + <div> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'xref' => $individual->getXref(), 'ged' => $tree->getName()])) ?>"> + <?= I18N::translate('Add a story') ?> + </a> + </div> + <?php endif ?> </div> diff --git a/resources/views/modules/todays_events/config.php b/resources/views/modules/todays_events/config.php index aca4499fbc..4d408aee70 100644 --- a/resources/views/modules/todays_events/config.php +++ b/resources/views/modules/todays_events/config.php @@ -3,37 +3,37 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="filter"> - <?= I18N::translate('Show only events of living individuals') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('filter', FunctionsEdit::optionsNoYes(), $filter, true) ?> - </div> + <label class="col-sm-3 col-form-label" for="filter"> + <?= I18N::translate('Show only events of living individuals') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('filter', FunctionsEdit::optionsNoYes(), $filter, true) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="events"> - <?= I18N::translate('Events') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::multiSelect($all_events, $event_array, ['id' => 'events', 'name' => 'events[]', 'class' => 'select2']) ?> - </div> + <label class="col-sm-3 col-form-label" for="events"> + <?= I18N::translate('Events') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::multiSelect($all_events, $event_array, ['id' => 'events', 'name' => 'events[]', 'class' => 'select2']) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="infoStyle"> - <?= /* I18N: Label for a configuration option */ I18N::translate('Presentation style') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> - </div> + <label class="col-sm-3 col-form-label" for="infoStyle"> + <?= /* I18N: Label for a configuration option */ I18N::translate('Presentation style') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="sortStyle"> - <?= /* I18N: Label for a configuration option */ I18N::translate('Sort order') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($sort_styles, $sortStyle, ['id' => 'sortStyle', 'name' => 'sortStyle']) ?> - </div> + <label class="col-sm-3 col-form-label" for="sortStyle"> + <?= /* I18N: Label for a configuration option */ I18N::translate('Sort order') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($sort_styles, $sortStyle, ['id' => 'sortStyle', 'name' => 'sortStyle']) ?> + </div> </div> diff --git a/resources/views/modules/todays_events/empty.php b/resources/views/modules/todays_events/empty.php index f74d15a4dc..6f674718da 100644 --- a/resources/views/modules/todays_events/empty.php +++ b/resources/views/modules/todays_events/empty.php @@ -1,5 +1,5 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="details_label"> - <?= I18N::translate('No events exist for today.') ?> + <?= I18N::translate('No events exist for today.') ?> </div> diff --git a/resources/views/modules/todays_events/list.php b/resources/views/modules/todays_events/list.php index dd48eb4872..f5b89e5d39 100644 --- a/resources/views/modules/todays_events/list.php +++ b/resources/views/modules/todays_events/list.php @@ -1,19 +1,19 @@ <?php use Fisharebest\Webtrees\I18N; ?> <?php use Fisharebest\Webtrees\Individual; ?> -<?php foreach ($facts as $fact): ?> - <?php $record = $fact->getParent(); ?> - <a href="<?= e($record->url()) ?>" class="list_item name2"> - <?= $record->getFullName() ?> - </a> - <?php if ($record instanceof Individual): ?> - <?= $record->getSexImage() ?> - <?php endif ?> - <div class="indent"> - <?= $fact->getLabel() . ' — ' . $fact->getDate()->display(true); ?> - <?= ' (' . I18N::timeAgo($fact->anniv * 365 * 24 * 60 * 60) . ')'; ?> - <?php if (!$fact->getPlace()->isEmpty()): ?> - <?= ' — <a href="' . $fact->getPlace()->getURL() . '">' . $fact->getPlace()->getFullName() . '</a>'; ?> - <?php endif ?> - </div> +<?php foreach ($facts as $fact) : ?> + <?php $record = $fact->getParent(); ?> + <a href="<?= e($record->url()) ?>" class="list_item name2"> + <?= $record->getFullName() ?> + </a> + <?php if ($record instanceof Individual) : ?> + <?= $record->getSexImage() ?> + <?php endif ?> + <div class="indent"> + <?= $fact->getLabel() . ' — ' . $fact->getDate()->display(true); ?> + <?= ' (' . I18N::timeAgo($fact->anniv * 365 * 24 * 60 * 60) . ')'; ?> + <?php if (!$fact->getPlace()->isEmpty()) : ?> + <?= ' — <a href="' . $fact->getPlace()->getURL() . '">' . $fact->getPlace()->getFullName() . '</a>'; ?> + <?php endif ?> + </div> <?php endforeach ?> diff --git a/resources/views/modules/todays_events/table.php b/resources/views/modules/todays_events/table.php index 72b142cc66..1447460601 100644 --- a/resources/views/modules/todays_events/table.php +++ b/resources/views/modules/todays_events/table.php @@ -3,47 +3,47 @@ <?php use Fisharebest\Webtrees\View; ?> <table class="table table-sm datatable wt-table-events" data-info="false" data-paging="false" data-searching="false" data-sorting="<?= e('[[1, "asc" ]]') ?>"> - <thead> - <tr> - <th> - <?= I18N::translate('Record') ?> - </th> - <th> - <?= I18N::translate('Date') ?> - </th> - <th> - <i class="icon-reminder"></i> - <span class="sr-only"><?= I18N::translate('Anniversary') ?></span> - </th> - <th> - <?= I18N::translate('Event') ?> - </th> - </tr> - </thead> - <tbody> - <?php foreach ($facts as $fact): ?> - <?php $record = $fact->getParent(); ?> - <tr> - <td data-sort="<?= e($record->getSortName()) ?>"> - <a href="<?= e($record->url()) ?>"> - <?= $record->getFullName() ?> - </a> - <?php if ($record instanceof Individual): ?> - <?= $record->getSexImage() ?> - <?php endif ?> - </td> - <td data-sort="<?= $fact->getDate()->julianDay() ?>"> - <?= $fact->getDate()->display(true); ?> - </td> - <td data-sort="<?= $fact->anniv ?>"> - <?= $fact->anniv ?> - </td> - <td data-sort="<?= $fact->getLabel() ?>"> - <?= $fact->getLabel() ?> - </td> - </tr> - <?php endforeach ?> - </tbody> + <thead> + <tr> + <th> + <?= I18N::translate('Record') ?> + </th> + <th> + <?= I18N::translate('Date') ?> + </th> + <th> + <i class="icon-reminder"></i> + <span class="sr-only"><?= I18N::translate('Anniversary') ?></span> + </th> + <th> + <?= I18N::translate('Event') ?> + </th> + </tr> + </thead> + <tbody> + <?php foreach ($facts as $fact) : ?> + <?php $record = $fact->getParent(); ?> + <tr> + <td data-sort="<?= e($record->getSortName()) ?>"> + <a href="<?= e($record->url()) ?>"> + <?= $record->getFullName() ?> + </a> + <?php if ($record instanceof Individual) : ?> + <?= $record->getSexImage() ?> + <?php endif ?> + </td> + <td data-sort="<?= $fact->getDate()->julianDay() ?>"> + <?= $fact->getDate()->display(true); ?> + </td> + <td data-sort="<?= $fact->anniv ?>"> + <?= $fact->anniv ?> + </td> + <td data-sort="<?= $fact->getLabel() ?>"> + <?= $fact->getLabel() ?> + </td> + </tr> + <?php endforeach ?> + </tbody> </table> <?php View::push('javascript') ?> diff --git a/resources/views/modules/todo/config.php b/resources/views/modules/todo/config.php index aaefae1df3..610fe6b5ef 100644 --- a/resources/views/modules/todo/config.php +++ b/resources/views/modules/todo/config.php @@ -3,35 +3,35 @@ <?php use Fisharebest\Webtrees\I18N; ?> <p> - <?= I18N::translate('Research tasks are special events, added to individuals in your family tree, which identify the need for further research. You can use them as a reminder to check facts against more reliable sources, to obtain documents or photographs, to resolve conflicting information, etc.') ?> - <?= I18N::translate('To create new research tasks, you must first add “research task” to the list of facts and events in the family tree’s preferences.') ?> - <?= I18N::translate('Research tasks are stored using the custom GEDCOM tag “_TODO”. Other genealogy applications may not recognize this tag.') ?> + <?= I18N::translate('Research tasks are special events, added to individuals in your family tree, which identify the need for further research. You can use them as a reminder to check facts against more reliable sources, to obtain documents or photographs, to resolve conflicting information, etc.') ?> + <?= I18N::translate('To create new research tasks, you must first add “research task” to the list of facts and events in the family tree’s preferences.') ?> + <?= I18N::translate('Research tasks are stored using the custom GEDCOM tag “_TODO”. Other genealogy applications may not recognize this tag.') ?> </p> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="show_other"> - <?= I18N::translate('Show research tasks that are assigned to other users') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('show_other', FunctionsEdit::optionsNoYes(), $show_other, true) ?> - </div> + <label class="col-sm-3 col-form-label" for="show_other"> + <?= I18N::translate('Show research tasks that are assigned to other users') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('show_other', FunctionsEdit::optionsNoYes(), $show_other, true) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="show_unassigned"> - <?= I18N::translate('Show research tasks that are not assigned to any user') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('show_unassigned', FunctionsEdit::optionsNoYes(), $show_unassigned, true) ?> - </div> + <label class="col-sm-3 col-form-label" for="show_unassigned"> + <?= I18N::translate('Show research tasks that are not assigned to any user') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('show_unassigned', FunctionsEdit::optionsNoYes(), $show_unassigned, true) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="show_future"> - <?= I18N::translate('Show research tasks that have a date in the future') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('show_future', FunctionsEdit::optionsNoYes(), $show_future, true) ?> - </div> + <label class="col-sm-3 col-form-label" for="show_future"> + <?= I18N::translate('Show research tasks that have a date in the future') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('show_future', FunctionsEdit::optionsNoYes(), $show_future, true) ?> + </div> </div> diff --git a/resources/views/modules/todo/research-tasks.php b/resources/views/modules/todo/research-tasks.php index e5b259b920..8d433cd801 100644 --- a/resources/views/modules/todo/research-tasks.php +++ b/resources/views/modules/todo/research-tasks.php @@ -1,41 +1,41 @@ <?php use Fisharebest\Webtrees\I18N; ?> <table class="table table-bordered table-sm datatables wt-table-tasks" data-columns="[null, null, null, null]" data-info="false" data-paging="false" data-searching="false" data-state-save="true"> - <thead> - <tr> - <th class="d-none d-md-table-cell wt-side-block-optional"> - <?= I18N::translate('Date') ?> - </th> - <th> - <?= I18N::translate('Record') ?> - </th> - <th class="d-none d-md-table-cell wt-side-block-optional"> - <?= I18N::translate('Username') ?> - </th> - <th> - <?= I18N::translate('Research task') ?> - </th> - </tr> - </thead> + <thead> + <tr> + <th class="d-none d-md-table-cell wt-side-block-optional"> + <?= I18N::translate('Date') ?> + </th> + <th> + <?= I18N::translate('Record') ?> + </th> + <th class="d-none d-md-table-cell wt-side-block-optional"> + <?= I18N::translate('Username') ?> + </th> + <th> + <?= I18N::translate('Research task') ?> + </th> + </tr> + </thead> - <tbody> - <?php foreach ($tasks as $task): ?> - <tr> - <td data-sort="<?= $task->getDate()->julianDay() ?>" class="d-none d-md-table-cell wt-side-block-optional"> - <?= $task->getDate()->display() ?> - </td> - <td data-sort="<?= e($task->getParent()->getSortName()) ?>"> - <a href="<?= e($task->getParent()->url()) ?>"> - <?= $task->getParent()->getFullName() ?> - </a> - </td> - <td class="d-none d-md-table-cell wt-side-block-optional"> - <?= e($task->getAttribute('_WT_USER')) ?> - </td> - <td dir="auto"> - <?= e($task->getValue()) ?> - </td> - </tr> - <?php endforeach ?> - </tbody> + <tbody> + <?php foreach ($tasks as $task) : ?> + <tr> + <td data-sort="<?= $task->getDate()->julianDay() ?>" class="d-none d-md-table-cell wt-side-block-optional"> + <?= $task->getDate()->display() ?> + </td> + <td data-sort="<?= e($task->getParent()->getSortName()) ?>"> + <a href="<?= e($task->getParent()->url()) ?>"> + <?= $task->getParent()->getFullName() ?> + </a> + </td> + <td class="d-none d-md-table-cell wt-side-block-optional"> + <?= e($task->getAttribute('_WT_USER')) ?> + </td> + <td dir="auto"> + <?= e($task->getValue()) ?> + </td> + </tr> + <?php endforeach ?> + </tbody> </table> diff --git a/resources/views/modules/top10_givnnames/config.php b/resources/views/modules/top10_givnnames/config.php index e123d24ce0..78fa6ab645 100644 --- a/resources/views/modules/top10_givnnames/config.php +++ b/resources/views/modules/top10_givnnames/config.php @@ -2,19 +2,19 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="num"> - <?= /* I18N: ... to show in a list */ I18N::translate('Number of given names') ?> - </label> - <div class="col-sm-9"> - <input type="text" id="num" name="num" size="2" value="<?= $num ?>"> - </div> + <label class="col-sm-3 col-form-label" for="num"> + <?= /* I18N: ... to show in a list */ I18N::translate('Number of given names') ?> + </label> + <div class="col-sm-9"> + <input type="text" id="num" name="num" size="2" value="<?= $num ?>"> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="infoStyle"> - <?= I18N::translate('Presentation style') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> - </div> + <label class="col-sm-3 col-form-label" for="infoStyle"> + <?= I18N::translate('Presentation style') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> + </div> </div> diff --git a/resources/views/modules/top10_givnnames/list.php b/resources/views/modules/top10_givnnames/list.php index e63ac8401b..68dc2616f0 100644 --- a/resources/views/modules/top10_givnnames/list.php +++ b/resources/views/modules/top10_givnnames/list.php @@ -1,8 +1,8 @@ <?php use Fisharebest\Webtrees\I18N; ?> <dl> - <dt><?= I18N::translate('Males') ?></dt> - <dd><?= $males ?></dd> - <dt><?= I18N::translate('Females') ?></dt> - <dd><?= $females ?></dd> + <dt><?= I18N::translate('Males') ?></dt> + <dd><?= $males ?></dd> + <dt><?= I18N::translate('Females') ?></dt> + <dd><?= $females ?></dd> </dl> diff --git a/resources/views/modules/top10_pageviews/config.php b/resources/views/modules/top10_pageviews/config.php index 2c4fd6561e..b1b166f0e3 100644 --- a/resources/views/modules/top10_pageviews/config.php +++ b/resources/views/modules/top10_pageviews/config.php @@ -2,19 +2,19 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="num"> - <?= /* I18N: ... to show in a list */ I18N::translate('Number of pages') ?> - </label> - <div class="col-sm-9"> - <input class="form-control" id="num" name="num" type="text" value="<?= e($num) ?>"> - </div> + <label class="col-sm-3 col-form-label" for="num"> + <?= /* I18N: ... to show in a list */ I18N::translate('Number of pages') ?> + </label> + <div class="col-sm-9"> + <input class="form-control" id="num" name="num" type="text" value="<?= e($num) ?>"> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="count_placement"> - <?= /* I18N: Label for a configuration option */ I18N::translate('Show counts before or after name') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($options, $count_placement, ['id' => 'count_placement', 'name' => 'count_placement']) ?> - </div> + <label class="col-sm-3 col-form-label" for="count_placement"> + <?= /* I18N: Label for a configuration option */ I18N::translate('Show counts before or after name') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($options, $count_placement, ['id' => 'count_placement', 'name' => 'count_placement']) ?> + </div> </div> diff --git a/resources/views/modules/top10_surnames/config.php b/resources/views/modules/top10_surnames/config.php index 63f001cad4..727460c3c2 100644 --- a/resources/views/modules/top10_surnames/config.php +++ b/resources/views/modules/top10_surnames/config.php @@ -2,19 +2,19 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="num"> - <?= /* I18N: ... to show in a list */ I18N::translate('Number of surnames') ?> - </label> - <div class="col-sm-9"> - <input class="form-control"id="num" name="num" type="text" value="<?= e($num) ?>"> - </div> + <label class="col-sm-3 col-form-label" for="num"> + <?= /* I18N: ... to show in a list */ I18N::translate('Number of surnames') ?> + </label> + <div class="col-sm-9"> + <input class="form-control"id="num" name="num" type="text" value="<?= e($num) ?>"> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="infoStyle"> - <?= I18N::translate('Presentation style') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> - </div> + <label class="col-sm-3 col-form-label" for="infoStyle"> + <?= I18N::translate('Presentation style') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> + </div> </div> diff --git a/resources/views/modules/tree/tab.php b/resources/views/modules/tree/tab.php index aa5856c707..947857f6af 100644 --- a/resources/views/modules/tree/tab.php +++ b/resources/views/modules/tree/tab.php @@ -1,7 +1,7 @@ <?php use Fisharebest\Webtrees\View; ?> <div class="wt-tree-tab py-4"> - <?= $html ?> + <?= $html ?> </div> <?php View::push('javascript') ?> @@ -14,6 +14,6 @@ newSheet.setAttribute("href","<?= $treeview_css ?>"); document.head.appendChild(newSheet); - <?= $js ?> + <?= $js ?> </script> <?php View::endpush() ?> diff --git a/resources/views/modules/upcoming_events/config.php b/resources/views/modules/upcoming_events/config.php index a1a2d11380..e5c8226671 100644 --- a/resources/views/modules/upcoming_events/config.php +++ b/resources/views/modules/upcoming_events/config.php @@ -3,47 +3,47 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="days"> - <?= I18N::translate('Number of days to show') ?> - </label> - <div class="col-sm-9"> - <input type="text" name="days" id="days" size="2" value="<?= $days ?>"> - <?= I18N::plural('maximum %s day', 'maximum %s days', $max_days, I18N::number($max_days)) ?> - </div> + <label class="col-sm-3 col-form-label" for="days"> + <?= I18N::translate('Number of days to show') ?> + </label> + <div class="col-sm-9"> + <input type="text" name="days" id="days" size="2" value="<?= $days ?>"> + <?= I18N::plural('maximum %s day', 'maximum %s days', $max_days, I18N::number($max_days)) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="filter"> - <?= I18N::translate('Show only events of living individuals') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('filter', FunctionsEdit::optionsNoYes(), $filter, true) ?> - </div> + <label class="col-sm-3 col-form-label" for="filter"> + <?= I18N::translate('Show only events of living individuals') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::radioButtons('filter', FunctionsEdit::optionsNoYes(), $filter, true) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="events"> - <?= I18N::translate('Events') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::multiSelect($all_events, $event_array, ['id' => 'events', 'name' => 'events[]', 'class' => 'select2']) ?> - </div> + <label class="col-sm-3 col-form-label" for="events"> + <?= I18N::translate('Events') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::multiSelect($all_events, $event_array, ['id' => 'events', 'name' => 'events[]', 'class' => 'select2']) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="infoStyle"> - <?= /* I18N: Label for a configuration option */ I18N::translate('Presentation style') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> - </div> + <label class="col-sm-3 col-form-label" for="infoStyle"> + <?= /* I18N: Label for a configuration option */ I18N::translate('Presentation style') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($info_styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="sortStyle"> - <?= /* I18N: Label for a configuration option */ I18N::translate('Sort order') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($sort_styles, $sortStyle, ['id' => 'sortStyle', 'name' => 'sortStyle']) ?> - </div> + <label class="col-sm-3 col-form-label" for="sortStyle"> + <?= /* I18N: Label for a configuration option */ I18N::translate('Sort order') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($sort_styles, $sortStyle, ['id' => 'sortStyle', 'name' => 'sortStyle']) ?> + </div> </div> diff --git a/resources/views/modules/upcoming_events/list.php b/resources/views/modules/upcoming_events/list.php index dd48eb4872..f5b89e5d39 100644 --- a/resources/views/modules/upcoming_events/list.php +++ b/resources/views/modules/upcoming_events/list.php @@ -1,19 +1,19 @@ <?php use Fisharebest\Webtrees\I18N; ?> <?php use Fisharebest\Webtrees\Individual; ?> -<?php foreach ($facts as $fact): ?> - <?php $record = $fact->getParent(); ?> - <a href="<?= e($record->url()) ?>" class="list_item name2"> - <?= $record->getFullName() ?> - </a> - <?php if ($record instanceof Individual): ?> - <?= $record->getSexImage() ?> - <?php endif ?> - <div class="indent"> - <?= $fact->getLabel() . ' — ' . $fact->getDate()->display(true); ?> - <?= ' (' . I18N::timeAgo($fact->anniv * 365 * 24 * 60 * 60) . ')'; ?> - <?php if (!$fact->getPlace()->isEmpty()): ?> - <?= ' — <a href="' . $fact->getPlace()->getURL() . '">' . $fact->getPlace()->getFullName() . '</a>'; ?> - <?php endif ?> - </div> +<?php foreach ($facts as $fact) : ?> + <?php $record = $fact->getParent(); ?> + <a href="<?= e($record->url()) ?>" class="list_item name2"> + <?= $record->getFullName() ?> + </a> + <?php if ($record instanceof Individual) : ?> + <?= $record->getSexImage() ?> + <?php endif ?> + <div class="indent"> + <?= $fact->getLabel() . ' — ' . $fact->getDate()->display(true); ?> + <?= ' (' . I18N::timeAgo($fact->anniv * 365 * 24 * 60 * 60) . ')'; ?> + <?php if (!$fact->getPlace()->isEmpty()) : ?> + <?= ' — <a href="' . $fact->getPlace()->getURL() . '">' . $fact->getPlace()->getFullName() . '</a>'; ?> + <?php endif ?> + </div> <?php endforeach ?> diff --git a/resources/views/modules/upcoming_events/table.php b/resources/views/modules/upcoming_events/table.php index 72b142cc66..1447460601 100644 --- a/resources/views/modules/upcoming_events/table.php +++ b/resources/views/modules/upcoming_events/table.php @@ -3,47 +3,47 @@ <?php use Fisharebest\Webtrees\View; ?> <table class="table table-sm datatable wt-table-events" data-info="false" data-paging="false" data-searching="false" data-sorting="<?= e('[[1, "asc" ]]') ?>"> - <thead> - <tr> - <th> - <?= I18N::translate('Record') ?> - </th> - <th> - <?= I18N::translate('Date') ?> - </th> - <th> - <i class="icon-reminder"></i> - <span class="sr-only"><?= I18N::translate('Anniversary') ?></span> - </th> - <th> - <?= I18N::translate('Event') ?> - </th> - </tr> - </thead> - <tbody> - <?php foreach ($facts as $fact): ?> - <?php $record = $fact->getParent(); ?> - <tr> - <td data-sort="<?= e($record->getSortName()) ?>"> - <a href="<?= e($record->url()) ?>"> - <?= $record->getFullName() ?> - </a> - <?php if ($record instanceof Individual): ?> - <?= $record->getSexImage() ?> - <?php endif ?> - </td> - <td data-sort="<?= $fact->getDate()->julianDay() ?>"> - <?= $fact->getDate()->display(true); ?> - </td> - <td data-sort="<?= $fact->anniv ?>"> - <?= $fact->anniv ?> - </td> - <td data-sort="<?= $fact->getLabel() ?>"> - <?= $fact->getLabel() ?> - </td> - </tr> - <?php endforeach ?> - </tbody> + <thead> + <tr> + <th> + <?= I18N::translate('Record') ?> + </th> + <th> + <?= I18N::translate('Date') ?> + </th> + <th> + <i class="icon-reminder"></i> + <span class="sr-only"><?= I18N::translate('Anniversary') ?></span> + </th> + <th> + <?= I18N::translate('Event') ?> + </th> + </tr> + </thead> + <tbody> + <?php foreach ($facts as $fact) : ?> + <?php $record = $fact->getParent(); ?> + <tr> + <td data-sort="<?= e($record->getSortName()) ?>"> + <a href="<?= e($record->url()) ?>"> + <?= $record->getFullName() ?> + </a> + <?php if ($record instanceof Individual) : ?> + <?= $record->getSexImage() ?> + <?php endif ?> + </td> + <td data-sort="<?= $fact->getDate()->julianDay() ?>"> + <?= $fact->getDate()->display(true); ?> + </td> + <td data-sort="<?= $fact->anniv ?>"> + <?= $fact->anniv ?> + </td> + <td data-sort="<?= $fact->getLabel() ?>"> + <?= $fact->getLabel() ?> + </td> + </tr> + <?php endforeach ?> + </tbody> </table> <?php View::push('javascript') ?> diff --git a/resources/views/modules/user_blog/edit.php b/resources/views/modules/user_blog/edit.php index 4d974a5193..1998d123d7 100644 --- a/resources/views/modules/user_blog/edit.php +++ b/resources/views/modules/user_blog/edit.php @@ -3,44 +3,44 @@ <h2><?= $title ?></h2> <form method="post"> - <?= csrf_field() ?> + <?= csrf_field() ?> - <table> - <tr> - <th> - <label for="subject"> - <?= I18N::translate('Title') ?> - </label> - </th> - <tr> - <tr> - <td> - <input type="text" id="subject" name="subject" size="50" dir="auto" autofocus value="<?= e($subject) ?>"> - </td> - </tr> - <tr> - <th> - <label for="body"> - <?= I18N::translate('Content') ?> - </label> - </th> - </tr> - <tr> - <td> - <textarea id="body" name="body" class="html-edit form-control" rows="10" dir="auto"><?= e($body) ?></textarea> - </td> - </tr> + <table> + <tr> + <th> + <label for="subject"> + <?= I18N::translate('Title') ?> + </label> + </th> + <tr> + <tr> + <td> + <input type="text" id="subject" name="subject" size="50" dir="auto" autofocus value="<?= e($subject) ?>"> + </td> + </tr> + <tr> + <th> + <label for="body"> + <?= I18N::translate('Content') ?> + </label> + </th> + </tr> + <tr> + <td> + <textarea id="body" name="body" class="html-edit form-control" rows="10" dir="auto"><?= e($body) ?></textarea> + </td> + </tr> - <tr> - <td> - <button class="btn btn-primary" type="submit"> - <?= I18N::translate('save') ?> - </button> + <tr> + <td> + <button class="btn btn-primary" type="submit"> + <?= I18N::translate('save') ?> + </button> - <a class="btn btn-secondary" href="<?= e(route('user-page', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('cancel') ?> - </a> - </td> - </tr> - </table> + <a class="btn btn-secondary" href="<?= e(route('user-page', ['ged' => $tree->getName()])) ?>"> + <?= I18N::translate('cancel') ?> + </a> + </td> + </tr> + </table> </form> diff --git a/resources/views/modules/user_blog/list.php b/resources/views/modules/user_blog/list.php index 26cd4f2ba1..10115ce0b3 100644 --- a/resources/views/modules/user_blog/list.php +++ b/resources/views/modules/user_blog/list.php @@ -2,46 +2,46 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsDate; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?php if (empty($articles)): ?> - <?= I18N::translate('No news articles have been submitted.') ?> +<?php if (empty($articles)) : ?> + <?= I18N::translate('No news articles have been submitted.') ?> <?php endif ?> -<?php foreach ($articles as $n => $article): ?> - <?php if ($n === 5 && count($articles) > 5): ?> - <p> - <a class="btn btn-link" data-toggle="collapse" data-target="#more-news-<?= e($block_id) ?>" role="button" aria-expanded="false" aria-controls="more-news-<?= e($block_id) ?>"><?= I18N::translate('More news articles') ?> - </a> - </p> - <div class="collapse" id="more-news-<?= e($block_id) ?>"> - <?php endif ?> +<?php foreach ($articles as $n => $article) : ?> + <?php if ($n === 5 && count($articles) > 5) : ?> + <p> + <a class="btn btn-link" data-toggle="collapse" data-target="#more-news-<?= e($block_id) ?>" role="button" aria-expanded="false" aria-controls="more-news-<?= e($block_id) ?>"><?= I18N::translate('More news articles') ?> + </a> + </p> + <div class="collapse" id="more-news-<?= e($block_id) ?>"> + <?php endif ?> - <div class="news_box"> - <div class="news_title"><?= e($article->subject) ?></div> - <div class="news_date"><?= FunctionsDate::formatTimestamp($article->updated) ?></div> - <div style="white-space: pre-wrap"><?= e($article->body) ?></div> + <div class="news_box"> + <div class="news_title"><?= e($article->subject) ?></div> + <div class="news_date"><?= FunctionsDate::formatTimestamp($article->updated) ?></div> + <div style="white-space: pre-wrap"><?= e($article->body) ?></div> - <?php if (Auth::isManager($tree)): ?> - <hr> - <form action="<?= e(route('module', ['module' => 'user_blog', 'action' => 'DeleteJournal', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>" method="post"> - <?= csrf_field() ?> - <a class="btn btn-link" href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Edit') ?> - </a> - | - <button class="btn btn-link" type="submit" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($article->subject)) ?>" onclick="return confirm(this.dataset.confirm);"> - <?= I18N::translate('Delete') ?> - </button> - </form> - <?php endif ?> - </div> + <?php if (Auth::isManager($tree)) : ?> + <hr> + <form action="<?= e(route('module', ['module' => 'user_blog', 'action' => 'DeleteJournal', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>" method="post"> + <?= csrf_field() ?> + <a class="btn btn-link" href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>"> + <?= I18N::translate('Edit') ?> + </a> + | + <button class="btn btn-link" type="submit" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($article->subject)) ?>" onclick="return confirm(this.dataset.confirm);"> + <?= I18N::translate('Delete') ?> + </button> + </form> + <?php endif ?> + </div> <?php endforeach ?> -<?php if (count($articles) > 5): ?> - </div> +<?php if (count($articles) > 5) : ?> + </div> <?php endif ?> <p> - <a href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Add a news article') ?> - </a> + <a href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'ged' => $tree->getName()])) ?>"> + <?= I18N::translate('Add a news article') ?> + </a> </p> diff --git a/resources/views/modules/user_favorites/favorites.php b/resources/views/modules/user_favorites/favorites.php index 3b88b22f5b..fb32842a35 100644 --- a/resources/views/modules/user_favorites/favorites.php +++ b/resources/views/modules/user_favorites/favorites.php @@ -2,56 +2,56 @@ <?php use Fisharebest\Webtrees\Individual; ?> <?php use Fisharebest\Webtrees\Theme; ?> -<?php foreach ($favorites as $favorite): ?> - <div class="person_box action_header<?= $favorite->record instanceof Individual ? $favorite->record->getSex() : '' ?>"> - <?php if ($favorite->favorite_type === 'URL'): ?> - <a href="<?= e($favorite->url) ?>"><b><?= e($favorite->title) ?></b></a> - <?php elseif ($favorite->record instanceof Individual): ?> - <?= Theme::theme()->individualBoxLarge($favorite->record) ?> - <?php elseif ($favorite->record !== null) : ?> - <?= $favorite->record->formatList() ?> - <?php endif ?> +<?php foreach ($favorites as $favorite) : ?> + <div class="person_box action_header<?= $favorite->record instanceof Individual ? $favorite->record->getSex() : '' ?>"> + <?php if ($favorite->favorite_type === 'URL') : ?> + <a href="<?= e($favorite->url) ?>"><b><?= e($favorite->title) ?></b></a> + <?php elseif ($favorite->record instanceof Individual) : ?> + <?= Theme::theme()->individualBoxLarge($favorite->record) ?> + <?php elseif ($favorite->record !== null) : ?> + <?= $favorite->record->formatList() ?> + <?php endif ?> - <div class="wt-favorites-block-note"> + <div class="wt-favorites-block-note"> <?= e((string) $favorite->note) ?> </div> - </div> + </div> - <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->getName(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> - <?= csrf_field() ?> - <button type="submit" class="btn btn-link btn-sm" data-confirm="<?= I18N::translate('Are you sure you want to remove this item from your list of favorites?') ?>" onclick="return confirm(this.dataset.confirm);"> - <?= I18N::translate('Remove') ?> - </button> - </form> + <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->getName(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> + <?= csrf_field() ?> + <button type="submit" class="btn btn-link btn-sm" data-confirm="<?= I18N::translate('Are you sure you want to remove this item from your list of favorites?') ?>" onclick="return confirm(this.dataset.confirm);"> + <?= I18N::translate('Remove') ?> + </button> + </form> <?php endforeach ?> <div class="add_fav_head"> - <a href="#" onclick="return expand_layer('add_fav<?= e($block_id) ?>');"> - <?= I18N::translate('Add a favorite') ?> - <i id="add_fav<?= e($block_id) ?>_img" class="icon-plus"></i> - </a> + <a href="#" onclick="return expand_layer('add_fav<?= e($block_id) ?>');"> + <?= I18N::translate('Add a favorite') ?> + <i id="add_fav<?= e($block_id) ?>_img" class="icon-plus"></i> + </a> </div> <div id="add_fav<?= e($block_id) ?>" style="display: none;"> - <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'AddFavorite', 'ged' => $tree->getName()])) ?>" method="post"> - <?= csrf_field() ?> - <div class="add_fav_ref"> - <input type="radio" name="fav_category" value="record" checked onclick="$('#xref<?= e($block_id) ?>').removeAttr('disabled'); $('#url, #title').attr('disabled','disabled').val('');"> - <label for="xref<?= e($block_id) ?>"> - <?= I18N::translate('Record') ?> - </label> - <input class="pedigree_form" data-autocomplete-type="IFSRO" type="text" name="xref" id="xref<?= e($block_id) ?>" size="5"> - </div> - <div class="add_fav_url"> - <input type="radio" name="fav_category" value="url" onclick="$('#url, #title').removeAttr('disabled'); $('#xref<?= e($block_id) ?>').attr('disabled','disabled').val('');"> - <input type="text" name="url" id="url" size="20" value="" placeholder="<?= I18N::translate('URL') ?>" disabled> - <input type="text" name="title" id="title" size="20" value="" placeholder="<?= I18N::translate('Title') ?>" disabled> - <p> - <?= I18N::translate('Enter an optional note about this favorite') ?> - </p> - <textarea name="note" rows="6" cols="50"></textarea> - </div> - <button type="submit" class="btn btn-primary"> - <?= /* I18N: A button label. */ I18N::translate('add') ?> - </button> - </form> + <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'AddFavorite', 'ged' => $tree->getName()])) ?>" method="post"> + <?= csrf_field() ?> + <div class="add_fav_ref"> + <input type="radio" name="fav_category" value="record" checked onclick="$('#xref<?= e($block_id) ?>').removeAttr('disabled'); $('#url, #title').attr('disabled','disabled').val('');"> + <label for="xref<?= e($block_id) ?>"> + <?= I18N::translate('Record') ?> + </label> + <input class="pedigree_form" data-autocomplete-type="IFSRO" type="text" name="xref" id="xref<?= e($block_id) ?>" size="5"> + </div> + <div class="add_fav_url"> + <input type="radio" name="fav_category" value="url" onclick="$('#url, #title').removeAttr('disabled'); $('#xref<?= e($block_id) ?>').attr('disabled','disabled').val('');"> + <input type="text" name="url" id="url" size="20" value="" placeholder="<?= I18N::translate('URL') ?>" disabled> + <input type="text" name="title" id="title" size="20" value="" placeholder="<?= I18N::translate('Title') ?>" disabled> + <p> + <?= I18N::translate('Enter an optional note about this favorite') ?> + </p> + <textarea name="note" rows="6" cols="50"></textarea> + </div> + <button type="submit" class="btn btn-primary"> + <?= /* I18N: A button label. */ I18N::translate('add') ?> + </button> + </form> </div> diff --git a/resources/views/modules/user_welcome/welcome.php b/resources/views/modules/user_welcome/welcome.php index 293867ec60..ef54eaf536 100644 --- a/resources/views/modules/user_welcome/welcome.php +++ b/resources/views/modules/user_welcome/welcome.php @@ -1,11 +1,11 @@ <div class="d-flex flex-wrap justify-content-around"> - <?php foreach ($links as $link): ?> - <div class="text-center m-1"> - <a href="<?= e($link['url']) ?>"> - <i class="<?= $link['icon'] ?>"></i> - <br> - <?= $link['title'] ?> - </a> - </div> - <?php endforeach ?> + <?php foreach ($links as $link) : ?> + <div class="text-center m-1"> + <a href="<?= e($link['url']) ?>"> + <i class="<?= $link['icon'] ?>"></i> + <br> + <?= $link['title'] ?> + </a> + </div> + <?php endforeach ?> </div> diff --git a/resources/views/modules/yahrzeit/config.php b/resources/views/modules/yahrzeit/config.php index d2ba63585a..6e8657af13 100644 --- a/resources/views/modules/yahrzeit/config.php +++ b/resources/views/modules/yahrzeit/config.php @@ -2,31 +2,31 @@ <?php use Fisharebest\Webtrees\I18N; ?> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="days"> - <?= I18N::translate('Number of days to show') ?> - </label> - <div class="col-sm-9"> - <input class="form-control" type="text" id="days" name="days" value="<?= e($days) ?>"> - <em> - <?= I18N::plural('maximum %s day', 'maximum %s days', $max_days, I18N::number($max_days)) ?> - </em> - </div> + <label class="col-sm-3 col-form-label" for="days"> + <?= I18N::translate('Number of days to show') ?> + </label> + <div class="col-sm-9"> + <input class="form-control" type="text" id="days" name="days" value="<?= e($days) ?>"> + <em> + <?= I18N::plural('maximum %s day', 'maximum %s days', $max_days, I18N::number($max_days)) ?> + </em> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="infoStyle"> - <?= I18N::translate('Presentation style') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> - </div> + <label class="col-sm-3 col-form-label" for="infoStyle"> + <?= I18N::translate('Presentation style') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($styles, $infoStyle, ['id' => 'infoStyle', 'name' => 'infoStyle']) ?> + </div> </div> <div class="form-group row"> - <label class="col-sm-3 col-form-label" for="calendar"> - <?= I18N::translate('Calendar') ?> - </label> - <div class="col-sm-9"> - <?= Bootstrap4::select($calendars, $calendar, ['id' => 'calendar', 'name' => 'calendar']) ?> - </div> + <label class="col-sm-3 col-form-label" for="calendar"> + <?= I18N::translate('Calendar') ?> + </label> + <div class="col-sm-9"> + <?= Bootstrap4::select($calendars, $calendar, ['id' => 'calendar', 'name' => 'calendar']) ?> + </div> </div> diff --git a/resources/views/modules/yahrzeit/list.php b/resources/views/modules/yahrzeit/list.php index 8447afe56b..bd70ebebac 100644 --- a/resources/views/modules/yahrzeit/list.php +++ b/resources/views/modules/yahrzeit/list.php @@ -1,12 +1,12 @@ <?php use Fisharebest\Webtrees\I18N; ?>' -<?php foreach ($yahrzeits as $yahrzeit): ?> - <a href="<?= e($yahrzeit->individual->url()) ?>" class="list_item name2"> - <?= $yahrzeit->individual->getFullName() ?> - </a> - <?= $yahrzeit->individual->getSexImage() ?> - <div class="indent"> - <?= $yahrzeit->fact->getDate()->display(true) ?>, - <?= I18N::translate('%s year anniversary', $yahrzeit->fact->anniv) ?> - </div> +<?php foreach ($yahrzeits as $yahrzeit) : ?> + <a href="<?= e($yahrzeit->individual->url()) ?>" class="list_item name2"> + <?= $yahrzeit->individual->getFullName() ?> + </a> + <?= $yahrzeit->individual->getSexImage() ?> + <div class="indent"> + <?= $yahrzeit->fact->getDate()->display(true) ?>, + <?= I18N::translate('%s year anniversary', $yahrzeit->fact->anniv) ?> + </div> <?php endforeach ?> diff --git a/resources/views/modules/yahrzeit/table.php b/resources/views/modules/yahrzeit/table.php index de260dfe51..f3fc005cb6 100644 --- a/resources/views/modules/yahrzeit/table.php +++ b/resources/views/modules/yahrzeit/table.php @@ -1,39 +1,39 @@ <?php use Fisharebest\Webtrees\I18N; ?> <table class="table table-sm datatable wt-table-yahrzeits" data-info="false" data-paging="false" data-searching="false" data-sorting="<?= e('[[3, "asc" ]]') ?>"> - <thead> - <tr> - <th><?= I18N::translate('Name') ?></th> - <th><?= I18N::translate('Death') ?></th> - <th><i class="icon-reminder" title="<?= I18N::translate('Anniversary') ?>"></i></th> - <th><?= I18N::translate('Yahrzeit') ?></th> - </tr> - </thead> - <tbody> + <thead> + <tr> + <th><?= I18N::translate('Name') ?></th> + <th><?= I18N::translate('Death') ?></th> + <th><i class="icon-reminder" title="<?= I18N::translate('Anniversary') ?>"></i></th> + <th><?= I18N::translate('Yahrzeit') ?></th> + </tr> + </thead> + <tbody> - <?php foreach ($yahrzeits as $yahrzeit): ?> - <tr> - <td data-sort="<?= e($yahrzeit->individual->getSortName()) ?>"> - <a href="<?= e($yahrzeit->individual->url()) ?>"> - <?= $yahrzeit->individual->getFullname() ?> - <?php if ($yahrzeit->individual->getAddName()): ?> - <br> - <?= $yahrzeit->individual->getAddName() ?> - <?php endif ?> - </a> - </td> - <td data-sort="<?= e($yahrzeit->fact_date->julianDay()) ?>"> - <?= $yahrzeit->fact_date->display(true) ?> - </td> - <td data-sort="<?= e($yahrzeit->fact->anniv) ?>"> - <?= I18N::number($yahrzeit->fact->anniv) ?> - </td> - <td data-sort="<?= e($yahrzeit->yahrzeit_date->julianDay()) ?>"> - <?= $yahrzeit->yahrzeit_date->display(true) ?> - </td> - </tr> - <?php endforeach ?> - </tbody> + <?php foreach ($yahrzeits as $yahrzeit) : ?> + <tr> + <td data-sort="<?= e($yahrzeit->individual->getSortName()) ?>"> + <a href="<?= e($yahrzeit->individual->url()) ?>"> + <?= $yahrzeit->individual->getFullname() ?> + <?php if ($yahrzeit->individual->getAddName()) : ?> + <br> + <?= $yahrzeit->individual->getAddName() ?> + <?php endif ?> + </a> + </td> + <td data-sort="<?= e($yahrzeit->fact_date->julianDay()) ?>"> + <?= $yahrzeit->fact_date->display(true) ?> + </td> + <td data-sort="<?= e($yahrzeit->fact->anniv) ?>"> + <?= I18N::number($yahrzeit->fact->anniv) ?> + </td> + <td data-sort="<?= e($yahrzeit->yahrzeit_date->julianDay()) ?>"> + <?= $yahrzeit->yahrzeit_date->display(true) ?> + </td> + </tr> + <?php endforeach ?> + </tbody> </table> <script> |