Skip to content
Snippets Groups Projects
Commit 071302dc authored by Nadja Geisler's avatar Nadja Geisler :sunny:
Browse files

Merge branch 'feature-user-links' into 'master'

Show user links (if available)

Closes #39

See merge request !30
parents ece79441 d54b3df6
No related branches found
No related tags found
No related merge requests found
...@@ -54,7 +54,9 @@ ...@@ -54,7 +54,9 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td>{% trans "Who?" %}</td> <td>{% trans "Who?" %}</td>
<td>{{ ak.owners_list }}</td> <td>
{% include "AKSubmission/owners_list.html" with owners=ak.owners %}
</td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Category' %}</td> <td>{% trans 'Category' %}</td>
......
...@@ -17,7 +17,10 @@ ...@@ -17,7 +17,10 @@
{% for ak in AKs %} {% for ak in AKs %}
<tr> <tr>
<td> <td>
<b>{{ ak.name }}</b> <a href="{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}"
class="text-dark text-decoration-none font-weight-bold">
{{ ak.name }}
</a>
{% if ak.present %} {% if ak.present %}
<span class="badge badge-dark badge-pill" <span class="badge badge-dark badge-pill"
title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span> title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
...@@ -31,7 +34,7 @@ ...@@ -31,7 +34,7 @@
{% if ak.wish %} {% if ak.wish %}
<span class="badge badge-dark badge-pill">{% trans "AK Wish" %}</span> <span class="badge badge-dark badge-pill">{% trans "AK Wish" %}</span>
{% else %} {% else %}
{{ ak.owners_list }} {% include "AKSubmission/owners_list.html" with owners=ak.owners %}
{% endif %} {% endif %}
</td> </td>
<td>{% category_linked_badge ak.category event.slug %}</td> <td>{% category_linked_badge ak.category event.slug %}</td>
......
{% for owner in owners.all %}{% if not forloop.first %}, {% endif %}{% if owner.link %}<a href="{{ owner.link }}">{{ owner }}</a>{% else %}{{ owner }}{% endif %}{% endfor %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment