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

6
django_lostplaces/lostplaces/templates/place/place_create.html
View File

@@ -2,12 +2,12 @@
{% load static %}
{% load i18n %}
# {% block title %}{% trans 'Create place' %}{% endblock %}
# {% block title %}{% translate 'Create place' %}{% endblock %}
{% block maincontent %}
<form class="LP-Form" method="POST" enctype="multipart/form-data">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% trans 'Create place' %}</legend>
<legend class="LP-Form__Legend">{% translate 'Create place' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable">
<div class="LP-Form__Field">
@@ -39,7 +39,7 @@
</div>
</div>
{% trans 'Create' as action %}
{% translate 'Create' as action %}
<div class="LP-Form__Composition LP-Form__Composition--buttons">
{% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER action=action %}
</div>

8
django_lostplaces/lostplaces/templates/place/place_delete.html
View File

@@ -2,21 +2,21 @@
{% load static %}
{% load i18n %}
{% block title %}{% trans 'Delete lost place' %}{% endblock %}
{% block title %}{% translate 'Delete lost place' %}{% endblock %}
{% block maincontent %}
<form class="LP-Form" method="POST">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% trans 'Delete place' %}</legend>
<legend class="LP-Form__Legend">{% translate 'Delete place' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition">
<div class="LP-Form__Field LP-Form__InfoText">
<p class="LP-Paragraph">{% blocktrans with place_name=place.name%}Are you sure you want to delete {{place_name}}?{% endblocktrans %}</p>
<p class="LP-Paragraph">{% blocktranslate with place_name=place.name%}Are you sure you want to delete {{place_name}}?{% endblocktranslate %}</p>
</div>
</div>
{% trans 'Delete' as action %}
{% translate 'Delete' as action %}
<div class="LP-Form__Composition LP-Form__Composition--buttons">
{% include 'partials/form/submit.html' with referer=request.META.HTTP_REFERER action=action %}
</div>

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

@@ -4,6 +4,7 @@
{% load thumbnail %}
{% load svg_icon %}
{% load lostplaces %}
{% block additional_head %}
<link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
@@ -15,8 +16,8 @@
{% block title %}{{place.name}}{% endblock %}
{% block additional_menu_items %}
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_edit' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Edit place' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_delete' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Delete place' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_edit' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">{% translate 'Edit place' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_delete' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">{% translate 'Delete place' %}</span></a></li>
{% endblock additional_menu_items %}
{% block maincontent %}
@@ -25,9 +26,11 @@
<header class="LP-PlaceDetail__Header">
<h1 class="LP-Headline">{{ place.name }} {% include 'partials/icons/place_favorite.html' %} {% include 'partials/icons/place_visited.html' %}</h1>
{% if place.placeimages.first.filename.hero.url %}
<figure class="LP-PlaceDetail__Image">
<img src="{{ place.placeimages.first.filename.hero.url }}" class="LP-Image" />
</figure>
<div class="LP-PlaceDetail__Image">
{% partial image %}
{% set source_url place.placeimages.first.filename.hero.url %}
{% endpartial %}
</div>
{% endif %}
</header>
@@ -38,13 +41,15 @@
<section class="LP-Section">
{% url 'place_tag_submit' place_id=place.id as tag_submit_url%}
{% include 'partials/tagging.html' with config=tagging_config %}
{% partial tagging %}
{% set config=tagging_config %}
{% endpartial %}
</section>
<section class="LP-Section">
<h1 class="LP-Headline">{% trans 'Map links' %}</h1>
{% include 'partials/osm_map.html' with config=mapping_config modifier='wide' %}
<h1 class="LP-Headline">{% translate 'Map links' %}</h1>
{% partial osm_map config=mapping_config %}
<div class="LP-LinkList">
<ul class="LP-LinkList__Container">
<li class="LP-LinkList__Item"><a target="_blank" href="https://www.google.com/maps?q={{place.latitude|safe}},{{place.longitude|safe}}" class="LP-Link"><span class="LP-Text">Google Maps</span></a></li>
@@ -55,7 +60,7 @@
</section>
<section class=" LP-Section">
<h1 class="LP-Headline">{% trans 'Photo albums' %}</h1>
<h1 class="LP-Headline">{% translate 'Photo albums' %}</h1>
<div class="LP-LinkList">
<ul class="LP-LinkList__Container">
{% for photo_album in place.photoalbums.all %}
@@ -81,7 +86,7 @@
v216c0,11.046,8.954,20,20,20s20-8.954,20-20V276h216c11.046,0,20-8.954,20-20C512,244.954,503.046,236,492,236z" />
</g>
</svg>
<span class="RV-Iconized__Text">{% trans 'Add photo album' %}</span>
<span class="RV-Iconized__Text">{% translate 'Add photo album' %}</span>
</div>
</a>
</li>
@@ -90,30 +95,8 @@
</section>
<section class="LP-Section">
<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>
{% translate 'Images' as headline %}
{% partial "placeImageGrid" image_list=place.placeimages.all %}
</section>
</article>

4
django_lostplaces/lostplaces/templates/place/place_list.html
View File

@@ -7,13 +7,13 @@
<script src="{% static 'maps/ol.js' %}"></script>
{% endblock additional_head %}
{% block title %}{% trans 'All Places' %}{% endblock %}
{% block title %}{% translate 'All Places' %}{% endblock %}
{% block maincontent %}
{% include 'partials/osm_map.html' with config=mapping_config modifier='wide' %}
<div class="LP-PlaceList">
<h1 class="LP-Headline">{% trans 'Our lost places' %}</h1>
<h1 class="LP-Headline">{% translate 'Our lost places' %}</h1>
<ul class="LP-PlaceList__List">
{% for place in place_list %}
<li class="LP-PlaceList__Item">

6
django_lostplaces/lostplaces/templates/place/place_update.html
View File

@@ -2,12 +2,12 @@
{% load static %}
{% load i18n %}
# {% block title %}{% trans 'Edit place' %}{% endblock %}
# {% block title %}{% translate 'Edit place' %}{% endblock %}
{% block maincontent %}
<form class="LP-Form" method="POST" enctype="multipart/form-data">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% trans 'Edit place' %}</legend>
<legend class="LP-Form__Legend">{% translate 'Edit place' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable">
<div class="LP-Form__Field">
@@ -39,7 +39,7 @@
</div>
</div>
{% trans 'Update' as action %}
{% translate 'Update' as action %}
<div class="LP-Form__Composition LP-Form__Composition--buttons">
{% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER action=action %}
</div>