Merge pull request #11535 from nanaya/forum-list-separator

Add separator before each forum main categories
ppy · Oct 11, 2024 · a430cf1 · a430cf1
2 parents a8faa3e + 78eaa90
commit a430cf1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/resources/views/forum/topics/_moderate_move.blade.php b/resources/views/forum/topics/_moderate_move.blade.php
@@ -35,11 +35,17 @@ class="btn-circle btn-circle--topic-nav btn-circle--yellow"
                             <label class="form-select">
                                 <select name="destination_forum_id" class="form-select__input">
                                     @foreach (App\Models\Forum\Forum::displayList()->get() as $dstForum)
+                                        @php
+                                            $currentDepth = $dstForum->currentDepth();
+                                        @endphp
+                                        @if (!$loop->first && $currentDepth === 0)
+                                            <hr>
+                                        @endif
                                         <option value="{{ $dstForum->getKey() }}"
                                             {{ $dstForum->isOpen() ? '' : 'disabled' }}
                                             {{ $dstForum->getKey() === $topic->forum_id ? 'selected' : '' }}
                                         >
-                                            {{ str_repeat('–', $dstForum->currentDepth()) }}
+                                            {{ str_repeat('–', $currentDepth) }}
                                             {{ $dstForum->forum_name }}
                                         </option>
                                     @endforeach

diff --git a/resources/views/objects/search/_forum_options.blade.php b/resources/views/objects/search/_forum_options.blade.php
@@ -73,11 +73,17 @@ class="form-select__input"
 
                     @foreach (App\Models\Forum\Forum::searchable()->displayList()->get() as $forum)
                         @if (priv_check('ForumView', $forum)->can())
+                            @php
+                                $currentDepth = $forum->currentDepth();
+                            @endphp
+                            @if ($currentDepth === 0)
+                                <hr>
+                            @endif
                             <option
                                 value="{{ $forum->getKey() }}"
                                 {{ $forum->getKey() === get_int($params[$fields['forumId']] ?? null) ? 'selected' : '' }}
                             >
-                                {{ str_repeat('–', $forum->currentDepth()) }}
+                                {{ str_repeat('–', $currentDepth) }}
                                 {{ $forum->forum_name }}
                             </option>
                         @endif