diff options
93 files changed, 204 insertions, 172 deletions
diff --git a/app/FontAwesome.php b/app/FontAwesome.php index 4f9f60c15c..3d685452cd 100644 --- a/app/FontAwesome.php +++ b/app/FontAwesome.php @@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees; /** * Helper functions to generate markup for FontAwesome. * - * @link http://fontawesome.io/accessibility + * @deprecated use view('icons/....') instead */ class FontAwesome extends Html { @@ -59,11 +59,11 @@ class FontAwesome extends Html 'menu' => 'far fa-bar wt-icon-menu', 'report' => 'far fa-file wt-icon-report', 'sidebar' => 'fas fa-pause wt-icon-sidebar', - 'tab' => 'far fa-folder wt-icon-tab', + 'tab' => 'far fa-folder wt-icon-theme', 'theme' => 'fas fa-paint-brush wt-icon-theme', // GEDCOM records 'family' => 'fas fa-users wt-icon-family', - 'individual' => 'far fa-user wt-icon-individual', + 'individual' => 'far fa-user wt-icon-family', 'note' => 'far fa-sticky-note wt-icon-note', 'media' => 'far fa-file-image wt-icon-media', 'repository' => 'fas fa-university wt-icon-repository', @@ -91,7 +91,7 @@ class FontAwesome extends Html * * @return string */ - public static function decorativeIcon($icon, $attributes = []): string + private static function decorativeIcon($icon, $attributes = []): string { if (empty($attributes['class'])) { $attributes['class'] = self::ICONS[$icon]; diff --git a/app/Module/RelationshipsChartModule.php b/app/Module/RelationshipsChartModule.php index 590a781833..31ec030a51 100644 --- a/app/Module/RelationshipsChartModule.php +++ b/app/Module/RelationshipsChartModule.php @@ -317,18 +317,18 @@ class RelationshipsChartModule extends AbstractModule implements ModuleInterface case 'bro': case 'sis': case 'sib': - $table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center; width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . FontAwesome::decorativeIcon('arrow-end') . '</div></div>'; + $table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center; width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . view('icons/arrow-end') . '</div></div>'; $x += 2; break; case 'son': case 'dau': case 'chi': if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { - $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>'; + $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . view('icons/arrow-down') . '</div></div>'; $x += 2; } else { $table[$x][$y - 1] = '<div style="background:url(' . Theme::theme() - ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>'; + ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>'; } $y -= 2; break; @@ -336,11 +336,11 @@ class RelationshipsChartModule extends AbstractModule implements ModuleInterface case 'mot': case 'par': if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { - $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>'; + $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . view('icons/arrow-down') . '</div></div>'; $x += 2; } else { $table[$x][$y + 1] = '<div style="background:url(' . Theme::theme() - ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . FontAwesome::decorativeIcon('arrow-up') . '</div></div>'; + ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>'; } $y += 2; break; diff --git a/resources/views/admin/locations.phtml b/resources/views/admin/locations.phtml index c4197a6eb4..a7244e7e38 100644 --- a/resources/views/admin/locations.phtml +++ b/resources/views/admin/locations.phtml @@ -32,23 +32,41 @@ </span> </a> </th> + <td dir="ltr"> - <?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> + <?php if ($place->pl_lati === null) : ?> + <?= view('icons/warning') ?> + <?php else : ?> + <?= strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> + <?php endif ?> </td> + <td dir="ltr"> - <?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> + <?php if ($place->pl_long === null) : ?> + <?= view('icons/warning') ?> + <?php else : ?> + <?= strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> + <?php endif ?> </td> - <td> - <?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?> + + <td dir="ltr"> + <?php if ($place->pl_zoom === null) : ?> + <?= view('icons/warning') ?> + <?php else : ?> + <?= $place->pl_zoom ?> + <?php endif ?> </td> + <td> <?php if (is_file(Webtrees::MODULES_PATH . 'openstreetmap/' . $place->pl_icon)) : ?> <img src="<?= e(Webtrees::MODULES_PATH . 'openstreetmap/' . $place->pl_icon) ?>" width="25" height="15" alt="<?= I18N::translate("Flag of %s", $place->pl_place) ?>"> <?php endif ?> </td> + <td> <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['href' => route('map-data-edit', ['place_id' => $place->pl_id, 'parent_id' => $place->pl_parent_id]), 'class' => 'btn btn-primary']) ?> </td> + <td> <?php if ($place->child_count === 0) : ?> <form method="POST" action="<?= e(route('map-data-delete', ['parent_id' => $parent_id, 'place_id' => $place->pl_id])) ?>" @@ -61,7 +79,7 @@ </form> <?php else : ?> <button type="button" class="btn btn-danger" disabled> - <?= FontAwesome::decorativeIcon('delete') ?> + <?= view('icons/delete') ?> </button> <?php endif ?> </td> @@ -72,13 +90,13 @@ <tr> <td colspan="7"> <a class="btn btn-primary" href="<?= e(route('map-data', ['parent_id' => $parent_id])) ?>"> - <?= FontAwesome::decorativeIcon('add') ?> + <?= view('icons/add') ?> <?= /* I18N: A button label. */ I18N::translate('add place') ?> </a> <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= FontAwesome::decorativeIcon('download') ?> + <?= view('icons/download') ?> <?= /* I18N: A button label. */ I18N::translate('export file') ?> </button> @@ -91,7 +109,7 @@ </a> </div> <a class="btn btn-primary" href="<?= e(route('locations-import', ['parent_id' => $parent_id])) ?>"> - <?= FontAwesome::decorativeIcon('upload') ?> + <?= view('icons/upload') ?> <?= /* I18N: A button label. */ I18N::translate('import file') ?> </a> diff --git a/resources/views/edit-blocks-page.phtml b/resources/views/edit-blocks-page.phtml index 615d224f93..2b8e728c31 100644 --- a/resources/views/edit-blocks-page.phtml +++ b/resources/views/edit-blocks-page.phtml @@ -226,11 +226,11 @@ </td> <td class="topbottombar" colspan="3"> <button type="submit" class="btn btn-primary"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($url_cancel) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> </td> diff --git a/resources/views/edit/add-fact.phtml b/resources/views/edit/add-fact.phtml index 9ec738c5b6..deba45c17c 100644 --- a/resources/views/edit/add-fact.phtml +++ b/resources/views/edit/add-fact.phtml @@ -1,7 +1,6 @@ <?php use Fisharebest\Webtrees\Auth; ?> <?php use Fisharebest\Webtrees\Bootstrap4; ?> <?php use Fisharebest\Webtrees\Config; ?> -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\GedcomTag; ?> <?php use Fisharebest\Webtrees\I18N; ?> @@ -75,12 +74,12 @@ </div> <div class="col-sm-9 wt-page-options-value"> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($record->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> diff --git a/resources/views/edit/change-family-members.phtml b/resources/views/edit/change-family-members.phtml index fd260da695..e5882996cb 100644 --- a/resources/views/edit/change-family-members.phtml +++ b/resources/views/edit/change-family-members.phtml @@ -71,12 +71,12 @@ </div> <div class="col-sm-9 wt-page-options-value"> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($family->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> diff --git a/resources/views/edit/edit-fact.phtml b/resources/views/edit/edit-fact.phtml index 53a42bdafc..7b1cee8538 100644 --- a/resources/views/edit/edit-fact.phtml +++ b/resources/views/edit/edit-fact.phtml @@ -102,12 +102,12 @@ </div> <div class="col-sm-9 wt-page-options-value"> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($record->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> diff --git a/resources/views/edit/link-child-to-family.phtml b/resources/views/edit/link-child-to-family.phtml index 452a0961ad..e91ffc1481 100644 --- a/resources/views/edit/link-child-to-family.phtml +++ b/resources/views/edit/link-child-to-family.phtml @@ -33,12 +33,12 @@ <div class="row form-group"> <div class="col-sm-9 offset-sm-3"> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($individual->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> diff --git a/resources/views/edit/link-spouse-to-individual.phtml b/resources/views/edit/link-spouse-to-individual.phtml index a8c9ee2596..bc31e460b2 100644 --- a/resources/views/edit/link-spouse-to-individual.phtml +++ b/resources/views/edit/link-spouse-to-individual.phtml @@ -1,4 +1,3 @@ -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\I18N; ?> @@ -23,12 +22,12 @@ <div class="row form-group"> <div class="col-sm-9 offset-sm-3"> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($individual->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> diff --git a/resources/views/edit/new-individual.phtml b/resources/views/edit/new-individual.phtml index dcc72e7efd..3381ae23b7 100644 --- a/resources/views/edit/new-individual.phtml +++ b/resources/views/edit/new-individual.phtml @@ -316,19 +316,19 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR <div class="row form-group"> <div class="col-sm-9 offset-sm-3"> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <?php if (preg_match('/^add_(child|spouse|parent|unlinked_indi)/', $nextaction)) : ?> <button class="btn btn-primary" type="submit" name="goto" value="<?= $xref ?>"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('go to new individual') ?> </button> <?php endif ?> <a class="btn btn-secondary" href="<?= e($cancel_url) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> diff --git a/resources/views/edit/raw-gedcom-fact.phtml b/resources/views/edit/raw-gedcom-fact.phtml index 5a0e9f43e3..78ff94ce3a 100644 --- a/resources/views/edit/raw-gedcom-fact.phtml +++ b/resources/views/edit/raw-gedcom-fact.phtml @@ -1,4 +1,3 @@ -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\I18N; ?> <h2 class="wt-page-title"><?= $title ?></h2> @@ -27,11 +26,11 @@ <div class="row form-group"> <div class="col-sm-9 offset-sm-3"> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($fact->record()->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> </div> diff --git a/resources/views/edit/raw-gedcom-record.phtml b/resources/views/edit/raw-gedcom-record.phtml index b3a38b47a6..42da85f4c8 100644 --- a/resources/views/edit/raw-gedcom-record.phtml +++ b/resources/views/edit/raw-gedcom-record.phtml @@ -51,11 +51,11 @@ <div class="row form-group"> <div class="col-sm-9 offset-sm-3"> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($record->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> </div> diff --git a/resources/views/edit/reorder-children.phtml b/resources/views/edit/reorder-children.phtml index 770c676cf8..8a3ab61f8d 100644 --- a/resources/views/edit/reorder-children.phtml +++ b/resources/views/edit/reorder-children.phtml @@ -25,17 +25,17 @@ <p> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <button class="btn btn-secondary" id="btn-default-order" type="button"> - <?= FontAwesome::decorativeIcon('sort') ?> + <?= view('icons/sort') ?> <?= /* I18N: A button label. */ I18N::translate('sort by date of birth') ?> </button> <a class="btn btn-secondary" href="<?= e($family->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> </p> diff --git a/resources/views/edit/reorder-media.phtml b/resources/views/edit/reorder-media.phtml index 47d85bed15..8c6af7ce5e 100644 --- a/resources/views/edit/reorder-media.phtml +++ b/resources/views/edit/reorder-media.phtml @@ -23,12 +23,12 @@ <p> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($individual->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> </p> diff --git a/resources/views/edit/reorder-names.phtml b/resources/views/edit/reorder-names.phtml index e89def516d..6fab4d0109 100644 --- a/resources/views/edit/reorder-names.phtml +++ b/resources/views/edit/reorder-names.phtml @@ -25,12 +25,12 @@ <p> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($individual->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> </p> diff --git a/resources/views/edit/reorder-spouses.phtml b/resources/views/edit/reorder-spouses.phtml index 0a46253bca..7121b65a55 100644 --- a/resources/views/edit/reorder-spouses.phtml +++ b/resources/views/edit/reorder-spouses.phtml @@ -25,17 +25,17 @@ <p> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <button class="btn btn-secondary" id="btn-default-order" type="button"> - <?= FontAwesome::decorativeIcon('sort') ?> + <?= view('icons/sort') ?> <?= /* I18N: A button label. */ I18N::translate('sort by date of marriage') ?> </button> <a class="btn btn-secondary" href="<?= e($individual->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> </p> diff --git a/resources/views/edit/shared-note.phtml b/resources/views/edit/shared-note.phtml index 06883f82df..6c365b63c4 100644 --- a/resources/views/edit/shared-note.phtml +++ b/resources/views/edit/shared-note.phtml @@ -19,12 +19,12 @@ <div class="row form-group"> <div class="col-sm-9 offset-sm-3"> <button class="btn btn-primary" type="submit"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($note->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> diff --git a/resources/views/family-page-menu.phtml b/resources/views/family-page-menu.phtml index 14481094f4..07580f2887 100644 --- a/resources/views/family-page-menu.phtml +++ b/resources/views/family-page-menu.phtml @@ -1,10 +1,9 @@ <?php use Fisharebest\Webtrees\Auth; ?> -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\I18N; ?> <div class="dropdown wt-page-menu"> <button class="btn btn-primary dropdown-toggle wt-page-menu-button" type="button" id="page-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= FontAwesome::decorativeIcon('edit') ?> + <?= view('icons/edit') ?> <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> diff --git a/resources/views/gedcom-record-page-menu.phtml b/resources/views/gedcom-record-page-menu.phtml index c36454426f..7a348f5332 100644 --- a/resources/views/gedcom-record-page-menu.phtml +++ b/resources/views/gedcom-record-page-menu.phtml @@ -1,10 +1,9 @@ <?php use Fisharebest\Webtrees\Auth; ?> -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\I18N; ?> <div class="dropdown wt-page-menu"> <button class="btn btn-primary dropdown-toggle wt-page-menu-button" type="button" id="page-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= FontAwesome::decorativeIcon('edit') ?> + <?= view('icons/edit') ?> <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> diff --git a/resources/views/icons/add.phtml b/resources/views/icons/add.phtml index 51b2853604..95bca0ac56 100644 --- a/resources/views/icons/add.phtml +++ b/resources/views/icons/add.phtml @@ -1 +1 @@ -<i class="fas fa-plus fa-fw" aria-hidden="true"></i> +<i class="fas fa-plus fa-fw wt-icon-add" aria-hidden="true"></i> diff --git a/resources/views/icons/arrow-down.phtml b/resources/views/icons/arrow-down.phtml index ea23115235..d208bcaca5 100644 --- a/resources/views/icons/arrow-down.phtml +++ b/resources/views/icons/arrow-down.phtml @@ -1 +1 @@ -<i class="fas fa-arrow-down fa-fw" aria-hidden="true"></i> +<i class="fas fa-arrow-down fa-fw wt-icon-arrow-down" aria-hidden="true"></i> diff --git a/resources/views/icons/arrow-end.phtml b/resources/views/icons/arrow-end.phtml index 508855281b..2897006778 100644 --- a/resources/views/icons/arrow-end.phtml +++ b/resources/views/icons/arrow-end.phtml @@ -1 +1 @@ -<i class="fas fa-arrow-end fa-fw" aria-hidden="true"></i> +<i class="fas fa-arrow-end fa-fw wt-icon-arrow-end" aria-hidden="true"></i> diff --git a/resources/views/icons/arrow-start.phtml b/resources/views/icons/arrow-start.phtml index e024cb6d50..72f685b622 100644 --- a/resources/views/icons/arrow-start.phtml +++ b/resources/views/icons/arrow-start.phtml @@ -1 +1 @@ -<i class="fas fa-arrow-start fa-fw" aria-hidden="true"></i> +<i class="fas fa-arrow-start fa-fw wt-icon-arrow-start" aria-hidden="true"></i> diff --git a/resources/views/icons/arrow-up.phtml b/resources/views/icons/arrow-up.phtml index 8b4d3d0ff2..f96e83425a 100644 --- a/resources/views/icons/arrow-up.phtml +++ b/resources/views/icons/arrow-up.phtml @@ -1 +1 @@ -<i class="fas fa-arrow-up fa-fw" aria-hidden="true"></i> +<i class="fas fa-arrow-up fa-fw wt-icon-arrow-up" aria-hidden="true"></i> diff --git a/resources/views/icons/ban.phtml b/resources/views/icons/ban.phtml index cfbcd052d5..e7419d4bf3 100644 --- a/resources/views/icons/ban.phtml +++ b/resources/views/icons/ban.phtml @@ -1 +1 @@ -<i class="fas fa-ban text-danger fa-fw" aria-hidden="true"></i> +<i class="fas fa-ban text-danger fa-fw wt-icon-ban" aria-hidden="true"></i> diff --git a/resources/views/icons/bing-maps.phtml b/resources/views/icons/bing-maps.phtml index 382456dd0d..b18caffa07 100644 --- a/resources/views/icons/bing-maps.phtml +++ b/resources/views/icons/bing-maps.phtml @@ -1 +1 @@ -<i class="fas fa-map fa-fw" aria-hidden="true"></i> +<i class="fas fa-map fa-fw wt-icon-bing-maps" aria-hidden="true"></i> diff --git a/resources/views/icons/block-tree.phtml b/resources/views/icons/block-tree.phtml index cf7ab58de8..2a175855f3 100644 --- a/resources/views/icons/block-tree.phtml +++ b/resources/views/icons/block-tree.phtml @@ -1 +1 @@ -<i class="fas fa-tree fa-fw" aria-hidden="true"></i> +<i class="fas fa-tree fa-fw wt-icon-block-tree" aria-hidden="true"></i> diff --git a/resources/views/icons/block-user.phtml b/resources/views/icons/block-user.phtml index f853259b3f..de7d0dcecf 100644 --- a/resources/views/icons/block-user.phtml +++ b/resources/views/icons/block-user.phtml @@ -1 +1 @@ -<i class="far fa-user fa-fw" aria-hidden="true"></i> +<i class="far fa-user fa-fw wt-icon-block-user" aria-hidden="true"></i> diff --git a/resources/views/icons/block.phtml b/resources/views/icons/block.phtml index e53eb7c151..9e59618915 100644 --- a/resources/views/icons/block.phtml +++ b/resources/views/icons/block.phtml @@ -1 +1 @@ -<i class="fas fa-th-list fa-flip-horizontal fa-fw" aria-hidden="true"></i> +<i class="fas fa-th-list fa-flip-horizontal fa-fw wt-icon-block" aria-hidden="true"></i> diff --git a/resources/views/icons/calendar.phtml b/resources/views/icons/calendar.phtml index 556d41e967..5726650a0f 100644 --- a/resources/views/icons/calendar.phtml +++ b/resources/views/icons/calendar.phtml @@ -1 +1 @@ -<i class="fas fa-calendar fa-fw" aria-hidden="true"></i> +<i class="fas fa-calendar fa-fw wt-icon-calendar" aria-hidden="true"></i> diff --git a/resources/views/icons/cancel.phtml b/resources/views/icons/cancel.phtml index 8469a131d1..06ac0c072a 100644 --- a/resources/views/icons/cancel.phtml +++ b/resources/views/icons/cancel.phtml @@ -1 +1 @@ -<i class="fas fa-times fa-fw" aria-hidden="true"></i> +<i class="fas fa-times fa-fw wt-icon-cancel" aria-hidden="true"></i> diff --git a/resources/views/icons/chart.phtml b/resources/views/icons/chart.phtml index 60d6a3f154..6cd0db4ed6 100644 --- a/resources/views/icons/chart.phtml +++ b/resources/views/icons/chart.phtml @@ -1 +1 @@ -<i class="fas fa-sitemap fa-fw" aria-hidden="true"></i> +<i class="fas fa-sitemap fa-fw wt-icon-chart" aria-hidden="true"></i> diff --git a/resources/views/icons/coordinates.phtml b/resources/views/icons/coordinates.phtml index 75695cfa18..df14510525 100644 --- a/resources/views/icons/coordinates.phtml +++ b/resources/views/icons/coordinates.phtml @@ -1 +1 @@ -<i class="fas fa-map-marker fa-fw" aria-hidden="true"></i> +<i class="fas fa-map-marker fa-fw wt-icon-co-ordinates" aria-hidden="true"></i> diff --git a/resources/views/icons/copy.phtml b/resources/views/icons/copy.phtml index 149595fe96..c692368291 100644 --- a/resources/views/icons/copy.phtml +++ b/resources/views/icons/copy.phtml @@ -1 +1 @@ -<i class="far fa-copy fa-fw" aria-hidden="true"></i> +<i class="far fa-copy fa-fw wt-icon-copy" aria-hidden="true"></i> diff --git a/resources/views/icons/delete.phtml b/resources/views/icons/delete.phtml index d36b0a9cde..2695828e51 100644 --- a/resources/views/icons/delete.phtml +++ b/resources/views/icons/delete.phtml @@ -1 +1 @@ -<i class="far fa-trash-alt fa-fw" aria-hidden="true"></i> +<i class="far fa-trash-alt fa-fw wt-icon-delete" aria-hidden="true"></i> diff --git a/resources/views/icons/download.phtml b/resources/views/icons/download.phtml index 7ccffc0cb0..5194ab2a1f 100644 --- a/resources/views/icons/download.phtml +++ b/resources/views/icons/download.phtml @@ -1 +1 @@ -<i class="fas fa-download fa-fw" aria-hidden="true"></i> +<i class="fas fa-download fa-fw wt-icon-upload" aria-hidden="true"></i> diff --git a/resources/views/icons/drag-handle.phtml b/resources/views/icons/drag-handle.phtml index 00839ac78b..067416a846 100644 --- a/resources/views/icons/drag-handle.phtml +++ b/resources/views/icons/drag-handle.phtml @@ -1 +1 @@ -<i class="fas fa-grip-horizontal" style="cursor:move;"></i> +<i class="fas fa-grip-horizontal fa-fw wt-icon-drag-handle" style="cursor:move;"></i> diff --git a/resources/views/icons/edit.phtml b/resources/views/icons/edit.phtml index 8d3f23609a..7523216601 100644 --- a/resources/views/icons/edit.phtml +++ b/resources/views/icons/edit.phtml @@ -1 +1 @@ -<i class="fas fa-pencil-alt fa-fw" aria-hidden="true"></i> +<i class="fas fa-pencil-alt fa-fw wt-icon-edit" aria-hidden="true"></i> diff --git a/resources/views/icons/email.phtml b/resources/views/icons/email.phtml index 42e6f54e8e..c956ada15e 100644 --- a/resources/views/icons/email.phtml +++ b/resources/views/icons/email.phtml @@ -1 +1 @@ -<i class="far fa-envelope fa-fw" aria-hidden="true"></i> +<i class="far fa-envelope fa-fw wt-icon-email" aria-hidden="true"></i> diff --git a/resources/views/icons/family.phtml b/resources/views/icons/family.phtml index 35b1aa0a26..00a4effa80 100644 --- a/resources/views/icons/family.phtml +++ b/resources/views/icons/family.phtml @@ -1 +1 @@ -<i class="fas fa-users fa-fw" aria-hidden="true"></i> +<i class="fas fa-users fa-fw wt-icon-family" aria-hidden="true"></i> diff --git a/resources/views/icons/favorite.phtml b/resources/views/icons/favorite.phtml index 14f073f854..1554cb95a3 100644 --- a/resources/views/icons/favorite.phtml +++ b/resources/views/icons/favorite.phtml @@ -1 +1 @@ -<i class="far fa-star fa-fw" aria-hidden="true"></i> +<i class="far fa-star fa-fw wt-icon-favorite" aria-hidden="true"></i> diff --git a/resources/views/icons/google-maps.phtml b/resources/views/icons/google-maps.phtml index 382456dd0d..e3d7c35a02 100644 --- a/resources/views/icons/google-maps.phtml +++ b/resources/views/icons/google-maps.phtml @@ -1 +1 @@ -<i class="fas fa-map fa-fw" aria-hidden="true"></i> +<i class="fas fa-map fa-fw wt-icon-google-maps" aria-hidden="true"></i> diff --git a/resources/views/icons/help.phtml b/resources/views/icons/help.phtml index 83a4cab2c8..3d2e8cd1ca 100644 --- a/resources/views/icons/help.phtml +++ b/resources/views/icons/help.phtml @@ -1 +1 @@ -<i class="fas fa-info-circle fa-fw" aria-hidden="true"></i> +<i class="fas fa-info-circle fa-fw wt-icon-help" aria-hidden="true"></i> diff --git a/resources/views/icons/individual.phtml b/resources/views/icons/individual.phtml index f853259b3f..87e015cf35 100644 --- a/resources/views/icons/individual.phtml +++ b/resources/views/icons/individual.phtml @@ -1 +1 @@ -<i class="far fa-user fa-fw" aria-hidden="true"></i> +<i class="far fa-user fa-fw wt-icon-family" aria-hidden="true"></i> diff --git a/resources/views/icons/keyboard.phtml b/resources/views/icons/keyboard.phtml index f941960891..b57d03c636 100644 --- a/resources/views/icons/keyboard.phtml +++ b/resources/views/icons/keyboard.phtml @@ -1 +1 @@ -<i class="far fa-keyboard fa-fw" aria-hidden="true"></i> +<i class="far fa-keyboard fa-fw wt-icon-keyboard" aria-hidden="true"></i> diff --git a/resources/views/icons/location.phtml b/resources/views/icons/location.phtml index e4e73843e0..f0d9d14736 100644 --- a/resources/views/icons/location.phtml +++ b/resources/views/icons/location.phtml @@ -1 +1 @@ -<i class="fas fa-map-marker-alt fa-fw" aria-hidden="true"></i> +<i class="fas fa-map-marker-alt fa-fw wt-icon-location" aria-hidden="true"></i> diff --git a/resources/views/icons/lock.phtml b/resources/views/icons/lock.phtml index 3bcb48f363..6eb5c72412 100644 --- a/resources/views/icons/lock.phtml +++ b/resources/views/icons/lock.phtml @@ -1 +1 @@ -<i class="fas fa-lock fa-fw" aria-hidden="true"></i> +<i class="fas fa-lock fa-fw wt-icon-lock" aria-hidden="true"></i> diff --git a/resources/views/icons/map.phtml b/resources/views/icons/map.phtml index 479a2f5c2a..7acecedbf2 100644 --- a/resources/views/icons/map.phtml +++ b/resources/views/icons/map.phtml @@ -1 +1 @@ -<i class="far fa-map fa-fw" aria-hidden="true"></i> +<i class="far fa-map fa-fw wt-icon-map" aria-hidden="true"></i> diff --git a/resources/views/icons/media-next.phtml b/resources/views/icons/media-next.phtml index 3893f0d2c6..ff9076d6fb 100644 --- a/resources/views/icons/media-next.phtml +++ b/resources/views/icons/media-next.phtml @@ -1 +1 @@ -<i class="fas fa-step-forward fa-fw" aria-hidden="true"></i> +<i class="fas fa-step-forward fa-fw wt-icon-media-next" aria-hidden="true"></i> diff --git a/resources/views/icons/media-play.phtml b/resources/views/icons/media-play.phtml index 20d052b6bc..bcbe82f076 100644 --- a/resources/views/icons/media-play.phtml +++ b/resources/views/icons/media-play.phtml @@ -1 +1 @@ -<i class="fas fa-play fa-fw" aria-hidden="true"></i> +<i class="fas fa-play fa-fw wt-icon-media-play" aria-hidden="true"></i> diff --git a/resources/views/icons/media-stop.phtml b/resources/views/icons/media-stop.phtml index a7ed33b6ca..7bf074c0ca 100644 --- a/resources/views/icons/media-stop.phtml +++ b/resources/views/icons/media-stop.phtml @@ -1 +1 @@ -<i class="fas fa-stop fa-fw" aria-hidden="true"></i> +<i class="fas fa-stop fa-fw wt-icon-media-stop" aria-hidden="true"></i> diff --git a/resources/views/icons/media.phtml b/resources/views/icons/media.phtml index 35ce37671a..4cbbf394bf 100644 --- a/resources/views/icons/media.phtml +++ b/resources/views/icons/media.phtml @@ -1 +1 @@ -<i class="far fa-file-image fa-fw" aria-hidden="true"></i> +<i class="far fa-file-image fa-fw wt-icon-media" aria-hidden="true"></i> diff --git a/resources/views/icons/menu.phtml b/resources/views/icons/menu.phtml index 760fc75d71..a68c11b67a 100644 --- a/resources/views/icons/menu.phtml +++ b/resources/views/icons/menu.phtml @@ -1 +1 @@ -<i class="fas fa-bars fa-fw" aria-hidden="true"></i> +<i class="fas fa-bars fa-fw wt-icon-menu" aria-hidden="true"></i> diff --git a/resources/views/icons/merge.phtml b/resources/views/icons/merge.phtml index a6a853ec14..de2ba173c9 100644 --- a/resources/views/icons/merge.phtml +++ b/resources/views/icons/merge.phtml @@ -1 +1 @@ -<i class="fas fa-code-branch fa-fw" aria-hidden="true"></i> +<i class="fas fa-code-branch fa-fw wt-icon-merge" aria-hidden="true"></i> diff --git a/resources/views/icons/note.phtml b/resources/views/icons/note.phtml index 152c37d3d0..9c8f2b0470 100644 --- a/resources/views/icons/note.phtml +++ b/resources/views/icons/note.phtml @@ -1 +1 @@ -<i class="far fa-sticky-note fa-fw" aria-hidden="true"></i> +<i class="far fa-sticky-note fa-fw wt-icon-note" aria-hidden="true"></i> diff --git a/resources/views/icons/openstreetmap.phtml b/resources/views/icons/openstreetmap.phtml index 382456dd0d..803350c3ef 100644 --- a/resources/views/icons/openstreetmap.phtml +++ b/resources/views/icons/openstreetmap.phtml @@ -1 +1 @@ -<i class="fas fa-map fa-fw" aria-hidden="true"></i> +<i class="fas fa-map fa-fw wt-icon-openstreetmap" aria-hidden="true"></i> diff --git a/resources/views/icons/pin.phtml b/resources/views/icons/pin.phtml index 2f976b10c6..842fb20716 100644 --- a/resources/views/icons/pin.phtml +++ b/resources/views/icons/pin.phtml @@ -1 +1 @@ -<i class="fas fa-thumbtack fa-fw" aria-hidden="true"></i> +<i class="fas fa-thumbtack fa-fw wt-icon-pin" aria-hidden="true"></i> diff --git a/resources/views/icons/preferences.phtml b/resources/views/icons/preferences.phtml index 57aa6a153c..29d434b2ba 100644 --- a/resources/views/icons/preferences.phtml +++ b/resources/views/icons/preferences.phtml @@ -1 +1 @@ -<i class="fas fa-wrench fa-fw" aria-hidden="true"></i> +<i class="fas fa-wrench fa-fw wt-icon-preferences" aria-hidden="true"></i> diff --git a/resources/views/icons/report.phtml b/resources/views/icons/report.phtml index 6f4a247584..4bb46adabc 100644 --- a/resources/views/icons/report.phtml +++ b/resources/views/icons/report.phtml @@ -1 +1 @@ -<i class="far fa-file fa-fw" aria-hidden="true"></i> +<i class="far fa-file fa-fw wt-icon-repor" aria-hidden="true"></i> diff --git a/resources/views/icons/repository.phtml b/resources/views/icons/repository.phtml index e69ee84cb2..76badf3061 100644 --- a/resources/views/icons/repository.phtml +++ b/resources/views/icons/repository.phtml @@ -1 +1 @@ -<i class="fas fa-university fa-fw" aria-hidden="true"></i> +<i class="fas fa-university fa-fw wt-icon-repository" aria-hidden="true"></i> diff --git a/resources/views/icons/save.phtml b/resources/views/icons/save.phtml index e9dbf9b6c0..3c70099951 100644 --- a/resources/views/icons/save.phtml +++ b/resources/views/icons/save.phtml @@ -1 +1 @@ -<i class="fas fa-check fa-fw" aria-hidden="true"></i> +<i class="fas fa-check fa-fw wt-icon-save" aria-hidden="true"></i> diff --git a/resources/views/icons/search.phtml b/resources/views/icons/search.phtml index 04c015a05d..63af4e36ad 100644 --- a/resources/views/icons/search.phtml +++ b/resources/views/icons/search.phtml @@ -1 +1 @@ -<i class="fas fa-search fa-fw" aria-hidden="true"></i> +<i class="fas fa-search fa-fw wt-icon-search" aria-hidden="true"></i> diff --git a/resources/views/icons/sidebar.phtml b/resources/views/icons/sidebar.phtml index 20938f3751..6a49f5f2d4 100644 --- a/resources/views/icons/sidebar.phtml +++ b/resources/views/icons/sidebar.phtml @@ -1 +1 @@ -<i class="fas fa-pause fa-fw" aria-hidden="true"></i> +<i class="fas fa-pause fa-fw wt-icon-sidebar" aria-hidden="true"></i> diff --git a/resources/views/icons/sort.phtml b/resources/views/icons/sort.phtml index 3bbdf41c80..6ece5275fe 100644 --- a/resources/views/icons/sort.phtml +++ b/resources/views/icons/sort.phtml @@ -1 +1 @@ -<i class="fas fa-sort-amount-down fa-fw" aria-hidden="true"></i> +<i class="fas fa-sort-amount-down fa-fw wt-icon-sort" aria-hidden="true"></i> diff --git a/resources/views/icons/source.phtml b/resources/views/icons/source.phtml index 29d7431efc..5b52f848c1 100644 --- a/resources/views/icons/source.phtml +++ b/resources/views/icons/source.phtml @@ -1 +1 @@ -<i class="far fa-file-alt fa-fw" aria-hidden="true"></i> +<i class="far fa-file-alt fa-fw wt-icon-source" aria-hidden="true"></i> diff --git a/resources/views/icons/submitter.phtml b/resources/views/icons/submitter.phtml index f853259b3f..4a0644c83c 100644 --- a/resources/views/icons/submitter.phtml +++ b/resources/views/icons/submitter.phtml @@ -1 +1 @@ -<i class="far fa-user fa-fw" aria-hidden="true"></i> +<i class="far fa-user fa-fw wt-icon-submitter" aria-hidden="true"></i> diff --git a/resources/views/icons/sync.phtml b/resources/views/icons/sync.phtml index 7fc878bbf5..c929862996 100644 --- a/resources/views/icons/sync.phtml +++ b/resources/views/icons/sync.phtml @@ -1 +1 @@ -<i class="fas fa-sync-alt fa-fw" aria-hidden="true"></i> +<i class="fas fa-sync-alt fa-fw wt-icon-sync" aria-hidden="true"></i> diff --git a/resources/views/icons/tab.phtml b/resources/views/icons/tab.phtml index 122c02d473..a6d73edb96 100644 --- a/resources/views/icons/tab.phtml +++ b/resources/views/icons/tab.phtml @@ -1 +1 @@ -<i class="far fa-folder fa-fw" aria-hidden="true"></i> +<i class="far fa-folder fa-fw wt-icon-theme" aria-hidden="true"></i> diff --git a/resources/views/icons/theme.phtml b/resources/views/icons/theme.phtml index fc444fd4b1..ff1302a46e 100644 --- a/resources/views/icons/theme.phtml +++ b/resources/views/icons/theme.phtml @@ -1 +1 @@ -<i class="fas fa-paint-brush fa-fw" aria-hidden="true"></i> +<i class="fas fa-paint-brush fa-fw wt-icon-theme" aria-hidden="true"></i> diff --git a/resources/views/icons/tree.phtml b/resources/views/icons/tree.phtml index cf7ab58de8..6ecae766d9 100644 --- a/resources/views/icons/tree.phtml +++ b/resources/views/icons/tree.phtml @@ -1 +1 @@ -<i class="fas fa-tree fa-fw" aria-hidden="true"></i> +<i class="fas fa-tree fa-fw wt-icon-tree" aria-hidden="true"></i> diff --git a/resources/views/icons/unlink.phtml b/resources/views/icons/unlink.phtml index a20b990a5e..1a5741a1eb 100644 --- a/resources/views/icons/unlink.phtml +++ b/resources/views/icons/unlink.phtml @@ -1 +1 @@ -<i class="fas fa-unlink fa-fw" aria-hidden="true"></i> +<i class="fas fa-unlink fa-fw wt-icon-unlink" aria-hidden="true"></i> diff --git a/resources/views/icons/upload.phtml b/resources/views/icons/upload.phtml index 0865b10e25..f5c42956c4 100644 --- a/resources/views/icons/upload.phtml +++ b/resources/views/icons/upload.phtml @@ -1 +1 @@ -<i class="fas fa-upload fa-fw" aria-hidden="true"></i> +<i class="fas fa-upload fa-fw wt-icon-upload" aria-hidden="true"></i> diff --git a/resources/views/icons/user.phtml b/resources/views/icons/user.phtml index dd13701f12..3476257dbe 100644 --- a/resources/views/icons/user.phtml +++ b/resources/views/icons/user.phtml @@ -1 +1 @@ -<i class="fas fa-user fa-fw" aria-hidden="true"></i> +<i class="fas fa-user fa-fw wt-icon-user" aria-hidden="true"></i> diff --git a/resources/views/icons/warning.phtml b/resources/views/icons/warning.phtml index 8873359bb7..5d7bc01c1b 100644 --- a/resources/views/icons/warning.phtml +++ b/resources/views/icons/warning.phtml @@ -1 +1 @@ -<i class="fas fa-exclamation-triangle fa-fw" aria-hidden="true"></i> +<i class="fas fa-exclamation-triangle fa-fw wt-icon-warning" aria-hidden="true"></i> diff --git a/resources/views/icons/wizard.phtml b/resources/views/icons/wizard.phtml index 5e4e13a21f..a9e91287fe 100644 --- a/resources/views/icons/wizard.phtml +++ b/resources/views/icons/wizard.phtml @@ -1 +1 @@ -<i class="fas fa-magic fa-fw" aria-hidden="true"></i> +<i class="fas fa-magic fa-fw wt-icon-wizard" aria-hidden="true"></i> diff --git a/resources/views/individual-page-menu.phtml b/resources/views/individual-page-menu.phtml index 24da84a7b2..f29dda6349 100644 --- a/resources/views/individual-page-menu.phtml +++ b/resources/views/individual-page-menu.phtml @@ -1,10 +1,9 @@ <?php use Fisharebest\Webtrees\Auth; ?> -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\I18N; ?> <div class="dropdown wt-page-menu"> <button class="btn btn-primary dropdown-toggle wt-page-menu-button" type="button" id="page-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= FontAwesome::decorativeIcon('edit') ?> + <?= view('icons/edit') ?> <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> diff --git a/resources/views/media-page-menu.phtml b/resources/views/media-page-menu.phtml index 585b52b218..df9ecb98de 100644 --- a/resources/views/media-page-menu.phtml +++ b/resources/views/media-page-menu.phtml @@ -1,12 +1,11 @@ <?php use Fisharebest\Webtrees\Auth; ?> -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\I18N; ?> <?php use Fisharebest\Webtrees\Module; ?> <?php use Fisharebest\Webtrees\Module\CensusAssistantModule; ?> <div class="dropdown wt-page-menu"> <button class="btn btn-primary dropdown-toggle wt-page-menu-button" type="button" id="page-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= FontAwesome::decorativeIcon('edit') ?> + <?= view('icons/edit') ?> <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> diff --git a/resources/views/modals/create-family.phtml b/resources/views/modals/create-family.phtml index 09420bee1c..b4d8a02a68 100644 --- a/resources/views/modals/create-family.phtml +++ b/resources/views/modals/create-family.phtml @@ -30,11 +30,11 @@ </div> <div class="modal-footer"> <button type="submit" class="btn btn-primary"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= I18N::translate('save') ?> </button> <button type="button" class="btn btn-text" data-dismiss="modal"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </button> </div> diff --git a/resources/views/modals/create-media-from-file.phtml b/resources/views/modals/create-media-from-file.phtml index 6feffebc6a..8b77bec999 100644 --- a/resources/views/modals/create-media-from-file.phtml +++ b/resources/views/modals/create-media-from-file.phtml @@ -52,11 +52,11 @@ </div> <div class="modal-footer"> <button type="submit" class="btn btn-primary"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= I18N::translate('save') ?> </button> <button type="button" class="btn btn-text" data-dismiss="modal"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </button> </div> diff --git a/resources/views/modals/footer-close.phtml b/resources/views/modals/footer-close.phtml index 622dafb269..0fd06c92a0 100644 --- a/resources/views/modals/footer-close.phtml +++ b/resources/views/modals/footer-close.phtml @@ -3,7 +3,7 @@ <div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= I18N::translate('close') ?> </button> </div> diff --git a/resources/views/modals/footer-save-cancel.phtml b/resources/views/modals/footer-save-cancel.phtml index b012f9593f..a5cfd3c11f 100644 --- a/resources/views/modals/footer-save-cancel.phtml +++ b/resources/views/modals/footer-save-cancel.phtml @@ -3,11 +3,11 @@ <div class="modal-footer"> <button type="submit" class="btn btn-primary"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= I18N::translate('save') ?> </button> <button type="button" class="btn btn-secondary" data-dismiss="modal"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </button> </div> diff --git a/resources/views/modules/clippings/add-options.phtml b/resources/views/modules/clippings/add-options.phtml index 51961f6b03..7d1e4ba016 100644 --- a/resources/views/modules/clippings/add-options.phtml +++ b/resources/views/modules/clippings/add-options.phtml @@ -20,12 +20,12 @@ <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') ?> + <?= view('icons/save') ?> <?= /* I18N: A button label. */ I18N::translate('continue') ?> </button> <a class="btn btn-secondary" href="<?= e($record->url()) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= /* I18N: A button label. */ I18N::translate('cancel') ?> </a> </div> diff --git a/resources/views/modules/clippings/download.phtml b/resources/views/modules/clippings/download.phtml index a531c7ee96..8cb13c2930 100644 --- a/resources/views/modules/clippings/download.phtml +++ b/resources/views/modules/clippings/download.phtml @@ -57,11 +57,11 @@ </div> <div class="col-sm-9 wt-page-options-value"> <button type="submit" class="btn btn-primary"> - <?= FontAwesome::decorativeIcon('download') ?> + <?= view('icons/download') ?> <?= I18N::translate('download') ?> </button> <a href="<?= e(route('module', ['module' => 'clippings', 'action' => 'Show', 'ged' => $tree->name()])) ?>" class="btn btn-secondary"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> </div> diff --git a/resources/views/modules/compact-chart/arrow-down.phtml b/resources/views/modules/compact-chart/arrow-down.phtml new file mode 100644 index 0000000000..8a9b2dd796 --- /dev/null +++ b/resources/views/modules/compact-chart/arrow-down.phtml @@ -0,0 +1,8 @@ +<?php use Fisharebest\Webtrees\FontAwesome; ?> +<?php use Fisharebest\Webtrees\I18N; ?> + +<?php if ($individual === null) : ?> + <?= view('icons/arrow-down') ?> +<?php else : ?> + <?= FontAwesome::linkIcon('arrow-down', I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name()])]) ?> +<?php endif; diff --git a/resources/views/modules/compact-chart/arrow-end.phtml b/resources/views/modules/compact-chart/arrow-end.phtml new file mode 100644 index 0000000000..3d408ec522 --- /dev/null +++ b/resources/views/modules/compact-chart/arrow-end.phtml @@ -0,0 +1,8 @@ +<?php use Fisharebest\Webtrees\FontAwesome; ?> +<?php use Fisharebest\Webtrees\I18N; ?> + +<?php if ($individual === null) : ?> + <?= view('icons/arrow-end') ?> +<?php else : ?> + <?= FontAwesome::linkIcon('arrow-end', I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name()])]) ?> +<?php endif; diff --git a/resources/views/modules/compact-chart/arrow-start.phtml b/resources/views/modules/compact-chart/arrow-start.phtml new file mode 100644 index 0000000000..de7bdbea08 --- /dev/null +++ b/resources/views/modules/compact-chart/arrow-start.phtml @@ -0,0 +1,8 @@ +<?php use Fisharebest\Webtrees\FontAwesome; ?> +<?php use Fisharebest\Webtrees\I18N; ?> + +<?php if ($individual === null) : ?> + <?= view('icons/arrow-start') ?> +<?php else : ?> + <?= FontAwesome::linkIcon('arrow-start', I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name()])]) ?> +<?php endif; diff --git a/resources/views/modules/compact-chart/arrow-up.phtml b/resources/views/modules/compact-chart/arrow-up.phtml new file mode 100644 index 0000000000..2ea845f9e8 --- /dev/null +++ b/resources/views/modules/compact-chart/arrow-up.phtml @@ -0,0 +1,8 @@ +<?php use Fisharebest\Webtrees\FontAwesome; ?> +<?php use Fisharebest\Webtrees\I18N; ?> + +<?php if ($individual === null) : ?> + <?= view('icons/arrow-up') ?> +<?php else : ?> + <?= FontAwesome::linkIcon('arrow-up', I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name()])]) ?> +<?php endif; diff --git a/resources/views/modules/compact-chart/arrow.phtml b/resources/views/modules/compact-chart/arrow.phtml deleted file mode 100644 index 9b3da56ab1..0000000000 --- a/resources/views/modules/compact-chart/arrow.phtml +++ /dev/null @@ -1,8 +0,0 @@ -<?php use Fisharebest\Webtrees\FontAwesome; ?> -<?php use Fisharebest\Webtrees\I18N; ?> - -<?php if ($individual === null) : ?> - <?= FontAwesome::decorativeIcon($class) ?> -<?php else : ?> - <?= FontAwesome::linkIcon($class, I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name()])]) ?> -<?php endif; diff --git a/resources/views/modules/compact-chart/chart.phtml b/resources/views/modules/compact-chart/chart.phtml index 67f4ad2a92..a9c02ac450 100644 --- a/resources/views/modules/compact-chart/chart.phtml +++ b/resources/views/modules/compact-chart/chart.phtml @@ -22,23 +22,23 @@ </tr> <tr> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(16)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(16)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(18)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(18)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(24)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(24)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(26)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(26)]) ?> </td> </tr> <tr> @@ -46,13 +46,13 @@ <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(8)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-start', 'individual' => $ancestors->get(8)]) ?> + <?= view('modules/compact-chart/arrow-start', ['individual' => $ancestors->get(8)]) ?> </td> <td> <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(4)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-end', 'individual' => $ancestors->get(9)]) ?> + <?= view('modules/compact-chart/arrow-end', ['individual' => $ancestors->get(9)]) ?> </td> <td> <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(9)]) ?> @@ -62,13 +62,13 @@ <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(12)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-start', 'individual' => $ancestors->get(12)]) ?> + <?= view('modules/compact-chart/arrow-start', ['individual' => $ancestors->get(12)]) ?> </td> <td> <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(6)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-end', 'individual' => $ancestors->get(13)]) ?> + <?= view('modules/compact-chart/arrow-end', ['individual' => $ancestors->get(13)]) ?> </td> <td> <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(13)]) ?> @@ -76,23 +76,23 @@ </tr> <tr> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(17)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(17)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(19)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(19)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(25)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(25)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(27)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(27)]) ?> </td> </tr> <tr> @@ -101,7 +101,7 @@ </td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(4)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(4)]) ?> </td> <td></td> <td> @@ -113,7 +113,7 @@ </td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(6)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(6)]) ?> </td> <td></td> <td> @@ -144,13 +144,13 @@ <table width="100%"> <tr> <td width='25%'> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-start', 'individual' => $ancestors->get(2)]) ?> + <?= view('modules/compact-chart/arrow-start', ['individual' => $ancestors->get(2)]) ?> </td> <td> <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(1)]) ?> </td> <td width='25%'> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-end', 'individual' => $ancestors->get(3)]) ?> + <?= view('modules/compact-chart/arrow-end', ['individual' => $ancestors->get(3)]) ?> </td> </tr> </table> @@ -181,7 +181,7 @@ </td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(5)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(5)]) ?> </td> <td></td> <td> @@ -193,7 +193,7 @@ </td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(7)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(7)]) ?> </td> <td></td> <td> @@ -202,23 +202,23 @@ </tr> <tr> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(20)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(20)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(22)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(22)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(28)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(28)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-up', 'individual' => $ancestors->get(30)]) ?> + <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(30)]) ?> </td> </tr> <tr> @@ -226,13 +226,13 @@ <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(10)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-start', 'individual' => $ancestors->get(10)]) ?> + <?= view('modules/compact-chart/arrow-start', ['individual' => $ancestors->get(10)]) ?> </td> <td> <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(5)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-end', 'individual' => $ancestors->get(11)]) ?> + <?= view('modules/compact-chart/arrow-end', ['individual' => $ancestors->get(11)]) ?> </td> <td> <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(11)]) ?> @@ -242,13 +242,13 @@ <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(14)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-start', 'individual' => $ancestors->get(14)]) ?> + <?= view('modules/compact-chart/arrow-start', ['individual' => $ancestors->get(14)]) ?> </td> <td> <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(7)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-end', 'individual' => $ancestors->get(15)]) ?> + <?= view('modules/compact-chart/arrow-end', ['individual' => $ancestors->get(15)]) ?> </td> <td> <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(15)]) ?> @@ -256,23 +256,23 @@ </tr> <tr> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(21)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(21)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(23)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(23)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(29)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(29)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow', ['class' => 'arrow-down', 'individual' => $ancestors->get(31)]) ?> + <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(31)]) ?> </td> </tr> <tr> diff --git a/resources/views/modules/edit-block-config.phtml b/resources/views/modules/edit-block-config.phtml index 231219db85..cc05493109 100644 --- a/resources/views/modules/edit-block-config.phtml +++ b/resources/views/modules/edit-block-config.phtml @@ -18,11 +18,11 @@ <div class="row form-group"> <div class="offset-sm-3 col-sm-9"> <button type="submit" class="btn btn-primary"> - <?= FontAwesome::decorativeIcon('save') ?> + <?= view('icons/save') ?> <?= I18N::translate('save') ?> </button> <a class="btn btn-secondary" href="<?= e($cancel_url) ?>"> - <?= FontAwesome::decorativeIcon('cancel') ?> + <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> </div> diff --git a/resources/views/note-page-menu.phtml b/resources/views/note-page-menu.phtml index d6a9c01974..976fd4e61d 100644 --- a/resources/views/note-page-menu.phtml +++ b/resources/views/note-page-menu.phtml @@ -1,10 +1,9 @@ <?php use Fisharebest\Webtrees\Auth; ?> -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\I18N; ?> <div class="dropdown wt-page-menu"> <button class="btn btn-primary dropdown-toggle wt-page-menu-button" type="button" id="page-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= FontAwesome::decorativeIcon('edit') ?> + <?= view('icons/edit') ?> <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> diff --git a/resources/views/repository-page-menu.phtml b/resources/views/repository-page-menu.phtml index 770afc256a..d06ec7ac21 100644 --- a/resources/views/repository-page-menu.phtml +++ b/resources/views/repository-page-menu.phtml @@ -1,10 +1,9 @@ <?php use Fisharebest\Webtrees\Auth; ?> -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\I18N; ?> <div class="dropdown wt-page-menu"> <button class="btn btn-primary dropdown-toggle wt-page-menu-button" type="button" id="page-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= FontAwesome::decorativeIcon('edit') ?> + <?= view('icons/edit') ?> <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> diff --git a/resources/views/source-page-menu.phtml b/resources/views/source-page-menu.phtml index fa0e14419e..adc60d78bf 100644 --- a/resources/views/source-page-menu.phtml +++ b/resources/views/source-page-menu.phtml @@ -1,10 +1,9 @@ <?php use Fisharebest\Webtrees\Auth; ?> -<?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\I18N; ?> <div class="dropdown wt-page-menu"> <button class="btn btn-primary dropdown-toggle wt-page-menu-button" type="button" id="page-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <?= FontAwesome::decorativeIcon('edit') ?> + <?= view('icons/edit') ?> <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> |