From b0d80e209c3b300c52a7b8664006911602efc496 Mon Sep 17 00:00:00 2001
From: Lars Gebhardt-Kusche <lars@kusche.berlin>
Date: Wed, 19 Aug 2026 20:51:09 +0200
Subject: [PATCH] kategorie

---
 partials/landing/account/dashboard.php | 51 +++++++++++++++++---------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/partials/landing/account/dashboard.php b/partials/landing/account/dashboard.php
index 5464d7b..cfaa04a 100755
--- a/partials/landing/account/dashboard.php
+++ b/partials/landing/account/dashboard.php
@@ -965,16 +965,15 @@ if (!empty($canManageSystemSettings)) {
                 <?php endforeach; ?>
               </datalist>
 
-              <div class="card" style="margin-bottom:18px;">
+              <div class="card" style="margin-bottom:22px; padding:18px 20px;">
                 <form method="get" class="stack gap-12">
                   <input type="hidden" name="section" value="categories">
-                  <div class="form-grid">
+                  <div style="display:grid; grid-template-columns:minmax(0, 1fr) minmax(160px, 220px); gap:14px; align-items:end;">
                     <div class="stack gap-6">
                       <label class="label" for="categoryQuery">Kategorie suchen</label>
                       <input id="categoryQuery" name="category_query" class="input" value="<?= htmlspecialchars((string)($categorySearchQuery ?? ''), ENT_QUOTES) ?>" list="categoryMergeSuggestions">
                     </div>
-                    <div class="stack gap-6" style="justify-content:end;">
-                      <span class="label" aria-hidden="true">&nbsp;</span>
+                    <div>
                       <button class="btn" type="submit">Suchen</button>
                     </div>
                   </div>
@@ -982,12 +981,12 @@ if (!empty($canManageSystemSettings)) {
               </div>
 
               <?php if (($categorySearchQuery ?? '') !== ''): ?>
-                <div class="card" style="margin-bottom:18px;">
+                <div class="card" style="margin-bottom:22px; padding:18px 20px;">
                   <strong>Suchergebnisse</strong>
                   <?php if (!empty($categorySearchResults)): ?>
-                    <div class="stack gap-10" style="margin-top:12px;">
+                    <div class="stack gap-12" style="margin-top:16px;">
                       <?php foreach ($categorySearchResults as $categoryItem): ?>
-                        <div class="card" style="padding:12px;">
+                        <div class="card" style="padding:16px 18px;">
                           <div>
                             <strong><?= htmlspecialchars((string)$categoryItem['title'], ENT_QUOTES) ?></strong>
                             <?php if (!empty($categoryItem['needs_review'])): ?>
@@ -997,7 +996,7 @@ if (!empty($canManageSystemSettings)) {
                               Slug: <?= htmlspecialchars((string)$categoryItem['slug'], ENT_QUOTES) ?> · Einträge: <?= (int)($categoryItem['listing_count'] ?? 0) ?> · Orte: <?= (int)($categoryItem['place_count'] ?? 0) ?> · Eigene Events: <?= (int)($categoryItem['event_count'] ?? 0) ?>
                             </div>
                           </div>
-                          <form method="post" class="stack gap-8" style="margin-top:12px;">
+                          <form method="post" class="stack gap-12" style="margin-top:16px;">
                             <input type="hidden" name="action" value="category_merge">
                             <input type="hidden" name="current_category_slug" value="<?= htmlspecialchars((string)$categoryItem['slug'], ENT_QUOTES) ?>">
                             <div class="stack gap-6">
@@ -1008,6 +1007,7 @@ if (!empty($canManageSystemSettings)) {
                                 class="input"
                                 list="categoryMergeSuggestions"
                                 placeholder="Kategorie suchen"
+                                data-category-keep-input="#keepCategorySearchChoice<?= (int)($categoryItem['id'] ?? 0) ?> option[value='other']"
                                 required
                               >
                             </div>
@@ -1015,15 +1015,15 @@ if (!empty($canManageSystemSettings)) {
                               <label class="label" for="keepCategorySearchChoice<?= (int)($categoryItem['id'] ?? 0) ?>">Behalten</label>
                               <select id="keepCategorySearchChoice<?= (int)($categoryItem['id'] ?? 0) ?>" name="keep_category_choice" class="select">
                                 <option value="current"><?= htmlspecialchars((string)$categoryItem['title'], ENT_QUOTES) ?></option>
-                                <option value="other">Ausgewählte zweite Kategorie</option>
+                                <option value="other">Zweite Kategorie</option>
                               </select>
                             </div>
-                            <div class="flex gap-8" style="flex-wrap:wrap;">
+                            <div class="flex gap-10" style="flex-wrap:wrap; padding-top:4px;">
                               <button class="btn ghost" type="submit">Zusammenführen</button>
                             </div>
                           </form>
                           <?php if (!empty($categoryItem['needs_review'])): ?>
-                            <form method="post" style="margin-top:12px;">
+                            <form method="post" style="margin-top:16px;">
                               <input type="hidden" name="action" value="category_confirm">
                               <input type="hidden" name="source_category_slug" value="<?= htmlspecialchars((string)$categoryItem['slug'], ENT_QUOTES) ?>">
                               <button class="btn" type="submit">Bestätigen</button>
@@ -1039,9 +1039,9 @@ if (!empty($canManageSystemSettings)) {
               <?php endif; ?>
 
               <?php if (!empty($categoryReviewItems)): ?>
-                <div class="stack gap-10">
+                <div class="stack gap-12">
                   <?php foreach ($categoryReviewItems as $categoryItem): ?>
-                    <div class="card" style="padding:12px;">
+                    <div class="card" style="padding:16px 18px;">
                       <div>
                         <strong><?= htmlspecialchars((string)$categoryItem['title'], ENT_QUOTES) ?></strong>
                         <span class="badge" style="margin-left:8px;">Neu</span>
@@ -1049,7 +1049,7 @@ if (!empty($canManageSystemSettings)) {
                           Slug: <?= htmlspecialchars((string)$categoryItem['slug'], ENT_QUOTES) ?> · Einträge: <?= (int)($categoryItem['listing_count'] ?? 0) ?> · Orte: <?= (int)($categoryItem['place_count'] ?? 0) ?> · Eigene Events: <?= (int)($categoryItem['event_count'] ?? 0) ?>
                         </div>
                       </div>
-                      <form method="post" class="stack gap-8" style="margin-top:12px;">
+                      <form method="post" class="stack gap-12" style="margin-top:16px;">
                         <input type="hidden" name="action" value="category_merge">
                         <input type="hidden" name="current_category_slug" value="<?= htmlspecialchars((string)$categoryItem['slug'], ENT_QUOTES) ?>">
                         <div class="stack gap-6">
@@ -1060,6 +1060,7 @@ if (!empty($canManageSystemSettings)) {
                             class="input"
                             list="categoryMergeSuggestions"
                             placeholder="Kategorie suchen"
+                            data-category-keep-input="#keepCategoryChoice<?= (int)($categoryItem['id'] ?? 0) ?> option[value='other']"
                             required
                           >
                         </div>
@@ -1067,14 +1068,14 @@ if (!empty($canManageSystemSettings)) {
                           <label class="label" for="keepCategoryChoice<?= (int)($categoryItem['id'] ?? 0) ?>">Behalten</label>
                           <select id="keepCategoryChoice<?= (int)($categoryItem['id'] ?? 0) ?>" name="keep_category_choice" class="select">
                             <option value="current"><?= htmlspecialchars((string)$categoryItem['title'], ENT_QUOTES) ?></option>
-                            <option value="other">Ausgewählte zweite Kategorie</option>
+                            <option value="other">Zweite Kategorie</option>
                           </select>
                         </div>
-                        <div class="flex gap-8" style="flex-wrap:wrap;">
+                        <div class="flex gap-10" style="flex-wrap:wrap; padding-top:4px;">
                           <button class="btn ghost" type="submit">Zusammenführen</button>
                         </div>
                       </form>
-                      <form method="post" style="margin-top:12px;">
+                      <form method="post" style="margin-top:16px;">
                         <input type="hidden" name="action" value="category_confirm">
                         <input type="hidden" name="source_category_slug" value="<?= htmlspecialchars((string)$categoryItem['slug'], ENT_QUOTES) ?>">
                         <button class="btn" type="submit">Bestätigen</button>
@@ -1881,6 +1882,22 @@ if (!empty($canManageSystemSettings)) {
 
   const allEventLocationOptions = <?= json_encode($eventLocationOptions ?? [], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) ?>;
 
+  function syncCategoryKeepLabels() {
+    document.querySelectorAll('[data-category-keep-input]').forEach((input) => {
+      const optionSelector = input.getAttribute('data-category-keep-input');
+      const option = optionSelector ? document.querySelector(optionSelector) : null;
+      if (!option) return;
+      const currentValue = (input.value || '').trim();
+      option.textContent = currentValue !== '' ? currentValue : 'Zweite Kategorie';
+    });
+  }
+
+  document.querySelectorAll('[data-category-keep-input]').forEach((input) => {
+    input.addEventListener('input', syncCategoryKeepLabels);
+    input.addEventListener('change', syncCategoryKeepLabels);
+  });
+  syncCategoryKeepLabels();
+
   function buildEventLocationLabel(option) {
     if (!option) return '';
     const addressLabel = [String(option.street || ''), `${String(option.zip || '')} ${String(option.city || '')}`.trim()]