Working on icons

13 files changed, 29 insertions, 32 deletions

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>