Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split Browse page Submissions into Visual / Literary / Multimedia #1471

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Split Browse page Submissions into Visual / Literary / Multimedia #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5c349e
Remove extra search bar on browse page
huntertur Nov 8, 2024
d937d8d
Split Submissions into three parts on browse page
huntertur Nov 8, 2024
5051778
Keep a More Submissions link
huntertur Nov 8, 2024
8323f23
Display different content in each Browse category
huntertur Nov 8, 2024
2cf782a
Fix remaining display issues on new browse page
huntertur Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions weasyl/controllers/general.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,30 @@ def search_(request):
None,
# Search results
{
"submit": search.browse(
"visual": search.browse(
userid=request.userid,
rating=rating,
limit=22,
find="submit",
cat=None,
find="visual",
cat=1000,
backid=None,
nextid=None,
),
"literary": search.browse(
userid=request.userid,
rating=rating,
limit=22,
find="literary",
cat=2000,
backid=None,
nextid=None,
),
"multimedia": search.browse(
userid=request.userid,
rating=rating,
limit=22,
find="multimedia",
cat=3000,
backid=None,
nextid=None,
),
Expand Down
41 changes: 29 additions & 12 deletions weasyl/templates/etc/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,22 +135,40 @@ <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['visual']:
<h3 class="pad-left">Visual Submissions</h3>
<ul class="thumbnail-grid medium-footprint">
$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>
$else:
There are no visual submissions to display.

$if results['submit']:
<h3 class="pad-left">Submissions</h3>
$if results['literary']:
<h3 class="pad-left">Literary Submissions</h3>
<ul class="thumbnail-grid medium-footprint">
$for i in results['submit']:
$for i in results['literary']:
$:{_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&cat=2000"><i>More</i> <span>Literary Submissions</span></a></li>
</ul>
$else:
There are no submissions to display.
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=submit&cat=3000"><i>More</i> <span>Multimedia Submissions</span></a></li>
</ul>
$else:
There are no multimedia submissions to display.

$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>
Expand All @@ -172,5 +190,4 @@ <h3 class="pad-left">Journals</h3>
$else:
There are no journals to display.


</div>
Loading