From 0453e8483629c86e24202860085563c0707ff312 Mon Sep 17 00:00:00 2001
From: Jay Trees <github.hybridsupply@grandel.anonaddy.me>
Date: Fri, 8 Apr 2022 12:41:00 +0200
Subject: [PATCH] Improve wishlist filter

---
 src/classes/wishlist.php            | 15 +++----
 src/pages/parts/wishlist-filter.php | 69 ++++++++++++++++-------------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/classes/wishlist.php b/src/classes/wishlist.php
index 8f45d2e9..d362c6e9 100644
--- a/src/classes/wishlist.php
+++ b/src/classes/wishlist.php
@@ -87,22 +87,21 @@ class Wishlist
         /**
          * Cards
          */
-        if (!empty($this->wishes)) { ?>
-            <div class="ui three column doubling stackable grid">
+        ?>
+        <div class="ui three column doubling stackable grid">
+            <?php if (!empty($this->wishes)) { ?>
                 <?php foreach ($this->wishes as $wish) { ?>
                     <div class="column">
                         <?= $wish->getCard($this->user) ?>
                     </div>
                 <?php } ?>
-            </div>
-        <?php } else { ?>
-            <div class="ui container">
+            <?php } else { ?>
                 <div class="sixteen wide column">
                     <?= Page::info('This wishlist seems to be empty.', 'Empty'); ?>
                 </div>
-            </div>
-            <?php
-        }
+            <?php } ?>
+        </div>
+        <?php
 
         $html = ob_get_clean();
 
diff --git a/src/pages/parts/wishlist-filter.php b/src/pages/parts/wishlist-filter.php
index 36771847..07cabbbf 100644
--- a/src/pages/parts/wishlist-filter.php
+++ b/src/pages/parts/wishlist-filter.php
@@ -11,44 +11,49 @@ $scriptPart = '/src/assets/js/parts/wishlist-filter.js';
 <script defer src="/src/assets/js/parts/wishlist-filter.js?m=<?= filemtime(ROOT . $scriptPart) ?>"></script>
 
 <div>
-    <div class="ui small labeled icon basic white button floating dropdown filter priority">
-        <input type="hidden" name="filters" />
+    <div class="ui stackable grid">
+        <div class="column">
 
-        <i class="filter icon"></i>
-        <span class="text"><?= __('Filter priorities') ?></span>
+            <div class="ui small labeled icon basic white button floating dropdown filter priority">
+                <input type="hidden" name="filters" />
 
-        <div class="menu">
-            <div class="ui icon search input">
-                <i class="search icon"></i>
-                <input type="text" placeholder="<?= __('Search priorities') ?>" />
-            </div>
-
-            <div class="divider"></div>
-
-            <div class="header">
                 <i class="filter icon"></i>
-                <?= __('Priorities') ?>
-            </div>
+                <span class="text"><?= __('Filter priorities') ?></span>
 
-            <div class="scrolling menu">
-                <div class="item" data-value="-1">
-                    <i class="small circle icon"></i>
-                    <?= __('All priorities') ?>
-                </div>
-
-                <div class="item" data-value="">
-                    <i class="small circle outline icon"></i>
-                    <?= __('No priority') ?>
-                </div>
-
-                <?php foreach (Wish::$priorities as $number => $priority) { ?>
-                    <div class="item" data-value="<?= $number ?>">
-                        <i class="small <?= $priority['color'] ?> circle icon"></i>
-                        <?= $priority['name'] ?>
+                <div class="menu">
+                    <div class="ui icon search input">
+                        <i class="search icon"></i>
+                        <input type="text" placeholder="<?= __('Search priorities') ?>" />
                     </div>
-                <?php } ?>
+
+                    <div class="divider"></div>
+
+                    <div class="header">
+                        <i class="filter icon"></i>
+                        <?= __('Priorities') ?>
+                    </div>
+
+                    <div class="scrolling menu">
+                        <div class="item" data-value="-1">
+                            <i class="small circle icon"></i>
+                            <?= __('All priorities') ?>
+                        </div>
+
+                        <div class="item" data-value="">
+                            <i class="small circle outline icon"></i>
+                            <?= __('No priority') ?>
+                        </div>
+
+                        <?php foreach (Wish::$priorities as $number => $priority) { ?>
+                            <div class="item" data-value="<?= $number ?>">
+                                <i class="small <?= $priority['color'] ?> circle icon"></i>
+                                <?= $priority['name'] ?>
+                            </div>
+                        <?php } ?>
+                    </div>
+                </div>
             </div>
+
         </div>
     </div>
 </div>
-<br />