Commander1024/lostplaces-backend
1
0
Fork 0
Code Issues 14 Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
reverend
2021-04-03 23:07:16 +02:00
parent 36eb9566d9 ceeae9e8c9
commit d35cb8131a
26 changed files with 420 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django_lostplaces/lostplaces/templates/partials/form/submit.html
View File

@@ -1,9 +1,9 @@
{% load i18n %}
<div class="LP-Form__Field LP-Form__Button LP-Input">
<button class="LP-Button">{% if action %}{{ action }}{% else %}{% trans 'Submit' %}{% endif %}</button>
<button class="LP-Button">{% if action %}{{ action }}{% else %}{% translate 'Submit' %}{% endif %}</button>
</div>
<div class="LP-Form__Field LP-Form__Button LP-Input">
<a class="LP-Link" href="{% if referer %}{{ referer }}{% else %}{% url 'lostplaces_home' %}{% endif %}">
<button type="button" class="LP-Button LP-Button--cancel">{% trans 'Cancel' %}</button>
<button type="button" class="LP-Button LP-Button--cancel">{% translate 'Cancel' %}</button>
</a>
</div>

18
django_lostplaces/lostplaces/templates/partials/image.html Normal file
View File

@@ -0,0 +1,18 @@
{% if link_url %}
<a
class="LP-Link"
href="{{link_url}}"
>
{% endif %}
<figure class="LP-Figure">
<img
src="{{ source_url }}"
{% if alt_text %}
alt="{{alt_text}}"
{% else %}
alt="{{block}}"
{% endif %}
class="LP-Image"
/>
</figure>
{% if link_url %}</a>{% endif %}

8
django_lostplaces/lostplaces/templates/partials/nav/footer.html
View File

@@ -61,13 +61,13 @@
<!-- Bottom section with last line of text and links. -->
<section class="LP-Footer__BottomSection LP-Footer__Flex">
<div class="LP-Footer__BottomWrapper">
{% trans 'Made by' %} <a href="https://git.mowoe.com/reverend" class="LP-Footer__GenericAnchor">Reverend</a>
{% trans 'and' %} <a href="https://www.commander1024.de" class="LP-Footer__GenericAnchor">Commander1024.</a></span>
{% translate 'Made by' %} <a href="https://git.mowoe.com/reverend" class="LP-Footer__GenericAnchor">Reverend</a>
{% translate 'and' %} <a href="https://www.commander1024.de" class="LP-Footer__GenericAnchor">Commander1024.</a></span>
</div>
<div class="LP-Footer__BottomWrapper">
<a href="{% url 'flatpage' slug='privacy-policy' %}" class="LP-Footer__GenericAnchor">{% trans 'Privacy Policy' %}</a>
<a href="{% url 'flatpage' slug='privacy-policy' %}" class="LP-Footer__GenericAnchor">{% translate 'Privacy Policy' %}</a>
|
<a href="{% url 'flatpage' slug='imprint' %}" class="LP-Footer__GenericAnchor">{% trans 'Imprint' %}</a>
<a href="{% url 'flatpage' slug='imprint' %}" class="LP-Footer__GenericAnchor">{% translate 'Imprint' %}</a>
</div>
</section>
</footer>

16
django_lostplaces/lostplaces/templates/partials/nav/pagination.html
View File

@@ -8,26 +8,26 @@
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--first">
<a href="?page=1" class="LP-Link">
<span class="LP-Icon">⟪</span>
<span class="LP-Text">{% trans 'First' %}</span>
<span class="LP-Text">{% translate 'First' %}</span>
</a>
</li>
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--previous">
<a href="?page={{ page_obj.previous_page_number }}" class="LP-Link">
<span class="LP-Icon">⟨</span>
<span class="LP-Text">{% trans 'Previous' %}</span>
<span class="LP-Text">{% translate 'Previous' %}</span>
</a>
</li>
{% else %}
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--first LP-Pagination__Item--disabled">
<a href="#" class="LP-Link">
<span class="LP-Icon">⟪</span>
<span class="LP-Text">{% trans 'First' %}</span>
<span class="LP-Text">{% translate 'First' %}</span>
</a>
</li>
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--previous LP-Pagination__Item--disabled">
<a href="#" class="LP-Link">
<span class="LP-Icon">⟨</span>
<span class="LP-Text">{% trans 'Previous' %}</span>
<span class="LP-Text">{% translate 'Previous' %}</span>
</a>
</li>
{% endif %}
@@ -47,25 +47,25 @@
{% if page_obj.has_next %}
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--next">
<a href="?page={{ page_obj.next_page_number }}" class="LP-Link">
<span class="LP-Text">{% trans 'Next' %}</span>
<span class="LP-Text">{% translate 'Next' %}</span>
<span class="LP-Icon">⟩</span>
</a>
</li>
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--last">
<a href="?page={{ page_obj.paginator.num_pages }}" class="LP-Link">
<span class="LP-Text">{% trans 'Last' %}</span>
<span class="LP-Text">{% translate 'Last' %}</span>
<span class="LP-Icon">⟫</span>
</a>
</li>
{% else %}
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--next LP-Pagination__Item--disabled">
<a href="#" class="LP-Link">
<span class="LP-Text">{% trans 'Next' %}</span>
<span class="LP-Text">{% translate 'Next' %}</span>
<span class="LP-Icon">⟩</span>
</a>
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--last LP-Pagination__Item--disabled">
<a href="#" class="LP-Link">
<span class="LP-Text">{% trans 'Last' %}</span>
<span class="LP-Text">{% translate 'Last' %}</span>
<span class="LP-Icon">⟫</span>
</a>
</li>

