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

Improve related packages on package page

Browse Source 
Fixes #254
This commit is contained in:
rubenwardy
2021-07-25 03:54:08 +01:00
parent fc7739be2c
commit cb5fa4d6e7
4 changed files with 72 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/templates/macros/package_approval.html
View File

@@ -1,4 +1,4 @@
{% macro render_banners(package, current_user, topic_error, topic_error_lvl, similar_topics) -%}
{% macro render_banners(package, current_user, topic_error, topic_error_lvl, show_modname_warning) -%}
<div class="row mb-4">
<span class="col">
@@ -82,13 +82,10 @@
</div>
{% endif %}
{% if similar_topics %}
{% if show_modname_warning %}
<div class="alert alert-warning">
Please make sure that this package has the right to
the name '{{ package.name }}'.
See the
<a href="/policy_and_guidance/">Inclusion Policy</a>
for more info.
Please make sure that this package has the right to all the technical names it provides.
See the <a href="/policy_and_guidance/">Inclusion Policy</a> for more info.
</div>
{% endif %}

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

@@ -185,7 +185,7 @@
<section class="my-4 pb-3" style="border-bottom: 1px solid rgba(0,0,0,0.5);">
<div class="container">
{% from "macros/package_approval.html" import render_banners %}
{{ render_banners(package, current_user, topic_error, topic_error_lvl, similar_topics) }}
{{ render_banners(package, current_user, topic_error, topic_error_lvl, similar_topics or packages_modnames) }}
{% if review_thread and review_thread.checkPerm(current_user, "SEE_THREAD") %}
<h2>{% if review_thread.private %}&#x1f512;{% endif %} {{ review_thread.title }}</h2>
@@ -265,26 +265,46 @@
{% endif %}
{{ render_reviews(package.reviews, current_user) }}
{% if alternatives %}
<h2>Related</h2>
{% if packages_uses %}
<h2>Used By</h2>
{% from "macros/packagegridtile.html" import render_pkggrid %}
{{ render_pkggrid(alternatives) }}
{{ render_pkggrid(packages_uses) }}
{% endif %}
{% if similar_topics %}
<h2>Similar Forum Topics</h2>
<ul>
{% for t in similar_topics %}
<li>
[{{ t.type.value }}]
<a href="https://forum.minetest.net/viewtopic.php?t={{ t.topic_id }}">
{{ t.title }} by {{ t.author.display_name }}
</a>
{% if t.wip %}[WIP]{% endif %}
</li>
{% endfor %}
</ul>
{% if packages_modnames or similar_topics %}
<h2>Modname uniqueness</h2>
{% if packages_modnames %}
<h3>Packages sharing provided mods</h3>
<p class="text-muted">
This package contains modnames that are present in the following packages:
</p>
<ul>
{% for pkg in packages_modnames %}
<li>
<a href="{{ pkg.getURL('packages.view') }}">
{{ _("%(title)s by %(author)s", title=pkg.title, author=pkg.author.display_name) }}
</a>
[{{ pkg.type.value }}]
</li>
{% endfor %}
</ul>
{% endif %}
{% if similar_topics %}
<h3>Similar Forum Topics</h3>
<ul>
{% for t in similar_topics %}
<li>
[{{ t.type.value }}]
<a href="https://forum.minetest.net/viewtopic.php?t={{ t.topic_id }}">
{{ t.title }} by {{ t.author.display_name }}
</a>
{% if t.wip %}[WIP]{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
{% endif %}
</div>