From adeda5f9b46e47809a15653b039c9ec15d6b6a1f Mon Sep 17 00:00:00 2001
From: Jonathan Jaubart <dev@jaubart.com>
Date: Tue, 26 Jul 2022 00:16:31 +0100
Subject: [PATCH] IsSourced: Wrap hook status icons in single span & reduce
 spacing

---
 composer.lock                                 |  8 ++---
 .../resources/views/hooks/name-append.phtml   | 32 +++++++++++++++++++
 .../views/icons/source-status-fact.phtml      |  6 +++-
 .../views/icons/source-status-record.phtml    |  6 +++-
 .../myartjaub_issourced/src/sass/_base.scss   |  5 ++-
 5 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 modules_v4/myartjaub_issourced/resources/views/hooks/name-append.phtml

diff --git a/composer.lock b/composer.lock
index c27f4eacd8..25bc29557f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2884,12 +2884,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/jon48/webtrees-lib.git",
-                "reference": "9fcb9f7db3daf19ba783e498633bb64650d59894"
+                "reference": "c808ff9a95c322da6a8958cc142d2136a7b74898"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jon48/webtrees-lib/zipball/9fcb9f7db3daf19ba783e498633bb64650d59894",
-                "reference": "9fcb9f7db3daf19ba783e498633bb64650d59894",
+                "url": "https://api.github.com/repos/jon48/webtrees-lib/zipball/c808ff9a95c322da6a8958cc142d2136a7b74898",
+                "reference": "c808ff9a95c322da6a8958cc142d2136a7b74898",
                 "shasum": ""
             },
             "require": {
@@ -2955,7 +2955,7 @@
                 "issues": "http://bugs.jaubart.com",
                 "source": "https://github.com/jon48/webtrees-lib/tree/develop"
             },
-            "time": "2022-07-24T19:27:30+00:00"
+            "time": "2022-07-25T22:54:20+00:00"
         },
         {
             "name": "jon48/webtrees-mod-maj-geodata-france",
diff --git a/modules_v4/myartjaub_issourced/resources/views/hooks/name-append.phtml b/modules_v4/myartjaub_issourced/resources/views/hooks/name-append.phtml
new file mode 100644
index 0000000000..6ad2c75b5b
--- /dev/null
+++ b/modules_v4/myartjaub_issourced/resources/views/hooks/name-append.phtml
@@ -0,0 +1,32 @@
+<?php
+
+use MyArtJaub\Webtrees\Module\IsSourced\Services\SourceStatusService;
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * @var string                  $module_name
+ * @var SourceStatusService     $source_status_service
+ * @var Individual              $individual
+ * @var string                  $size_style
+ */
+
+?>
+<span class="maj-issourced-hook-name-append align-middle d-inline-flex align-items-stretch justify-content-between">
+    <?= view($module_name . '::icons/source-status', [
+        'module_name'   =>  $module_name,
+        'source_status' =>  $source_status_service->sourceStatusForRecord($individual),
+        'context'       =>  'INDI',
+        'size_style'    =>  $size_style ]) ?>
+    <?= view($module_name . '::icons/source-status', [
+        'module_name'   =>  $module_name,
+        'source_status' =>  $source_status_service->sourceStatusForBirth($individual),
+        'context'       =>  'INDI:BIRT',
+        'size_style'    =>  $size_style ]) ?>
+    <?php if ($individual->isDead()) : ?>
+        <?=  view($module_name . '::icons/source-status', [
+            'module_name'   =>  $module_name,
+            'source_status' =>  $source_status_service->sourceStatusForDeath($individual),
+            'context'       =>  'INDI:DEAT',
+            'size_style'    =>  $size_style ]) ?>
+    <?php endif; ?>
+</span>
\ No newline at end of file
diff --git a/modules_v4/myartjaub_issourced/resources/views/icons/source-status-fact.phtml b/modules_v4/myartjaub_issourced/resources/views/icons/source-status-fact.phtml
index 01ca4840d5..91b8552ddc 100644
--- a/modules_v4/myartjaub_issourced/resources/views/icons/source-status-fact.phtml
+++ b/modules_v4/myartjaub_issourced/resources/views/icons/source-status-fact.phtml
@@ -13,9 +13,13 @@ $css_class .= $source_status->factHasDate() ? '-fd' : '';
 $css_class .= $source_status->factHasPreciseDate() ? '-fpd' : '';
 $css_class .= $source_status->sourceMatchesFactDate() ? '-smd' : '';
 
+$size_style .= ($source_status->factHasPreciseDate() &&
+    ($source_status->hasSupportingDocument() || $source_status->sourceMatchesFactDate() || !$source_status->hasSource())) ? ' maj-icon-sourcestatus-mx' : '';
+$size_style .= ($source_status->hasSupportingDocument() || $source_status->sourceMatchesFactDate()) ? ' fa-fw' : '';
+
 ?>
 
-<span class="maj-icon-sourcestatus <?= $css_class ?> fa-layers fa-fw <?= $size_style ?>" aria-hidden="true" title="<?= $source_status->label($context) ?>">
+<span class="maj-icon-sourcestatus <?= $css_class ?> fa-layers <?= $size_style ?>" aria-hidden="true" title="<?= $source_status->label($context) ?>">
     <?php if ($source_status->factHasPreciseDate()) : ?>
         <?php if ($source_status->hasSource()) : ?>
             <?php if ($source_status->hasSupportingDocument()) : ?>
diff --git a/modules_v4/myartjaub_issourced/resources/views/icons/source-status-record.phtml b/modules_v4/myartjaub_issourced/resources/views/icons/source-status-record.phtml
index 03c32f9c92..fdabe715b7 100644
--- a/modules_v4/myartjaub_issourced/resources/views/icons/source-status-record.phtml
+++ b/modules_v4/myartjaub_issourced/resources/views/icons/source-status-record.phtml
@@ -8,9 +8,13 @@ use MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus;
  * @var string          $css_class
  * @var string          $context
  */
+
+$size_style .= ($source_status->hasSupportingDocument() || !$source_status->hasSource()) ? ' maj-icon-sourcestatus-mx' : '';
+$size_style .= $source_status->hasSupportingDocument() ? ' fa-fw' : '';
+
 ?>
 
-<span class="maj-icon-sourcestatus <?= $css_class ?> fa-layers fa-fw <?= $size_style ?>" aria-hidden="true" title="<?= $source_status->label($context) ?>">
+<span class="maj-icon-sourcestatus <?= $css_class ?> fa-layers <?= $size_style ?>" aria-hidden="true" title="<?= $source_status->label($context) ?>">
     <?php if ($source_status->hasSupportingDocument()) : ?>
     <i class="fa-solid fa-scroll" data-fa-transform="flip-h right-2"></i>
     <?php endif; ?>
diff --git a/modules_v4/myartjaub_issourced/src/sass/_base.scss b/modules_v4/myartjaub_issourced/src/sass/_base.scss
index 824ecb66eb..87128a7063 100644
--- a/modules_v4/myartjaub_issourced/src/sass/_base.scss
+++ b/modules_v4/myartjaub_issourced/src/sass/_base.scss
@@ -46,7 +46,10 @@
 }
 
 .maj-icon-sourcestatus {
-    vertical-align: middle;
+    &-mx {
+        margin-left: 0.15em;
+        margin-right: 0.15em;
+    }
     
     .fa-scroll {
         color: #c9b88c;