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

Compare commits

base: Commander1024:bae4e13137ee12a1982bf6f5072adba24c4349bf
Branches Tags
Commander1024:master
Commander1024:develop
Commander1024:update/django-4.1.1
Commander1024:feature/50-Linktypes
Commander1024:feature/33-been-there-done-that
Commander1024:feature/30-user-profile-fields
Commander1024:27-Favorite-System
Commander1024:feature/localization
Commander1024:feature/authorized_tag
Commander1024:0.1.4
Commander1024:0.1.3
Commander1024:0.1.2
Commander1024:0.1.a2
Commander1024:0.1
..
compare: Commander1024:196fb02436579467527cdc5b35861549fc50ece7
Branches Tags
Commander1024:develop
Commander1024:update/django-4.1.1
Commander1024:master
Commander1024:feature/50-Linktypes
Commander1024:feature/33-been-there-done-that
Commander1024:feature/30-user-profile-fields
Commander1024:27-Favorite-System
Commander1024:feature/localization
Commander1024:feature/authorized_tag
Commander1024:0.1.4
Commander1024:0.1.3
Commander1024:0.1.2
Commander1024:0.1.a2
Commander1024:0.1

No commits in common. "bae4e13137ee12a1982bf6f5072adba24c4349bf" and "196fb02436579467527cdc5b35861549fc50ece7" have entirely different histories.
bae4e13137 ... 196fb02436

6 changed files with 48 additions and 44 deletions
Show Stats Expand all files Collapse all files

21
django_lostplaces/lostplaces/templates/explorer/profile.html
View File

@ -63,8 +63,25 @@
</section>
<section class="LP-Section">
{% translate 'Images submitted by' as submitted_by %}
{% include 'partials/placeImageGrid.html' with headline=submitted_by|add:' '|add:explorer.user.username image_list=assets.placeimages.all%}
<h1 class="LP-Headline">{% trans 'Images submitted by' %} {{explorer.user.username}}</h1>
<div class="LP-ImageGrid">
<ul class="LP-ImageGrid__Container">
{% for place_image in assets.placeimages.all %}
<li class="LP-ImageGrid__Item">
<a href="{{ place_image.filename.large.url }}" class="LP-Link">
<img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
</a>
{% if user.explorer == place_image.submitted_by%}
<span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
<a href="{% url 'place_image_delete' pk=place_image.id %}" class="LP-Link">
<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
</a>
</span>
{% endif %}
</li>
{% endfor %}
</ul>
</div>
</section>
<section class=" LP-Section">

2
django_lostplaces/lostplaces/templates/home_unauth.html
View File

@ -24,7 +24,7 @@
<a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
<article class="LP-PlaceTeaser">
<div class="LP-PlaceTeaser__Image">
{% include 'partials/image.html' with source_url=place.placeimages.first.filename.thumbnail.url %}
<img class="LP-Image" src="{{ place.placeimages.first.filename.thumbnail.url}}" />
</div>
<div class="LP-PlaceTeaser__Meta">
<div class="LP-PlaceTeaser__Info">

14
django_lostplaces/lostplaces/templates/partials/image.html
View File

@ -1,14 +0,0 @@
{% 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}}" {% endif %}
class="LP-Image"
/>
</figure>
{% if link_url %}</a>{% endif %}

21
django_lostplaces/lostplaces/templates/partials/placeImageGrid.html
View File

@ -1,21 +0,0 @@
{% load static %}
{% if headline %}
<h1 class="LP-Headline">{{headline}}</h1>
{% endif %}
<div class="LP-ImageGrid">
<ul class="LP-ImageGrid__Container">
{% for image in image_list %}
<li class="LP-ImageGrid__Item">
{% include 'partials/image.html' with source_url=image.filename.thumbnail.url link_url=image.filename.large.url %}
{% 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 %}
</li>
{% endfor %}
</ul>
</div>

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

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

32
django_lostplaces/lostplaces/templates/place/place_detail.html
View File

@ -25,9 +25,9 @@
<header class="LP-PlaceDetail__Header">
<h1 class="LP-Headline">{{ place.name }}</h1>
{% if place.placeimages.first.filename.hero.url %}
<div class="LP-PlaceDetail__Image">
{% include 'partials/image.html' with source_url=place.placeimages.first.filename.hero.url %}
</div>
<figure class="LP-PlaceDetail__Image">
<img src="{{ place.placeimages.first.filename.hero.url }}" class="LP-Image" />
</figure>
{% endif %}
</header>
@ -90,8 +90,30 @@
</section>
<section class="LP-Section">
{% translate 'Images' as t_images %}
{% include 'partials/placeImageGrid.html' with headline=t_images image_list=place.placeimages.all%}
<h1 class="LP-Headline">{% trans 'Images' %}</h1>
<div class="LP-ImageGrid">
<ul class="LP-ImageGrid__Container">
{% for place_image in place.placeimages.all %}
<li class="LP-ImageGrid__Item">
<a href="{{ place_image.filename.large.url }}" class="LP-Link">
<img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
</a>
{% if user.explorer == place_image.submitted_by or user.explorer == place.submitted_by %}
<span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
<a href="{% url 'place_image_delete' pk=place_image.id %}" class="LP-Link">
<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
</a>
</span>
{% endif %}
</li>
{% endfor %}
<li class="LP-ImageGrid__Item LP-ImageGrid__Item--add" title="Bild hinzufügen">
<a class="LP-Link" href="{% url 'place_image_create' place_id=place.id%}">
<img class="LP-Icon" src="{% static 'icons/plus.svg' %}" />
</a>
</li>
</ul>
</div>
</section>
</article>