From 50b20d113584b13bda3292ef62221ac2bb99cc4b Mon Sep 17 00:00:00 2001
From: Fredrik Ekdahl <fekdahl@gmail.com>
Date: Sun, 16 Mar 2025 07:09:02 +0100
Subject: [PATCH 1/5] Icon before title in block template

---
 resources/views/modules/block-template.phtml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/views/modules/block-template.phtml b/resources/views/modules/block-template.phtml
index d2a9884055d..75ef7023079 100644
--- a/resources/views/modules/block-template.phtml
+++ b/resources/views/modules/block-template.phtml
@@ -16,13 +16,16 @@ use Fisharebest\Webtrees\I18N;
 
 <div class="card mb-4 wt-block wt-block-<?= e($block) ?>" id="block-<?= e($id) ?>">
     <div class="card-header wt-block-header wt-block-header-<?= e($block) ?>">
+        <?php if (isset($icon) && $icon !== '') : ?>
+            <?= view($icon) ?>
+        <?php endif ?>
+        <?= $title ?>
         <?php if ($config_url !== '') : ?>
-            <a class="btn btn-link" href="<?= e($config_url) ?>" title="<?= I18N::translate('Preferences') ?>">
+            <a class="btn btn-link float-end" href="<?= e($config_url) ?>" title="<?= I18N::translate('Preferences') ?>">
                 <?= view('icons/preferences') ?>
                 <span class="visually-hidden"><?= I18N::translate('Preferences') ?></span>
             </a>
         <?php endif ?>
-        <?= $title ?>
     </div>
     <div class="card-body wt-block-content wt-block-content-<?= e($block) ?>">
         <?= $content ?>

From f6430483b24eeb08f757ed932abd161081887aef Mon Sep 17 00:00:00 2001
From: Fredrik Ekdahl <fekdahl@gmail.com>
Date: Sun, 16 Mar 2025 07:09:37 +0100
Subject: [PATCH 2/5] Star icon for user favorites block

---
 app/Module/UserFavoritesModule.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Module/UserFavoritesModule.php b/app/Module/UserFavoritesModule.php
index 19f82f3c971..ec1c61ba08d 100644
--- a/app/Module/UserFavoritesModule.php
+++ b/app/Module/UserFavoritesModule.php
@@ -80,6 +80,7 @@ public function getBlock(Tree $tree, int $block_id, string $context, array $conf
                 'config_url' => '',
                 'title'      => $this->title(),
                 'content'    => $content,
+                'icon'       => 'icons/favorite',
             ]);
         }
 

From 63394a732c7056131adbfc6673c2f82d7bdbf994 Mon Sep 17 00:00:00 2001
From: Fredrik Ekdahl <fekdahl@gmail.com>
Date: Sun, 16 Mar 2025 07:21:38 +0100
Subject: [PATCH 3/5] Calendar icon for on this day

---
 app/Module/OnThisDayModule.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Module/OnThisDayModule.php b/app/Module/OnThisDayModule.php
index 5ebdf0bc675..0e4133fa2d6 100644
--- a/app/Module/OnThisDayModule.php
+++ b/app/Module/OnThisDayModule.php
@@ -172,6 +172,7 @@ public function getBlock(Tree $tree, int $block_id, string $context, array $conf
                 'config_url' => $this->configUrl($tree, $context, $block_id),
                 'title'      => $this->title(),
                 'content'    => $content,
+                'icon'       => 'icons/calendar',
             ]);
         }
 

From 2de91895089c5abb913714ec21f2e048b3f1fd75 Mon Sep 17 00:00:00 2001
From: Fredrik Ekdahl <fekdahl@gmail.com>
Date: Mon, 24 Mar 2025 20:36:35 +0100
Subject: [PATCH 4/5] Use d-flex instead of float-end

---
 resources/views/modules/block-template.phtml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/views/modules/block-template.phtml b/resources/views/modules/block-template.phtml
index 75ef7023079..4f44f371350 100644
--- a/resources/views/modules/block-template.phtml
+++ b/resources/views/modules/block-template.phtml
@@ -15,13 +15,15 @@ use Fisharebest\Webtrees\I18N;
 ?>
 
 <div class="card mb-4 wt-block wt-block-<?= e($block) ?>" id="block-<?= e($id) ?>">
-    <div class="card-header wt-block-header wt-block-header-<?= e($block) ?>">
-        <?php if (isset($icon) && $icon !== '') : ?>
-            <?= view($icon) ?>
-        <?php endif ?>
-        <?= $title ?>
+    <div class="card-header wt-block-header wt-block-header-<?= e($block) ?> d-flex justify-content-between align-items-center">
+        <div class="d-flex align-items-center gap-2">
+            <?php if (isset($icon) && $icon !== '') : ?>
+                <?= view($icon) ?>
+            <?php endif ?>
+            <?= $title ?>
+        </div>
         <?php if ($config_url !== '') : ?>
-            <a class="btn btn-link float-end" href="<?= e($config_url) ?>" title="<?= I18N::translate('Preferences') ?>">
+            <a class="btn btn-link" href="<?= e($config_url) ?>" title="<?= I18N::translate('Preferences') ?>">
                 <?= view('icons/preferences') ?>
                 <span class="visually-hidden"><?= I18N::translate('Preferences') ?></span>
             </a>

From d41556cdfebfbc3607f381babfc6889edd8ab8bd Mon Sep 17 00:00:00 2001
From: Fredrik Ekdahl <fekdahl@gmail.com>
Date: Mon, 24 Mar 2025 21:02:55 +0100
Subject: [PATCH 5/5] Add email icon

---
 app/Module/UserMessagesModule.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php
index 85a0e910b1f..cfe584ba310 100644
--- a/app/Module/UserMessagesModule.php
+++ b/app/Module/UserMessagesModule.php
@@ -142,6 +142,7 @@ public function getBlock(Tree $tree, int $block_id, string $context, array $conf
                 'config_url' => '',
                 'title'      => I18N::plural('%s message', '%s messages', $count, I18N::number($count)),
                 'content'    => $content,
+                'icon'       => 'icons/email',
             ]);
         }