Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve thread list appearance

Browse Source
This commit is contained in:
rubenwardy
2020-12-22 12:22:52 +00:00
parent 1064885a2c
commit df79159e2e
7 changed files with 108 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
app/templates/macros/threads.html
View File

@@ -95,46 +95,90 @@
{% endif %}
{% endmacro %}
{% macro render_threadlist(threads, compact=False) -%}
{% macro render_compact_threadlist(threads) -%}
{% for t in threads %}
<a class="list-group-item list-group-item-action"
href="{{ url_for('threads.view', id=t.id) }}">
{% if compact %}
{% if t.private %}&#x1f512; {% endif %}
<strong>{{ t.title }}</strong>
by {{ t.author.display_name }}
{% else %}
<div class="row">
<div class="col-sm">
<span class="mr-3">
{% if not t.review and t.private %}
<i class="fas fa-lock" style="color:#ffac33;"></i>
{% elif not t.review %}
<i class="fas fa-comment-alt" style="color:#666;"></i>
{% elif t.review.recommends %}
<i class="fas fa-thumbs-up" style="color:#6f6;"></i>
{% else %}
<i class="fas fa-thumbs-down" style="color:#f66;"></i>
{% endif %}
</span>
<strong>{{ t.title }}</strong>
by {{ t.author.display_name }}
</div>
<div class="col-sm">
{% if t.package %}
{{ _("%(title)s by %(author)s",
title="<b>" | safe + t.package.title + "</b>" | safe,
author=t.package.author.display_name) }}
{% endif %}
</div>
<div class="col-sm-auto text-muted text-right">
{{ t.created_at | datetime }}
</div>
</div>
{% endif %}
{% if t.private %}&#x1f512; {% endif %}
<strong>{{ t.title }}</strong>
by {{ t.author.display_name }}
</a>
{% else %}
<p class="list-group-item"><i>No threads found</i></p>
{% endfor %}
{% endmacro %}
{% macro render_threadlist(threads) -%}
<div class="list-group-item">
<div class="row text-muted">
<span class="col-md">
{{ _("Thread") }}
</span>
<span class="col-md">
{{ _("Last Reply") }}
</span>
<span class="col-md-2"></span>
</div>
</div>
{% for t in threads %}
{% set replies = t.replies.count() - 1 %}
<a class="list-group-item list-group-item-action"
href="{{ url_for('threads.view', id=t.id) }}">
<div class="row">
<div class="col-md">
{% if not t.review and t.private %}
<i class="fas fa-lock" style="color:#ffac33;"></i>
{% elif not t.review %}
<i class="fas fa-comment-alt" style="color:#666;"></i>
{% elif t.review.recommends %}
<i class="fas fa-thumbs-up" style="color:#6f6;"></i>
{% else %}
<i class="fas fa-thumbs-down" style="color:#f66;"></i>
{% endif %}
<strong class="ml-1">
{{ t.title }}
</strong><br />
<span>
{{ t.author.display_name }}
</span>
<span class="text-muted ml-3">
{{ t.created_at | datetime }}
</span>
<span class="text-muted ml-3">
{{ replies }}
<i class="fas fa-comment ml-1"></i>
</span>
</div>
<div class="col-md">
{% if replies > 0 %}
{% set latest = t.get_latest_reply() %}
<span>
{{ latest.author.display_name }}
</span><br />
<span class="text-muted">
{{ latest.created_at | datetime }}
</span>
{% endif %}
</div>
{% if t.package %}
<div class="col-md-2 text-muted text-right">
<img
class="img-fluid"
style="max-height: 22px; max-width: 22px;"
src="{{ t.package.getThumbnailURL(1) }}" /><br />
<span class="pl-2">
{{ t.package.title }}
</span>
</div>
{% endif %}
</div>
</a>
{% else %}
<p class="list-group-item"><i>No threads found</i></p>

6
app/templates/packages/reviews_list.html
View File

@@ -6,11 +6,9 @@
{% block content %}
{% from "macros/pagination.html" import render_pagination %}
{{ render_pagination(pagination, url_set_query) }}
{% from "macros/reviews.html" import render_reviews %}
{{ render_reviews(reviews, current_user, True) }}
{% from "macros/pagination.html" import render_pagination %}
{{ render_pagination(pagination, url_set_query) }}
{{ render_reviews(reviews, current_user, True) }}
{{ render_pagination(pagination, url_set_query) }}
{% endblock %}

4
app/templates/packages/view.html
View File

@@ -365,8 +365,8 @@
Threads
</div>
<ul class="list-group list-group-flush">
{% from "macros/threads.html" import render_threadlist %}
{{ render_threadlist(threads, compact=True) }}
{% from "macros/threads.html" import render_compact_threadlist %}
{{ render_compact_threadlist(threads) }}
</ul>
</div>

6
app/templates/threads/list.html
View File

@@ -7,8 +7,14 @@ Threads
{% block content %}
<h1>Threads</h1>
{% from "macros/pagination.html" import render_pagination %}
{% from "macros/threads.html" import render_threadlist %}
{{ render_pagination(pagination, url_set_query) }}
<div class="list-group">
{{ render_threadlist(threads) }}
</div>
{{ render_pagination(pagination, url_set_query) }}
{% endblock %}