37
django_lostplaces/lostplaces/templates/partials/placeImageGrid.html Normal file
View File

@@ -0,0 +1,37 @@
{% load static %}
{% load lostplaces %}
{% if headline %}
<h1 class="LP-Headline">{{headline}}</h1>
{% endif %}
<div class="LP-ImageGrid">
<ul class="LP-ImageGrid__Container">
{% for image in image_list %}
<li id="thumbnail{{forloop.counter}}" class="LP-ImageGrid__Item">
{{ "#image"|add:forloop.counter }}
{% include 'partials/image.html' with source_url=image.filename.thumbnail.url link_url="#image"|addstr:forloop.counter %}
{% if user.explorer == image.submitted_by%}
<span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
<a href="{% url 'place_image_delete' pk=image.id %}" class="LP-Link">
<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
</a>
</span>
{% endif %}
<div id="image{{forloop.counter}}" class="LP-ImageGrid__LightBox">
<img class="LP-ImageGrid__FullSizeImage" src="{{image.filename.large.url}}" loading="lazy"/>
{% if forloop.counter < image_list|length %}
<a href="#image{{forloop.counter|add:1}}" class="LP-ImageGrid__Next">Next</a>
{% endif %}
{% if forloop.counter > 1 %}
<a href="#image{{forloop.counter|add:-1}}" class="LP-ImageGrid__Previous">Previous</a>
{% endif %}
<span class="LP-ImageGrid__Close LP-ImageGrid__DeleteItem" title="Schließen">
<a href="#thumbnail{{forloop.counter}}" class="LP-Link">
<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}"/>
</a>
</span>
</div>
</li>
{% endfor %}
</ul>
</div>

9
django_lostplaces/lostplaces/templates/partials/place_teaser.html
View File

@@ -1,11 +1,10 @@
{%load static %}
<article class="LP-PlaceTeaser {% if extended %} LP-PlaceTeaser--extended{% endif %}">
<a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
<div class="LP-PlaceTeaser__Image">
{% if place.placeimages.all|length > 0 %}
<img class="LP-Image" src="{{ place.placeimages.first.filename.thumbnail.url}}" />
{% else %}
<div class="LP-PlaceTeaser__Image">
{% if place.placeimages.all|length > 0 %}
{% include 'partials/image.html' with source_url=place.placeimages.first.filename.thumbnail.url %}
{% else %}
<img class="LP-Image" src="{% static 'images/missing_image.png' %}" />
{% endif %}
</div>

4
django_lostplaces/lostplaces/templates/partials/tagging.html
View File

@@ -27,11 +27,11 @@
<form id="id_tag_submit_form" class="LP-Form LP-Form--inline LP-Form--tagging" method="POST" action="{% url config.submit_url_name tagged_id=config.tagged_item.id%}">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% trans 'Add tags' %}</legend>
<legend class="LP-Form__Legend">{% translate 'Add tags' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable">
<div class="LP-Form__Field LP-Form__Button LP-Input LP-Input--tagging">
<button id="id_tag_submit_button" class="LP-Button">{% trans 'Add tags' %}</button>
<button id="id_tag_submit_button" class="LP-Button">{% translate 'Add tags' %}</button>
</div>
<div class="LP-Form__Field">
{% include 'partials/form/inputField.html' with field=config.submit_form.tag_list classes="LP-Input--tagging" %}

12
django_lostplaces/lostplaces/templates/partials/welcome.html
View File

@@ -1,21 +1,21 @@
{% load i18n %}
<header class="LP-TextSection__Headline">
<h1 class="LP-Headline">{% trans 'Start' %}</h1>
<h1 class="LP-Headline">{% translate 'Start' %}</h1>
</header>
<div class="LP-TextSection__Text">
<p class="LP-Paragraph">{% trans 'Welcome to our Urban Exploration community catalogue,' %}
<p class="LP-Paragraph">{% translate 'Welcome to our Urban Exploration community catalogue,' %}
{% if user.is_authenticated %}
{{ user.username }}
{% else %}
{% trans 'explorer' %}
{% translate 'explorer' %}
{% endif %}
!
</p>
<p class="LP-Paragraph">
{% trans 'We strictly follow our' %}
<a class="LP-Link" href="{% url 'flatpage' slug='codex' %}"><span class="LP-Link__Text">{% trans 'UrBex codex' %}</span></a>
{% trans 'and expect you to do so, too.' %}'
{% translate 'We strictly follow our' %}
<a class="LP-Link" href="{% url 'flatpage' slug='codex' %}"><span class="LP-Link__Text">{% translate 'UrBex codex' %}</span></a>
{% translate 'and expect you to do so, too.' %}'
</p>
</div>