moanos/Notfellchen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Use location when appropriate, otherwise fallback to location string

Browse Source
This commit is contained in:
moanos [he/him] 2024-05-31 13:33:42 +02:00
parent af4bd9356f
commit 1f87e486e0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fellchensammlung/templates/fellchensammlung/details/detail_adoption_notice.html
View File

@ -16,11 +16,14 @@
<th>{% translate "Weitere Informationen" %}</th> <th>{% translate "Weitere Informationen" %}</th>
</tr> </tr>
<tr> <tr>
<td>
{% if adoption_notice.location %} {% if adoption_notice.location %}
<td>{{ adoption_notice.location.name }}, {{ adoption_notice.location.postcode }}</td> {{ adoption_notice.location }}
{% else %} {% else %}
<td>{% translate "Kein Ort angegeben" %}</td> {{ adoption_notice.location_string }}
{% endif %} {% endif %}
</td>
<td>{{ adoption_notice.searching_since }}</td> <td>{{ adoption_notice.searching_since }}</td>
{% if adoption_notice.further_information %} {% if adoption_notice.further_information %}
<td>{{ adoption_notice.further_information }}</td> <td>{{ adoption_notice.further_information }}</td>

8
src/fellchensammlung/templates/fellchensammlung/partials/partial-adoption-notice.html
View File

@ -4,8 +4,10 @@
<div class="card"> <div class="card">
<div> <div>
<div class="header-card-adoption-notice"> <div class="header-card-adoption-notice">
<h1><a class="heading-card-adoption-notice" href="{{ adoption_notice.get_absolute_url }}"> {{ adoption_notice.name }}</a></h1> <h1><a class="heading-card-adoption-notice"
<a class="adoption-card-report-link" href="{{ adoption_notice.get_report_url }}"><i class="fa-solid fa-flag"></i></a> href="{{ adoption_notice.get_absolute_url }}"> {{ adoption_notice.name }}</a></h1>
<a class="adoption-card-report-link" href="{{ adoption_notice.get_report_url }}"><i
class="fa-solid fa-flag"></i></a>
</div> </div>
<p><b>{% translate "Notfellchen" %}:</b> {{ adoption_notice.animals.all|join_link:", " | safe }} <p><b>{% translate "Notfellchen" %}:</b> {{ adoption_notice.animals.all|join_link:", " | safe }}
</p> </p>
@ -14,7 +16,7 @@
{% if adoption_notice.location %} {% if adoption_notice.location %}
{{ adoption_notice.location }} {{ adoption_notice.location }}
{% else %} {% else %}
{% translate "Keine Ort angegeben" %} {{ adoption_notice.location_string }}
{% endif %} {% endif %}
</p> </p>
<p> <p>