From c5c349ef05ecb96ecfab33f1d5f7c900887e350c Mon Sep 17 00:00:00 2001
From: Hunter Turcin <huntertur@gmail.com>
Date: Thu, 7 Nov 2024 22:45:20 -0600
Subject: [PATCH 1/5] Remove extra search bar on browse page

---
 weasyl/templates/etc/search.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/weasyl/templates/etc/search.html b/weasyl/templates/etc/search.html
index 3842b86d9..16e7b0594 100644
--- a/weasyl/templates/etc/search.html
+++ b/weasyl/templates/etc/search.html
@@ -135,13 +135,6 @@ <h2 class="page-title">${browse_header}</h2>
     $# BROWSE SUMMARY (user hit the "Browse" tab or didn't specify a content type)
     <h2 class="page-title">Browse Content</h2>
 
-    <div id="browse-search-top" class="content">$# there are multiple instances of search-backup-search in this template!
-      <form id="search-backup-search" action="/search" method="GET" class="form">
-        <input name="q" placeholder="Search" title="Search Weasyl" type="search" tabindex="2" class="input" />
-        <p class="color-lighter tags-help"><i><a href="/help/searching" target="_blank">Search terms help</a></i></p>
-      </form>
-    </div>
-
     $if results['submit']:
       <h3 class="pad-left">Submissions</h3>
       <ul class="thumbnail-grid medium-footprint">

From d937d8d889ba93cceca58fb87ca32f4808e0a36c Mon Sep 17 00:00:00 2001
From: Hunter Turcin <huntertur@gmail.com>
Date: Thu, 7 Nov 2024 23:11:07 -0600
Subject: [PATCH 2/5] Split Submissions into three parts on browse page

---
 weasyl/controllers/general.py    | 18 ++++++++++++++++++
 weasyl/templates/etc/search.html | 26 +++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/weasyl/controllers/general.py b/weasyl/controllers/general.py
index 6c30f4f7e..684c685fa 100644
--- a/weasyl/controllers/general.py
+++ b/weasyl/controllers/general.py
@@ -146,6 +146,24 @@ def search_(request):
                     backid=None,
                     nextid=None,
                 ),
+                "literary": search.browse(
+                    userid=request.userid,
+                    rating=rating,
+                    limit=22,
+                    find="literary",
+                    cat=None,
+                    backid=None,
+                    nextid=None,
+                ),
+                "multimedia": search.browse(
+                    userid=request.userid,
+                    rating=rating,
+                    limit=22,
+                    find="multimedia",
+                    cat=None,
+                    backid=None,
+                    nextid=None,
+                ),
                 "char": search.browse(
                     userid=request.userid,
                     rating=rating,
diff --git a/weasyl/templates/etc/search.html b/weasyl/templates/etc/search.html
index 16e7b0594..d59cd15cc 100644
--- a/weasyl/templates/etc/search.html
+++ b/weasyl/templates/etc/search.html
@@ -136,14 +136,34 @@ <h2 class="page-title">${browse_header}</h2>
     <h2 class="page-title">Browse Content</h2>
 
     $if results['submit']:
-      <h3 class="pad-left">Submissions</h3>
+      <h3 class="pad-left">Visual Submissions</h3>
       <ul class="thumbnail-grid medium-footprint">
         $for i in results['submit']:
           $:{_GRID_ITEM(i, lazy_load=False)}
-        <li class="more"><a class="more" href="/search?find=submit"><i>More</i> <span>Submissions</span></a></li>
+        <li class="more"><a class="more" href="/search?find=submit"><i>More</i> <span>Visual Submissions</span></a></li>
       </ul>
     $else:
-      There are no submissions to display.
+      There are no visual submissions to display.
+
+    $if results['literary']:
+      <h3 class="pad-left">Literary Submissions</h3>
+      <ul class="thumbnail-grid medium-footprint">
+        $for i in results['literary']:
+          $:{_GRID_ITEM(i, lazy_load=False)}
+        <li class="more"><a class="more" href="/search?find=literary"><i>More</i> <span>Literary Submissions</span></a></li>
+      </ul>
+    $else:
+      There are no literary submissions to display.
+
+    $if results['multimedia']:
+      <h3 class="pad-left">Multimedia Submissions</h3>
+      <ul class="thumbnail-grid medium-footprint">
+        $for i in results['multimedia']:
+          $:{_GRID_ITEM(i, lazy_load=False)}
+        <li class="more"><a class="more" href="/search?find=multimedia"><i>More</i> <span>Multimedia Submissions</span></a></li>
+      </ul>
+    $else:
+      There are no multimedia submissions to display.
 
     $if results['char']:
       <h3 class="pad-left">Characters</h3>

From 5051778db960f3d49ce7065af2b7c05bb9f28144 Mon Sep 17 00:00:00 2001
From: Hunter Turcin <huntertur@gmail.com>
Date: Thu, 7 Nov 2024 23:16:54 -0600
Subject: [PATCH 3/5] Keep a More Submissions link

---
 weasyl/controllers/general.py    | 9 +++++++++
 weasyl/templates/etc/search.html | 9 ++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/weasyl/controllers/general.py b/weasyl/controllers/general.py
index 684c685fa..0cd02c3f0 100644
--- a/weasyl/controllers/general.py
+++ b/weasyl/controllers/general.py
@@ -146,6 +146,15 @@ def search_(request):
                     backid=None,
                     nextid=None,
                 ),
+                "visual": search.browse(
+                    userid=request.userid,
+                    rating=rating,
+                    limit=22,
+                    find="visual",
+                    cat=None,
+                    backid=None,
+                    nextid=None,
+                ),
                 "literary": search.browse(
                     userid=request.userid,
                     rating=rating,
diff --git a/weasyl/templates/etc/search.html b/weasyl/templates/etc/search.html
index d59cd15cc..a2cdf3d30 100644
--- a/weasyl/templates/etc/search.html
+++ b/weasyl/templates/etc/search.html
@@ -135,12 +135,12 @@ <h2 class="page-title">${browse_header}</h2>
     $# BROWSE SUMMARY (user hit the "Browse" tab or didn't specify a content type)
     <h2 class="page-title">Browse Content</h2>
 
-    $if results['submit']:
+    $if results['visual']:
       <h3 class="pad-left">Visual Submissions</h3>
       <ul class="thumbnail-grid medium-footprint">
         $for i in results['submit']:
           $:{_GRID_ITEM(i, lazy_load=False)}
-        <li class="more"><a class="more" href="/search?find=submit"><i>More</i> <span>Visual Submissions</span></a></li>
+        <li class="more"><a class="more" href="/search?find=visual"><i>More</i> <span>Visual Submissions</span></a></li>
       </ul>
     $else:
       There are no visual submissions to display.
@@ -165,6 +165,10 @@ <h3 class="pad-left">Multimedia Submissions</h3>
     $else:
       There are no multimedia submissions to display.
 
+    <ul class="thumbnail-grid medium-footprint">
+      <li class="more"><a class="more" href="/search?find=submit"><i>More</i> <span>Submissions</span></a></li>
+    </ul>
+
     $if results['char']:
       <h3 class="pad-left">Characters</h3>
       <ul class="grid avatar-grid">
@@ -185,5 +189,4 @@ <h3 class="pad-left">Journals</h3>
     $else:
       There are no journals to display.
 
-
 </div>

From 8323f23fc6cff9621ca021d1325c4066aa370acc Mon Sep 17 00:00:00 2001
From: Hunter Turcin <huntertur@gmail.com>
Date: Thu, 7 Nov 2024 23:43:02 -0600
Subject: [PATCH 4/5] Display different content in each Browse category

---
 weasyl/controllers/general.py    | 6 +++---
 weasyl/templates/etc/search.html | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/weasyl/controllers/general.py b/weasyl/controllers/general.py
index 0cd02c3f0..653407f53 100644
--- a/weasyl/controllers/general.py
+++ b/weasyl/controllers/general.py
@@ -151,7 +151,7 @@ def search_(request):
                     rating=rating,
                     limit=22,
                     find="visual",
-                    cat=None,
+                    cat=1000,
                     backid=None,
                     nextid=None,
                 ),
@@ -160,7 +160,7 @@ def search_(request):
                     rating=rating,
                     limit=22,
                     find="literary",
-                    cat=None,
+                    cat=2000,
                     backid=None,
                     nextid=None,
                 ),
@@ -169,7 +169,7 @@ def search_(request):
                     rating=rating,
                     limit=22,
                     find="multimedia",
-                    cat=None,
+                    cat=3000,
                     backid=None,
                     nextid=None,
                 ),
diff --git a/weasyl/templates/etc/search.html b/weasyl/templates/etc/search.html
index a2cdf3d30..5f800ac52 100644
--- a/weasyl/templates/etc/search.html
+++ b/weasyl/templates/etc/search.html
@@ -140,7 +140,7 @@ <h3 class="pad-left">Visual Submissions</h3>
       <ul class="thumbnail-grid medium-footprint">
         $for i in results['submit']:
           $:{_GRID_ITEM(i, lazy_load=False)}
-        <li class="more"><a class="more" href="/search?find=visual"><i>More</i> <span>Visual Submissions</span></a></li>
+        <li class="more"><a class="more" href="/search?find=submit&cat=1000"><i>More</i> <span>Visual Submissions</span></a></li>
       </ul>
     $else:
       There are no visual submissions to display.
@@ -150,7 +150,7 @@ <h3 class="pad-left">Literary Submissions</h3>
       <ul class="thumbnail-grid medium-footprint">
         $for i in results['literary']:
           $:{_GRID_ITEM(i, lazy_load=False)}
-        <li class="more"><a class="more" href="/search?find=literary"><i>More</i> <span>Literary Submissions</span></a></li>
+        <li class="more"><a class="more" href="/search?find=submit&cat=2000"><i>More</i> <span>Literary Submissions</span></a></li>
       </ul>
     $else:
       There are no literary submissions to display.
@@ -160,7 +160,7 @@ <h3 class="pad-left">Multimedia Submissions</h3>
       <ul class="thumbnail-grid medium-footprint">
         $for i in results['multimedia']:
           $:{_GRID_ITEM(i, lazy_load=False)}
-        <li class="more"><a class="more" href="/search?find=multimedia"><i>More</i> <span>Multimedia Submissions</span></a></li>
+        <li class="more"><a class="more" href="/search?find=submit&cat=3000"><i>More</i> <span>Multimedia Submissions</span></a></li>
       </ul>
     $else:
       There are no multimedia submissions to display.

From 2cf782ada945576400064f82bc4cc881de278d08 Mon Sep 17 00:00:00 2001
From: Hunter Turcin <huntertur@gmail.com>
Date: Thu, 7 Nov 2024 23:51:13 -0600
Subject: [PATCH 5/5] Fix remaining display issues on new browse page

---
 weasyl/controllers/general.py    | 9 ---------
 weasyl/templates/etc/search.html | 9 +++++----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/weasyl/controllers/general.py b/weasyl/controllers/general.py
index 653407f53..d1e05f48e 100644
--- a/weasyl/controllers/general.py
+++ b/weasyl/controllers/general.py
@@ -137,15 +137,6 @@ def search_(request):
             None,
             # Search results
             {
-                "submit": search.browse(
-                    userid=request.userid,
-                    rating=rating,
-                    limit=22,
-                    find="submit",
-                    cat=None,
-                    backid=None,
-                    nextid=None,
-                ),
                 "visual": search.browse(
                     userid=request.userid,
                     rating=rating,
diff --git a/weasyl/templates/etc/search.html b/weasyl/templates/etc/search.html
index 5f800ac52..4c8a68bd0 100644
--- a/weasyl/templates/etc/search.html
+++ b/weasyl/templates/etc/search.html
@@ -138,7 +138,7 @@ <h2 class="page-title">Browse Content</h2>
     $if results['visual']:
       <h3 class="pad-left">Visual Submissions</h3>
       <ul class="thumbnail-grid medium-footprint">
-        $for i in results['submit']:
+        $for i in results['visual']:
           $:{_GRID_ITEM(i, lazy_load=False)}
         <li class="more"><a class="more" href="/search?find=submit&cat=1000"><i>More</i> <span>Visual Submissions</span></a></li>
       </ul>
@@ -165,9 +165,10 @@ <h3 class="pad-left">Multimedia Submissions</h3>
     $else:
       There are no multimedia submissions to display.
 
-    <ul class="thumbnail-grid medium-footprint">
-      <li class="more"><a class="more" href="/search?find=submit"><i>More</i> <span>Submissions</span></a></li>
-    </ul>
+    $if results['visual'] or results['literary'] or results['multimedia']:
+      <ul class="thumbnail-grid medium-footprint">
+        <li class="more"><a class="more" href="/search?find=submit"><i>More</i> <span>Submissions</span></a></li>
+      </ul>
 
     $if results['char']:
       <h3 class="pad-left">Characters</h3>