Implemented tag that checks if user is authorized.

commit 0d62e72d72922a84e41c9f2cc21977b794784d1c
Merge: 79fee63 85f2a81
Author: reverend <reverend@reverend2048.de>
Date:   Tue Sep 22 21:55:18 2020 +0200

    Merge branch 'develop' into refactor/models

commit 79fee631d7ac28509067ecdd74078f1a2f6e0be2
Author: reverend <reverend@reverend2048.de>
Date:   Tue Sep 22 21:54:32 2020 +0200

    Updating references for related name

commit 8e07e79df2de2601f2e2eadfdd37eb7c719c51b0
Author: reverend <reverend@reverend2048.de>
Date:   Tue Sep 22 21:53:31 2020 +0200

    Generating of related names fix

commit 5fd804f37a805ae4707e13c3d941bdde3660afea
Merge: 8cc1d3e 3b526c9
Author: reverend <reverend@reverend2048.de>
Date:   Tue Sep 22 21:01:48 2020 +0200

    Merge branch 'develop' into refactor/models

commit 8cc1d3e690211dba6451e86569f00078b23e0621
Author: reverend <reverend@reverend2048.de>
Date:   Tue Sep 22 20:21:08 2020 +0200

    Tests

commit 7c0591e5397f892b1f6fb80725a693c21f90468a
Author: reverend <reverend@reverend2048.de>
Date:   Fri Sep 18 23:53:39 2020 +0200

    Testing PlaceAsset

commit 2e7b49ad1a15173565c81e7eb8bb3f35b9f622a6
Author: reverend <reverend@reverend2048.de>
Date:   Fri Sep 18 22:25:08 2020 +0200

    Restructuring models

commit eb7d03b08b326f9115e70d0fd9ed5d0fc229a362
Author: reverend <reverend@reverend2048.de>
Date:   Fri Sep 18 22:01:54 2020 +0200

    Abstract class Expireable

commit 2b51e741bb5734c5a578beeadef7819fe58b2223
Author: reverend <reverend@reverend2048.de>
Date:   Fri Sep 18 21:54:07 2020 +0200

    Abstract Model for PlaceAsset (i.e. Photoalbums)

.gitignore

@@ -9,8 +9,8 @@ db.sqlite3
 db.sqlite3-journal
 db.sqlite3.bak
 # user uploaded files
-media
 uploads
+static_files
 
 ### Django.Python Stack ###
 # Byte-compiled / optimized / DLL files
@@ -65,12 +65,6 @@ coverage.xml
 # Translations
 *.mo
 
-# Django stuff:
-# exclude migrations from repository. These should be created locally, matching local DB requirements.
-# lostplaces/manage.py makemigrations && lostplaces/manage.py migrate
-
-django_lostplaces/lostplaces/migrations/
-
 # pyenv
 .python-version
 
@@ -97,4 +91,4 @@ venv.bak/
 .vscode
 
 # twine / pypi
-.pypirc
+.pypirc

Readme.md

@@ -21,6 +21,13 @@ Right now it depends on the following non-core Python 3 libraries. These can be
   * [image](https://github.com/francescortiz/image) Image cropping for django.
   * [django-widget-tweaks](https://github.com/jazzband/django-widget-tweaks) Tweak the form field rendering in templates, not in python-level form definitions.
   * [django-taggit](https://github.com/jazzband/django-taggit) A simpler approach to tagging with Django.
+  
+  ### Bundled Dependencies
+  We also leverage some other great OpenSource projects' code. We bundle those in the distribution to obsolete the need to pull those files from monitored CDNs.
+
+  * [OpenLayers](https://openlayers.org/) [6.4.3] OpenLayers makes it easy to put a dynamic map in any web page. It can display map tiles, vector data and markers loaded from any source.
+  * [Crimson Pro font](https://github.com/Fonthausen/CrimsonPro) [1.002] Crimson Pro is a serif typeface family: Contemporary, clear, classic and rounded/open.
+  * [Montserrat](https://github.com/JulietaUla/Montserrat) [7.210] A beautiful sans serif typeface.
 
 
 # Installing a development instance

django_lostplaces/django_lostplaces/settings.py

@@ -18,6 +18,8 @@ https://docs.djangoproject.com/en/3.1/ref/settings/
 
 import os
 from django.urls import reverse_lazy
+from django.utils.translation import gettext_lazy as _
+
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -58,6 +60,7 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
 ]
 
 ROOT_URLCONF = 'django_lostplaces.urls'
@@ -124,6 +127,11 @@ USE_L10N = True
 
 USE_TZ = True
 
+LANGUAGES = [
+    ('de', _('German')),
+    ('en', _('English')),
+]
+
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.1/howto/static-files/

django_lostplaces/docs/developer.md

@@ -1,7 +1,7 @@
 # django lostplaces documentation for developer
 
 Greetings,
-this documentation is for anyone who wants to work with this projects codebase or is just curious about our project.
+this documentation is for anyone who wants to work with this projects codebase or is just curious about how it works.
 
 
 ## Models
@@ -9,32 +9,41 @@ The models contain an custom user profile, some abstract base models and the mod
 
 
 ### Explorer user profile
-The class `lostplaces.models.Explorer` is our custom user profile. It has an ForeignKey pointing at django's default user model instead of providing an entire custom user model. That way this django app does not conflict with any other app that has to bring it's own user model.
+Location: `lostplaces.models.models.Explorer`  
+Import from: `lostplaces.models.Explorer`
+#### Super Classes
+- django's `models.Model`
+
+The class `lostplaces.models.Explorer` is our custom user profile. It has an ForeignKey pointing at django's default user model instead of providing an entire custom user model. That way this django app does not conflict with any other app that brings it's own user model.
 
 You can access the explorer profile by accessing the 'explorer' attribute of any user instance
 ```python
 user.explorer
 ```
 
-Currently the explorer profile is used by the abstract model 'Submittable' and thus referenced by 'Place' and 'PlaceImage'. The explorer profile therefore has two attributes
-```python
-user.explorer.places
-user.explorer.placeimages
-```
-`places`  
-A list containing all (lost) places the user has submitted  
-`placeimages`  
-A list containing all images relating a place that a user has submitted
+Currently the explorer profile is used by the abstract model 'Submittable' and has the following realated names/fiels:
+- [places](###place) A list containing all (lost) places the user has submitted  
+- [placeimages](###placeimages) A list containing all images relating a place that a user has submitted
+- [photoalbums](###photoalbums) A list of all photo albums a explorere has submitted
 
 
 ### Taggable
+Location: `lostplaces.models.abstract_models.Taggable`  
+Import from: `lostplaces.models.Taggable`
+#### Super Classes
+- django's `models.Model`
+
 The abstract model Taggable represents an model that is taggable. It depends on the django app [taggit](https://github.com/jazzband/django-taggit). It only consists of one field:  
-`tag`  
-TaggableManager, allows the sub class to be tagged, blank=True allows the admin form to be submitted without any tags
+- `tag`: TaggableManager, allows the sub class to be tagged, blank=True allows the admin form to be submitted without any tags
 
 
 ### Mapable
-The abstract model Mapable represents an model that can be displayed on a map. It consists of tree members  
+Location: `lostplaces.models.abstract_models.Mapable`  
+Import from: `lostplaces.models.Mapable`
+#### Super Classes
+- django's `models.Model`
+
+The abstract model Mapable represents an model that can be displayed on a map. It consists of tree attributes  
 `name`  
 Name of the object, displayed on the map, max length 50 characters  
 `latitude`  
@@ -45,14 +54,36 @@ A mapable model has to provide its own get_absolute_url, in order to provide a l
 
 
 ### Submittable
+Location: `lostplaces.models.abstract_models.Submittable`  
+Import from: `lostplaces.models.Submittable`
+#### Super Classes
+- django's `models.Model`
+
 The abstract model Submittable represents an model that can be submitted by an user. It knows who submitted something and when:  
 `submitted_by`  
-Referencing the explorer profile, see [Explorer](##explorer-user-profile). If the explorer profile is deleted, this instance is kept (on_delete=models.SET_NULL). The related_name is set to the class name, lower case appending an s (%(class)s)  
+Referencing the explorer profile, see [Explorer](##explorer-user-profile). If the explorer profile is deleted, this instance is kept (on_delete=models.SET_NULL). The related_name is set to the class name, lower case appending an s (%(class)ss)  
 `submitted_when`  
 When the object was submitted, automatically set by django (auto_now_add=True)
 
+### Expireable
+Location: `lostplaces.models.abstract_models.Expireable`  
+Import from: `lostplaces.models.Expireable`
+#### Super Classes
+- django's `models.Model`
+
+This abstract model represents an object that can expire. It is currently used by the Voucher model. I consists of two fields:
+`created_when`  
+The date the object was created, automatically set by django (auto_now_add=True)  
+`expires_when`  
+The date the object expires.
 
 ### Voucher
+Locatoin: `lostplaces.models.Voucher`  
+Import from: `lostplaces.models.Voucher`
+#### Super Classes
+- django's `models.Model`
+- [lostplaces.models.Expireable](###expireable)
+
 A voucher code is needed to sign up using lostplaces sign up form. The model contains  
 `code`  
 The voucher code, max length 30 characters
@@ -63,6 +94,14 @@ Till what date the voucher remains valid
 
 
 ### Place
+Location: `lostplaces.models.place.Place`  
+Import from: `lostplaces.models.Place`
+#### Super Classes
+- django's `models.Model`
+- [lostplaces.models.Submittable](###submittable)-
+- [lostplaces.models.Taggable](###taggable)
+- [lostlaces.models.Mapable]
+
 The place model is the heart of this project. It stores all information about a place needed.  
 `location`  
 Human readable location description (town, village, street), max length 50 characters  
@@ -72,4 +111,45 @@ The place model uses these abstract super classes
 - Submittable, see [Submittable](##submittable) for additional fields
 - Taggable, see [Taggable](##taggable) for additional fields
 - Mapable, see [Mapable](##mapable) for additional fields
-The average_latlon function takes a list of places and returns the center point of all these places
+The average_latlon function takes a list of places and returns the center point of all these places.
+
+### PlaceAsset
+Location: `lostplaces.models.PlaceAsset`  
+Import from: `lostplaces.models.place.PlaceAsset`
+#### Super Classes
+- django's `models.Model`
+- [lostplaces.models.Submittable](###submittable)
+
+A PlaceAsset is anything that belongs to a place. The PlaceImage model for exmpaple is a subclass of PlaceAsset. A PlaceAsset is supposed to be submittable by every user. Only the user who has submitted the asset, the place the asset belongs to or both can delete a asset.
+
+An PlaceAsset has the following fields
+`place`  
+The Place this PlaceAsset belongs to
+
+The PlaceAsset model is a subclass of Submittable, see [Submittable](###submittable) for more details.
+
+### External Link
+Loacation: `lostplaces.models.external_link.ExternalLink`  
+Import From: `lostplaces.models.ExternalLink`
+#### Super Classes
+- django's `models.Model`
+- [lostplaces.models.Submittable](###submittable)
+- [lostplaces.models.PlaceAsset](###placeasset)
+
+This model represents an URL to an external website. External Link is an PlaceAsset, see [above](###placeasset) for more details. External Link has to fields
+`url`  
+the URL to the target
+`label`  
+the label that is shown on the website
+
+### PhotoAlbum
+Loacation: `lostplaces.models.external_link.PhototAlbum`  
+Import From: `lostplaces.models.PhotoAlbum`
+#### Super Classes
+- django's `models.Model`
+- [lostplaces.models.Submittable](###submittable)
+- [lostplaces.models.PlaceAsset](###placeasset)
+- [lostplaces.models.ExternalLink](###externallink)
+
+A photo album is a link to an external site that is meant to contain photos of the place it is referenced in. It 
+does not have any fields, just the ones inherited from it's super class [ExternalLink](###externallink).

django_lostplaces/lostplaces/forms.py

@@ -4,8 +4,10 @@
 ''' (web)forms that can be used elsewhere. '''
 
 from django import forms
+from django.db import models
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 from django.contrib.auth.models import User
+from django.utils.translation import ugettext_lazy as _
 from lostplaces.models import Place, PlaceImage, Voucher
 
 class ExplorerCreationForm(UserCreationForm):
@@ -14,8 +16,8 @@ class ExplorerCreationForm(UserCreationForm):
         fields = ('username', 'email')
     voucher = forms.CharField(
         max_length=30,
-        help_text='The Voucher you got from an administrator'
-        )
+        help_text=_('The Voucher you got from an administrator')
+    )
 
     def is_valid(self):
         super().is_valid()
@@ -23,11 +25,11 @@ class ExplorerCreationForm(UserCreationForm):
         try:
             fetched_voucher = Voucher.objects.get(code=submitted_voucher)
         except Voucher.DoesNotExist:
-            self.add_error('voucher', 'Invalid voucher')
+            self.add_error('voucher', _('Invalid voucher'))
             return False
 
-        if not submitted_voucher.valid:
-            self.add_error('voucher', 'Expired voucher')
+        if not fetched_voucher.valid:
+            self.add_error('voucher', _('Expired voucher'))
             return False
 
         fetched_voucher.delete()

django_lostplaces/lostplaces/locale/de/LC_MESSAGES/django.po

@@ -0,0 +1,377 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Reverend <reverend@reverend2048.de>, 2020.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-10-11 07:48+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Commander1024 <commander@commander1024.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de-DE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forms.py:19
+msgid "The Voucher you got from an administrator"
+msgstr "Der Einladungs-Code, den Dir ein Administrator gegeben hat"
+
+#: forms.py:28
+msgid "Invalid voucher"
+msgstr "Ungültiger Voucher"
+
+#: forms.py:32
+msgid "Expired voucher"
+msgstr "Abgelaufener Voucher"
+
+#: models/abstract_models.py:29
+msgid "Name"
+msgstr "Name"
+
+#: models/abstract_models.py:36
+msgid "Latitude"
+msgstr "Breitengrad"
+
+#: models/abstract_models.py:37
+msgid "Latitude in decimal format: e. g. 41.40338"
+msgstr "Breitengrad in dezimaler Form: z. B. 51.95021"
+
+#: models/abstract_models.py:44
+msgid "Longitude"
+msgstr "Längengrad"
+
+#: models/abstract_models.py:45
+msgid "Longitude in decimal format: e. g. 2.17403"
+msgstr "Breitengrad in dezimaler Form: z. B. 7.4840155"
+
+#: models/external_links.py:13
+msgid "URL"
+msgstr "Adresse (URL)"
+
+#: models/external_links.py:17
+msgid "link text"
+msgstr "Linktext"
+
+#: models/place.py:21
+msgid "Location"
+msgstr "Ort"
+
+#: models/place.py:24
+msgid ""
+"Description of the place: e.g. how to get there, where to be careful, the "
+"place's history..."
+msgstr ""
+"Beschreibung des Places: z. B. wie man hin kommt, wo man vorsichtig sein "
+"sollte, seine Geschichte..."
+
+#: models/place.py:25 models/place.py:84
+msgid "Description"
+msgstr "Beschreibung"
+
+#: models/place.py:90
+msgid "Filename(s)"
+msgstr "Dateiname(n)"
+
+#: models/place.py:91
+msgid "Optional: One or more images to upload"
+msgstr "Optional: Ein oder mehrere Bilder zum Hochladen"
+
+#: templates/403.html:4
+msgid "Forbidden"
+msgstr "Nicht Erlaubt"
+
+#: templates/403.html:14
+msgid "You will be redirected in 5 seconds"
+msgstr "Du wirst in 5 Sekunden weitergeleitet"
+
+#: templates/403.html:14
+msgid "Go Back"
+msgstr "Zurück"
+
+#: templates/global.html:32
+msgid "Logout"
+msgstr "Abmelden"
+
+#: templates/global.html:34
+msgid "Admin"
+msgstr "Admin"
+
+#: templates/global.html:39 templates/registration/login.html:4
+#: templates/registration/login.html:10 templates/registration/login.html:23
+msgid "Login"
+msgstr "Anmelden"
+
+#: templates/global.html:40 templates/registration/login.html:29
+#: templates/signup.html:12 templates/signup.html:41
+msgid "Sign Up"
+msgstr "Registrieren"
+
+#: templates/global.html:50 templates/home.html:10
+msgid "Home"
+msgstr "Startseite"
+
+#: templates/global.html:51
+msgid "UrBex Codex"
+msgstr "UrBex Codex"
+
+#: templates/global.html:56 templates/place/place_create.html:5
+#: templates/place/place_create.html:10
+msgid "Create Place"
+msgstr "Place erstellen"
+
+#: templates/global.html:57
+msgid "All Places"
+msgstr "Alle Places"
+
+#: templates/home.html:20 templates/home_unauth.html:20
+msgid "Explore the latest places"
+msgstr "Neueste Places erkunden"
+
+#: templates/home_unauth.html:11
+msgid ""
+"You can create, view and share your lost places with other members of this "
+"site. You can upload photos, place links to your web galleries and "
+"contribute your knowledge by tagging other places or commenting on them. You "
+"will find detailed information on where these locations are, how to get "
+"there and what to expect from them. This might even include detailed "
+"information on the surroundings or the history of a lost place."
+msgstr ""
+"Du kannst Deine Lost Places erstellen, ansehen und mit anderen Mitgliedern "
+"auf dieser Seite teilen. Du kannst Photos hochladen, Links zu Deinen Web-"
+"Fotoalben setzen und Dein Wissen teilen indem Du andere Places mit Tags "
+"versiehst oder sie kommentierst. Du wirst detaillierte Informationen dazu "
+"finden, wo diese Orte sind, wie Du dorthin gelangst und was Dich dort "
+"erwartet. Dies können sogar detaillierte Informationen zur Umgebung oder der "
+"Geschichte eines Lost Places sein."
+
+#: templates/home_unauth.html:15
+#, python-format
+msgid ""
+"Since vandalism is a growing problem these days, no sensitive information is "
+"available to the public. You have to <a class=\"LP-Link\" href="
+"\"%(signup_url)s\"><span class=\"LP-Link__Text\">sign up</span></a> with a "
+"voucher code as an invitation to join this community. Only admins can create "
+"these codes. Usually you are given a code when we know you in real life in "
+"person and when we trust you. A request from an unknown person will most "
+"probably be denied."
+msgstr ""
+"Weil Vandalismus dieser Tage ein wachsendes Problem ist, sind keine "
+"sensiblen Informationen öffentlich verfügbar. Du musst Dich mit einem "
+"Voucher-Code als Einladung <a class=\"LP-Link\" href=\"%(signup_url)s"
+"\"><span class=\"LP-Link__Text\">registrieren</span></a>um dieser Community "
+"beizutreten. Nur Administratoren können diese Codes erstellen. Üblicherweise "
+"bekommst Du einen Code, wenn wir Dich im echten Leben kennen und Dir "
+"vertrauen. Eine Anfrage von einer unbekannten Person wird "
+"höchstwahrscheinlich abgelehnt."
+
+#: templates/partials/form/submit.html:3
+msgid "Submit"
+msgstr "Abschicken"
+
+#: templates/partials/form/submit.html:7
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: templates/partials/nav/footer.html:64
+msgid "Made by"
+msgstr "Erstellt von"
+
+#: templates/partials/nav/footer.html:65
+msgid "and"
+msgstr "und"
+
+#: templates/partials/nav/footer.html:68
+msgid "Privacy Policy"
+msgstr "Datenschutzerklärung"
+
+#: templates/partials/nav/footer.html:70
+msgid "Imprint"
+msgstr "Impressum"
+
+#: templates/partials/nav/pagination.html:11
+#: templates/partials/nav/pagination.html:24
+msgid "First"
+msgstr "Erste"
+
+#: templates/partials/nav/pagination.html:17
+#: templates/partials/nav/pagination.html:30
+msgid "Previous"
+msgstr "Vorherige"
+
+#: templates/partials/nav/pagination.html:50
+#: templates/partials/nav/pagination.html:63
+msgid "Next"
+msgstr "Nächste"
+
+#: templates/partials/nav/pagination.html:56
+#: templates/partials/nav/pagination.html:68
+msgid "Last"
+msgstr "Letzte"
+
+#: templates/partials/tagging.html:30 templates/partials/tagging.html:34
+msgid "Add tags"
+msgstr "Tags hinzufügen"
+
+#: templates/partials/welcome.html:4
+msgid "Start"
+msgstr "Start"
+
+#: templates/partials/welcome.html:8
+msgid "Welcome to our Urban Exploration community catalogue,"
+msgstr "Willkommen auf unserem Urban Exploration Community-Katalog,"
+
+#: templates/partials/welcome.html:12
+msgid "explorer"
+msgstr "Explorer"
+
+#: templates/partials/welcome.html:17
+msgid "We strictly follow our"
+msgstr "Bitte lies unseren"
+
+#: templates/partials/welcome.html:18
+msgid "UrBex codex"
+msgstr "UrBex Codex"
+
+#: templates/partials/welcome.html:19
+msgid "and expect you to do so, too."
+msgstr "bevor du Places erkundest"
+
+#: templates/photo_album/photo_album_create.html:4
+msgid "Submit a photo album"
+msgstr "Fotoalbum hinzufügen"
+
+#: templates/photo_album/photo_album_create.html:8
+#: templates/place/place_detail.html:18
+msgid "Edit place"
+msgstr "Place bearbeiten"
+
+#: templates/photo_album/photo_album_create.html:10
+#: templates/place/place_delete.html:11 templates/place/place_detail.html:19
+msgid "Delete place"
+msgstr "Place löschen"
+
+#: templates/photo_album/photo_album_create.html:16
+msgid "Submit a photo album for"
+msgstr "Fotoalbum hinzufügen zu"
+
+#: templates/place/place_create.html:42
+msgid "Create"
+msgstr "Erstellen"
+
+#: templates/place/place_delete.html:5
+msgid "Lost Place Deletion"
+msgstr "Lost Place löschen"
+
+#: templates/place/place_delete.html:15
+msgid "Are you sure you want to delete"
+msgstr "Willst Du den Ort wirklich löschen: "
+
+#: templates/place/place_delete.html:19
+msgid "Delete"
+msgstr "Löschen"
+
+#: templates/place/place_detail.html:46
+msgid "Map links"
+msgstr "Kartenlinks"
+
+#: templates/place/place_detail.html:58
+msgid "Photo albums"
+msgstr "Fotoalben"
+
+#: templates/place/place_detail.html:84
+msgid "Add photo album"
+msgstr "Fotoalbum hinzufügen"
+
+#: templates/place/place_detail.html:93
+msgid "Images"
+msgstr "Bilder"
+
+#: templates/place/place_list.html:10
+msgid "Lost Places"
+msgstr "Alle Places"
+
+#: templates/place/place_list.html:16
+msgid "Listing our places"
+msgstr "Unsere Lost Places"
+
+#: templates/place/place_update.html:5 templates/place/place_update.html:10
+msgid "Update place"
+msgstr "Place bearbeiten"
+
+#: templates/place/place_update.html:42
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: templates/place_image/place_image_create.html:7
+msgid "Submit images to a place"
+msgstr "Bilder zu einem Place hinzufügen"
+
+#: templates/registration/login.html:29
+msgid "Have No Account Yet?"
+msgstr "Noch kein Konto?"
+
+#: templates/signup.html:6
+msgid "Sign up"
+msgstr "Registrieren"
+
+#: views/base_views.py:25
+msgid "Please login to proceed"
+msgstr "Bitte log Dich ein um fortzufahren"
+
+#: views/place_image_views.py:26
+msgid "Image(s) submitted successfully"
+msgstr "Bild(er) erfolgreich hinzugefügt"
+
+#: views/place_image_views.py:41
+msgid "Image(s) deleted successfully"
+msgstr "Bild(er) erfolgreich gelöscht"
+
+#: views/place_image_views.py:42
+msgid "You are not allowed to delete this image"
+msgstr "Du darfst dieses Bild nicht löschen"
+
+#: views/place_views.py:62
+#, fuzzy
+#| msgid "Successfully deleted place"
+msgid "Successfully updated place"
+msgstr "Place erfolgreich gelöscht"
+
+#: views/place_views.py:63
+msgid "You do no have permissions to alter this place"
+msgstr "Du hast nicht die Berechtigung, diesen Place zu bearbeiten"
+
+#: views/place_views.py:97
+#, fuzzy
+#| msgid "Successfully deleted place"
+msgid "Successfully created place"
+msgstr "Place erfolgreich gelöscht"
+
+#: views/place_views.py:112
+msgid "Successfully deleted place"
+msgstr "Place erfolgreich gelöscht"
+
+#: views/place_views.py:114
+msgid "You do no have permission to delete this place"
+msgstr "Du hast nicht die Berechtigung, diesen Place zu löschen"
+
+#: views/views.py:29
+msgid "User created"
+msgstr "User erstellt"
+
+#: views/views.py:54
+msgid "Photo Album submitted"
+msgstr "Fotoalbum hinzugefügt"
+
+#: views/views.py:59
+msgid "Photo Album deleted"
+msgstr "Fotoalbum gelöscht"
+
+#: views/views.py:60
+msgid "You do not have permissions to alter this photo album"
+msgstr "Du hast nicht die Berechtigung, diesen Place zu bearbeiten"

django_lostplaces/lostplaces/migrations/0001_initial.py

@@ -0,0 +1,90 @@
+# Generated by Django 3.1.1 on 2020-09-28 18:39
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import easy_thumbnails.fields
+import lostplaces.models.place
+import taggit.managers
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('taggit', '0003_taggeditem_add_unique_index'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Expireable',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_when', models.DateTimeField(auto_now_add=True)),
+                ('expires_when', models.DateTimeField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Explorer',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='explorer', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Place',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+                ('latitude', models.FloatField(validators=[django.core.validators.MinValueValidator(-90), django.core.validators.MaxValueValidator(90)])),
+                ('longitude', models.FloatField(validators=[django.core.validators.MinValueValidator(-180), django.core.validators.MaxValueValidator(180)])),
+                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
+                ('location', models.CharField(max_length=50)),
+                ('description', models.TextField()),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to='lostplaces.explorer')),
+                ('tags', taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Voucher',
+            fields=[
+                ('expireable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='lostplaces.expireable')),
+                ('code', models.CharField(max_length=30, unique=True)),
+            ],
+            bases=('lostplaces.expireable',),
+        ),
+        migrations.CreateModel(
+            name='PlaceImage',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
+                ('description', models.TextField(blank=True)),
+                ('filename', easy_thumbnails.fields.ThumbnailerImageField(upload_to=lostplaces.models.place.generate_image_upload_path)),
+                ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='placeimages', to='lostplaces.place')),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='PhotoAlbum',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
+                ('url', models.URLField()),
+                ('label', models.CharField(max_length=100)),
+                ('place', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photoalbums', to='lostplaces.place')),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.1.1 on 2020-10-04 19:37
+# Edited by reverend
+
+import datetime
+from django.db import migrations, models
+import django.utils.timezone
+from django.utils.timezone import utc
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Voucher'
+        ),
+        migrations.DeleteModel(
+            name='Expireable'
+        )
+    ]

django_lostplaces/lostplaces/migrations/0003_voucher.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.1.1 on 2020-10-04 19:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces', '0002_remove_vouchers'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Voucher',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_when', models.DateTimeField(auto_now_add=True)),
+                ('expires_when', models.DateTimeField()),
+                ('code', models.CharField(max_length=30, unique=True)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

django_lostplaces/lostplaces/models.py

@@ -1,242 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-'''
-(Data)models which describe the structure of data to be saved into 
-database.
-'''
-
-import os
-import uuid
-
-from django.urls import reverse
-from django.db import models
-from django.contrib.auth.models import User
-from django.db.models.signals import post_save
-from django.dispatch import receiver
-from django.core.validators import MaxValueValidator, MinValueValidator
-from django.utils import timezone
-from easy_thumbnails.fields import ThumbnailerImageField
-from easy_thumbnails.files import get_thumbnailer
-from taggit.managers import TaggableManager
-
-# Create your models here.
-
-class Explorer(models.Model):
-    """
-    Profile that is linked to the a User.
-    Every user has a profile.
-    """
-    
-    user = models.OneToOneField(
-        User,
-        on_delete=models.CASCADE,
-        related_name='explorer'
-    )
-
-    def __str__(self):
-        return self.user.username
-        
-@receiver(post_save, sender=User)
-def create_user_profile(sender, instance, created, **kwargs):
-    if created:
-        Explorer.objects.create(user=instance)
-
-@receiver(post_save, sender=User)
-def save_user_profile(sender, instance, **kwargs):
-    instance.explorer.save()
-
-class Taggable(models.Model):
-    '''
-    This abstract model represtens an object that is taggable
-    using django-taggit
-    '''
-    class Meta:
-        abstract = True
-        
-    tags = TaggableManager(blank=True)
-    
-class Mapable(models.Model):
-    '''
-    This abstract model class represents an object that can be
-    displayed on a map.
-    '''
-    class Meta:
-        abstract = True
-        
-    name = models.CharField(max_length=50)
-    latitude = models.FloatField(
-        validators=[
-            MinValueValidator(-90),
-            MaxValueValidator(90)
-        ]
-    )
-    longitude = models.FloatField(
-        validators=[
-            MinValueValidator(-180),
-            MaxValueValidator(180)
-        ]
-    )
-
-class Submittable(models.Model):
-    '''
-    This abstract model class represents an object that can be submitted by
-    an explorer.
-    '''
-    class Meta:
-        abstract = True
-
-    submitted_when = models.DateTimeField(auto_now_add=True, null=True)
-    submitted_by = models.ForeignKey(
-        Explorer,
-        on_delete=models.SET_NULL,
-        null=True,
-        blank=True,
-        related_name='%(class)s'
-    )
-
-class Voucher(models.Model):
-    """
-    Vouchers are authorization tokens to allow the registration of new users.
-    A voucher has a code, a creation and a deletion date, which are all 
-    positional. Creation date is being set automatically during voucher 
-    creation. 
-    """
-
-    code = models.CharField(unique=True, max_length=30)
-    created_when = models.DateTimeField(auto_now_add=True)
-    expires_when = models.DateTimeField()
-
-    @property
-    def valid(self):
-        return timezone.now() <= self.expires_when
-
-    def __str__(self):
-        return "Voucher " + str(self.pk)
-
-
-class Place(Submittable, Taggable, Mapable):
-    """
-    Place defines a lost place (location, name, description etc.).
-    """
-
-    location = models.CharField(max_length=50)
-    description = models.TextField()
-
-    def get_absolute_url(self):
-        return reverse('place_detail', kwargs={'pk': self.pk})
-    
-
-    @classmethod
-    # Get center position of LP-geocoordinates.
-    def average_latlon(cls, place_list):
-        amount = len(place_list)
-        # Init fill values to prevent None
-        longitude = 0
-        latitude = 0
-
-        if amount > 0:
-            for place in place_list:
-                longitude += place.longitude
-                latitude += place.latitude
-            return {'latitude':latitude / amount, 'longitude': longitude / amount}
-
-        return {'latitude': latitude, 'longitude': longitude}
-
-    def __str__(self):
-        return self.name
-
-
-def generate_image_upload_path(instance, filename):
-    """
-    Callback for generating path for uploaded images.
-    Returns filename as: place_pk-placename{-rnd_string}.jpg
-    """
-
-    return 'places/' + str(instance.place.pk) + '-' + str(instance.place.name) + '.' + filename.split('.')[-1]
-
-
-class PlaceImage (Submittable):
-    """
-    PlaceImage defines an image file object that points to a file in uploads/.
-    Intermediate image sizes are generated as defined in THUMBNAIL_ALIASES.
-    PlaceImage references a Place to which it belongs.
-    """
-
-    description = models.TextField(blank=True)
-    filename = ThumbnailerImageField(
-        upload_to=generate_image_upload_path, 
-        resize_source=dict(size=(2560, 2560), 
-        sharpen=True)
-    )
-    place = models.ForeignKey(
-        Place,
-        on_delete=models.CASCADE,
-        related_name='placeimages'
-    )
-    
-    def __str__(self):
-        """
-        Returning the name of the corresponding place + id 
-        of this image as textual representation of this instance
-        """
-
-        return 'Image ' + str(self.pk)
-
-
-# These two auto-delete files from filesystem when they are unneeded:
-
-@receiver(models.signals.post_delete, sender=PlaceImage)
-def auto_delete_file_on_delete(sender, instance, **kwargs):
-    """
-    Deletes file (including thumbnails) from filesystem
-    when corresponding `PlaceImage` object is deleted.
-    """
-    if instance.filename:
-        # Get and delete all files and thumbnails from instance
-        thumbmanager = get_thumbnailer(instance.filename)
-        thumbmanager.delete(save=False)
-
-
-@receiver(models.signals.pre_save, sender=PlaceImage)
-def auto_delete_file_on_change(sender, instance, **kwargs):
-    """
-    Deletes old file from filesystem
-    when corresponding `PlaceImage` object is updated
-    with new file.
-    """
-    if not instance.pk:
-        return False
-
-    try:
-        old_file = PlaceImage.objects.get(pk=instance.pk).filename
-    except PlaceImage.DoesNotExist:
-        return False
-
-    # No need to delete thumbnails, as they will be overwritten on regeneration.
-    new_file = instance.filename
-    if not old_file == new_file:
-        if os.path.isfile(old_file.path):
-            os.remove(old_file.path)
-
-
-class ExternalLink(models.Model):
-    url = models.URLField(max_length=200)
-    label = models.CharField(max_length=100)
-    submitted_by = models.ForeignKey(
-        Explorer,
-        on_delete=models.SET_NULL,
-        null=True,
-        blank=True,
-        related_name='external_links'
-    )
-    submitted_when = models.DateTimeField(auto_now_add=True, null=True)
-
-
-class PhotoAlbum(ExternalLink):
-    place = models.ForeignKey(
-        Place,
-        on_delete=models.CASCADE,
-        related_name='photo_albums',
-        null=True
-    )

django_lostplaces/lostplaces/models/__init__.py

@@ -0,0 +1,4 @@
+from lostplaces.models.abstract_models import *
+from lostplaces.models.place import *
+from lostplaces.models.external_links import *
+from lostplaces.models.models import *

django_lostplaces/lostplaces/models/abstract_models.py

@@ -0,0 +1,77 @@
+
+from django.utils import timezone
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+from django.core.validators import MaxValueValidator, MinValueValidator
+
+from taggit.managers import TaggableManager
+
+class Taggable(models.Model):
+    '''
+    This abstract model represtens an object that is taggable
+    using django-taggit
+    '''
+    class Meta:
+        abstract = True
+        
+    tags = TaggableManager(blank=True)
+    
+class Mapable(models.Model):
+    '''
+    This abstract model class represents an object that can be
+    displayed on a map.
+    '''
+    class Meta:
+        abstract = True
+        
+    name = models.CharField(
+        max_length=50,
+        verbose_name=_('Name'),
+    )
+    latitude = models.FloatField(
+        validators=[
+            MinValueValidator(-90),
+            MaxValueValidator(90)
+        ],
+        verbose_name=_('Latitude'),
+        help_text=_('Latitude in decimal format: e. g. 41.40338')
+    )
+    longitude = models.FloatField(
+        validators=[
+            MinValueValidator(-180),
+            MaxValueValidator(180)
+        ],
+        verbose_name=_('Longitude'),
+        help_text=_('Longitude in decimal format: e. g. 2.17403')
+    )
+
+class Submittable(models.Model):
+    '''
+    This abstract model class represents an object that can be submitted by
+    an explorer.
+    '''
+    class Meta:
+        abstract = True
+
+    submitted_when = models.DateTimeField(auto_now_add=True, null=True)
+    submitted_by = models.ForeignKey(
+        'Explorer',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='%(class)ss'
+    )
+
+class Expireable(models.Model):
+    """
+    Base class for things that can expire, i.e. Vouchers
+    """
+    class Meta:
+	    abstract = True
+        
+    created_when = models.DateTimeField(auto_now_add=True)
+    expires_when = models.DateTimeField()
+    
+    @property
+    def is_expired(self):
+        return timezone.now() > self.expires_when

django_lostplaces/lostplaces/models/external_links.py

@@ -0,0 +1,21 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+from lostplaces.models.place import PlaceAsset
+
+class ExternalLink(PlaceAsset):
+    
+    class Meta:
+        abstract = True
+
+    url = models.URLField(
+        max_length=200,
+        verbose_name=_('URL')
+    )
+    label = models.CharField(
+        max_length=100,
+        verbose_name=_('link text')
+    )
+
+class PhotoAlbum(ExternalLink):
+    pass

django_lostplaces/lostplaces/models/models.py

@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+'''
+(Data)models which describe the structure of data to be saved into 
+database.
+'''
+
+import uuid
+
+from django.db import models
+from django.contrib.auth.models import User
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from lostplaces.models.abstract_models import Expireable
+
+class Explorer(models.Model):
+    """
+    Profile that is linked to the a User.
+    Every user has a profile.
+    """
+    
+    user = models.OneToOneField(
+        User,
+        on_delete=models.CASCADE,
+        related_name='explorer'
+    )
+
+    def __str__(self):
+        return self.user.username
+        
+@receiver(post_save, sender=User)
+def create_user_profile(sender, instance, created, **kwargs):
+    if created:
+        Explorer.objects.create(user=instance)
+
+@receiver(post_save, sender=User)
+def save_user_profile(sender, instance, **kwargs):
+    instance.explorer.save()
+
+class Voucher(Expireable):
+    """
+    Vouchers are authorization to    created_when = models.DateTimeField(auto_now_add=True)
+    expires_when = models.DateTimeField()kens to allow the registration of new users.
+    A voucher has a code, a creation and a deletion date, which are all 
+    positional. Creation date is being set automatically during voucher 
+    creation. 
+    """
+
+    code = models.CharField(unique=True, max_length=30)
+    
+    @property
+    def valid(self):
+        return not self.is_expired
+
+    def __str__(self):
+        return "Voucher " + str(self.code)
+

django_lostplaces/lostplaces/models/place.py

@@ -0,0 +1,141 @@
+import os
+
+from django.db import models
+from django.urls import reverse
+from django.dispatch import receiver
+from django.db.models.signals import post_delete, pre_save
+from django.utils.translation import ugettext_lazy as _
+
+from lostplaces.models.abstract_models import Submittable, Taggable, Mapable
+
+from easy_thumbnails.fields import ThumbnailerImageField
+from easy_thumbnails.files import get_thumbnailer
+
+class Place(Submittable, Taggable, Mapable):
+    """
+    Place defines a lost place (location, name, description etc.).
+    """
+
+    location = models.CharField(
+        max_length=50,
+        verbose_name=_('Location'),
+    )
+    description = models.TextField(
+        help_text=_('Description of the place: e.g. how to get there, where to be careful, the place\'s history...'),
+        verbose_name=_('Description'),
+    )
+
+    def get_absolute_url(self):
+        return reverse('place_detail', kwargs={'pk': self.pk})
+    
+
+    @classmethod
+    # Get center position of LP-geocoordinates.
+    def average_latlon(cls, place_list):
+        amount = len(place_list)
+        # Init fill values to prevent None
+        longitude = 0
+        latitude = 0
+
+        if amount > 0:
+            for place in place_list:
+                longitude += place.longitude
+                latitude += place.latitude
+            return {'latitude':latitude / amount, 'longitude': longitude / amount}
+
+        return {'latitude': latitude, 'longitude': longitude}
+
+    def __str__(self):
+        return self.name
+
+
+def generate_image_upload_path(instance, filename):
+    """
+    Callback for generating path for uploaded images.
+    Returns filename as: place_pk-placename{-rnd_string}.jpg
+    """
+
+    return 'places/' + str(instance.place.pk) + '-' + str(instance.place.name) + '.' + filename.split('.')[-1]
+
+class PlaceAsset(Submittable):
+    """
+    Assets to a place, i.e. images
+    """
+
+    class Meta:
+            abstract = True
+
+    place = models.ForeignKey(
+        Place,
+        on_delete=models.CASCADE,
+        related_name='%(class)ss',
+        null=True
+    )
+
+class PlaceImage (Submittable):
+    """
+    PlaceImage defines an image file object that points to a file in uploads/.
+    Intermediate image sizes are generated as defined in THUMBNAIL_ALIASES.
+    PlaceImage references a Place to which it belongs.
+    """
+
+    description = models.TextField(
+        blank=True,
+        verbose_name=_('Description'),
+    )
+    filename = ThumbnailerImageField(
+        upload_to=generate_image_upload_path, 
+        resize_source=dict(size=(2560, 2560), 
+        sharpen=True),
+        verbose_name=_('Filename(s)'),
+        help_text=_('Optional: One or more images to upload')
+    )
+    place = models.ForeignKey(
+        Place,
+        on_delete=models.CASCADE,
+        related_name='placeimages'
+    )
+    
+    def __str__(self):
+        """
+        Returning the name of the corresponding place + id 
+        of this image as textual representation of this instance
+        """
+
+        return 'Image ' + str(self.pk)
+
+
+# These two auto-delete files from filesystem when they are unneeded:
+
+@receiver(post_delete, sender=PlaceImage)
+def auto_delete_file_on_delete(sender, instance, **kwargs):
+    """
+    Deletes file (including thumbnails) from filesystem
+    when corresponding `PlaceImage` object is deleted.
+    """
+    if instance.filename:
+        # Get and delete all files and thumbnails from instance
+        thumbmanager = get_thumbnailer(instance.filename)
+        thumbmanager.delete(save=False)
+
+
+@receiver(pre_save, sender=PlaceImage)
+def auto_delete_file_on_change(sender, instance, **kwargs):
+    """
+    Deletes old file from filesystem
+    when corresponding `PlaceImage` object is updated
+    with new file.
+    """
+    if not instance.pk:
+        return False
+
+    try:
+        old_file = PlaceImage.objects.get(pk=instance.pk).filename
+    except PlaceImage.DoesNotExist:
+        return False
+
+    # No need to delete thumbnails, as they will be overwritten on regeneration.
+    new_file = instance.filename
+    if not old_file == new_file:
+        if os.path.isfile(old_file.path):
+            os.remove(old_file.path)

django_lostplaces/lostplaces/static/fonts/Crimson/OFL.txt

@@ -1,5 +1,4 @@
-Copyright (c) 2010, Sebastian Kosch (sebastian@aldusleaf.org),
-with Reserved Font Name "Crimson" and "Crimson Text".
+Copyright 2018 The Crimson Pro Project Authors (https://github.com/Fonthausen/CrimsonPro)
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:

django_lostplaces/lostplaces/static/fonts/Montserrat/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

django_lostplaces/lostplaces/static/main.css

@@ -424,46 +424,46 @@
   object-position: center; }
 
 @font-face {
-  font-family: 'Crimson Text';
+  font-family: 'Crimson Pro';
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: local("Crimson Text Regular"), local("CrimsonText-Regular"), url(fonts/Crimson/CrimsonText-Regular.ttf) format("truetype"); }
+  src: local("Crimson Pro Regular"), local("CrimsonPro-Regular"), url(fonts/Crimson/CrimsonPro-Regular.ttf) format("truetype"); }
 
 @font-face {
-  font-family: 'Crimson Text';
+  font-family: 'Crimson Pro';
   font-style: italic;
   font-weight: 400;
   font-display: swap;
-  src: local("Crimson Text Italic"), local("CrimsonText-Italic"), url(fonts/Crimson/CrimsonText-Italic.ttf) format("truetype"); }
+  src: local("Crimson Pro Italic"), local("CrimsonPro-Italic"), url(fonts/Crimson/CrimsonPro-Italic.ttf) format("truetype"); }
 
 @font-face {
-  font-family: 'Crimson Text';
+  font-family: 'Crimson Pro';
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: local("Crimson Text Bold"), local("CrimsonText-Bold"), url(fonts/Crimson/CrimsonText-Bold.ttf) format("truetype"); }
+  src: local("Crimson Pro Bold"), local("CrimsonPro-Bold"), url(fonts/Crimson/CrimsonPro-Bold.ttf) format("truetype"); }
 
 @font-face {
   font-family: 'Montserrat';
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: local("Montserrat Regular"), local("Montserrat-Regular"), url(fonts/Montserrat/Montserrat-Regular.ttf) format("truetype"); }
+  src: local("Montserrat Regular"), local("Montserrat-Regular"), url(fonts/Montserrat/Montserrat-Regular.woff2) format("woff2"); }
 
 @font-face {
   font-family: 'Montserrat';
   font-style: italic;
   font-weight: 400;
   font-display: swap;
-  src: local("Montserrat Italic"), local("Montserrat-Italic"), url(fonts/Montserrat/Montserrat-Italic.ttf) format("truetype"); }
+  src: local("Montserrat Italic"), local("Montserrat-Italic"), url(fonts/Montserrat/Montserrat-Italic.woff2) format("woff2"); }
 
 @font-face {
   font-family: 'Montserrat';
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: local("Montserrat Bold"), local("Montserrat-Bold"), url(fonts/Montserrat/Montserrat-Bold.ttf) format("truetype"); }
+  src: local("Montserrat Bold"), local("Montserrat-Bold"), url(fonts/Montserrat/Montserrat-Bold.woff2) format("woff2"); }
 
 html {
   height: 100%;
@@ -583,7 +583,7 @@ body {
 
 .LP-Paragraph {
   color: black;
-  font-family: "Crimson Text", Times, serif;
+  font-family: "Crimson Pro", Times, serif;
   font-size: 1.4rem;
   padding: 0;
   margin: 0;
@@ -856,7 +856,7 @@ body {
     padding: 15px; } }
 
 .LP-TextSection__Text {
-  font-family: "Crimson Text", Times, serif;
+  font-family: "Crimson Pro", Times, serif;
   font-size: 1.4rem; }
   .LP-TextSection__Text .LP-Link {
     margin: 0 3px; }
@@ -1588,23 +1588,78 @@ body {
     border: none; }
   .LP-ImageGrid__Container {
     gap: 10px; }
-  .LP-ImageGrid .LP-ImageGrid__Item, .LP-ImageGrid .LP-ImageGrid__Item * {
-    overflow: hidden;
-    word-break: break-all; }
-  .LP-ImageGrid .LP-ImageGrid__Item img {
-    width: 100%;
-    height: 100%;
-    object-fit: cover; }
-  .LP-ImageGrid .LP-ImageGrid__Item--left img {
-    object-position: left; }
-  .LP-ImageGrid .LP-ImageGrid__Item--center img {
-    object-position: center; }
-  .LP-ImageGrid .LP-ImageGrid__Item--top img {
-    object-position: top; }
-  .LP-ImageGrid .LP-ImageGrid__Item--bottom img {
-    object-position: botom; }
-  .LP-ImageGrid .LP-ImageGrid__Item--center img {
-    object-position: center; }
+  .LP-ImageGrid__Item {
+    position: relative; }
+    .LP-ImageGrid__Item, .LP-ImageGrid__Item * {
+      overflow: hidden;
+      word-break: break-all; }
+    .LP-ImageGrid__Item img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover; }
+    .LP-ImageGrid__Item--left img {
+      object-position: left; }
+    .LP-ImageGrid__Item--center img {
+      object-position: center; }
+    .LP-ImageGrid__Item--top img {
+      object-position: top; }
+    .LP-ImageGrid__Item--bottom img {
+      object-position: botom; }
+    .LP-ImageGrid__Item--center img {
+      object-position: center; }
+    .LP-ImageGrid__Item--add .LP-Link {
+      width: 100%;
+      height: 100%;
+      position: relative;
+      display: block;
+      background: #f9f9f9; }
+      .LP-ImageGrid__Item--add .LP-Link .LP-Icon {
+        width: 35px;
+        height: 35px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%); }
+    .LP-ImageGrid__Item--add:hover .LP-Link {
+      background-color: #D7CEC7; }
+  .LP-ImageGrid__DeleteItem {
+    opacity: 0.7;
+    visibility: hidden;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    background-color: #C09F80;
+    border-radius: 50%;
+    height: 35px;
+    width: 35px; }
+    .LP-ImageGrid__DeleteItem .LP-Link .LP-Icon {
+      height: 20px;
+      width: 20px;
+      position: relative;
+      left: 7.8125px;
+      top: 7.8125px; }
+  .LP-ImageGrid__Item > .LP-Link:hover + .LP-ImageGrid__DeleteItem, .LP-ImageGrid__DeleteItem:hover {
+    visibility: visible; }
+
+.LP-Map {
+  margin-bottom: 25px; }
+  .LP-Map .ol-attribution {
+    font-family: "Montserrat", Helvetica, sans-serif;
+    color: #565656; }
+    .LP-Map .ol-attribution a {
+      color: #C09F80; }
+      .LP-Map .ol-attribution a:hover, .LP-Map .ol-attribution a:focus {
+        color: #D7CEC7; }
+  .LP-Map .ol-zoom-in, .LP-Map .ol-zoom-out {
+    background-color: #C09F80; }
+    .LP-Map .ol-zoom-in:hover, .LP-Map .ol-zoom-in:focus, .LP-Map .ol-zoom-out:hover, .LP-Map .ol-zoom-out:focus {
+      background-color: #565656; }
+  .LP-Map .LP-Map__Popup {
+    font-family: "Montserrat", Helvetica, sans-serif;
+    color: #565656;
+    background-color: #f9f9f9;
+    padding: .5em;
+    border-radius: 2px; }
 
 .LP-MainContainer {
   margin: 0 auto;
@@ -1642,7 +1697,7 @@ body {
     margin-bottom: 25px; } }
 
 .LP-TextSection .LP-UnorderedList {
-  font-family: "Crimson Text", Times, serif;
+  font-family: "Crimson Pro", Times, serif;
   font-size: 1.4rem; }
   .LP-TextSection .LP-UnorderedList li {
     margin-bottom: 0.75em;

django_lostplaces/lostplaces/static/maps/source_files_tmp.txt

@@ -1,5 +0,0 @@
-# Keeping these files up-to-date is something for CI / release management.
-# But for now I noted the source urls down here for later reference.
-# now: 6.4.3
-
-https://github.com/openlayers/openlayers/releases/download/v6.4.3/v6.4.3-dist.zip

django_lostplaces/lostplaces/templates/403.html

@@ -1,6 +1,7 @@
 {% extends 'global.html'%}
+{% load i18n %}
 
-{% block title %}Forbidden{% endblock %}
+{% block title %}{% trans 'Forbidden' %}{% endblock %}
 
 {% block additional_head %}
 {% if request.META.HTTP_REFERER %}
@@ -10,6 +11,6 @@
 
 {% block maincontent %}
 {% if request.META.HTTP_REFERER %}
-    <p class="LP-Headline">You will be redirected in 5 seconds</p><p class="LP-Headline"><a href="{{ request.META.HTTP_REFERER }}" class="LP-Link">Go Back</a></p>
+    <p class="LP-Headline">{% trans 'You will be redirected in 5 seconds' %}</p><p class="LP-Headline"><a href="{{ request.META.HTTP_REFERER }}" class="LP-Link">{% trans 'Go Back' %}</a></p>
 {% endif %}
 {% endblock maincontent %}

django_lostplaces/lostplaces/templates/flat/codex-de.html

@@ -0,0 +1,52 @@
+{% extends 'global.html'%}
+
+# {% block title %}UrBex Codex{% endblock %}
+
+{% block maincontent %}
+
+<header class="LP-TextSection__Headline">
+    <h1 class="LP-Headline">Nimm nichts mit - außer Deinen Bildern. Laß nichts da - außer Deinen Fußspuren!</h1>
+</header>
+
+<article class="LP-TextSection LP-TextSection__Text">
+
+    <p>Das sollte doch eigentlich eindeutig sein, oder? Aber wie wir alle wissen, hat jedes Schild eine Geschichte. Wir haben zu viel sinnlose Zerstörung gesehen, sodass wir uns dazu entschieden haben, einen grundlegenden Urban Exploration Codex niederzuschreiben.</p>
+    <ul class="LP-UnorderedList">
+        <li>
+            <b>Wir respektieren fremdes Eigentum</b>, so wie wir das von anderen auch verlangen. Deswegen öffnen wir keinen Zugang gewaltsam, oder beschädigen eine Verschlusseinrichtung. Wir betreten ein Grundstück oder ein Gebäude / eine Anlage / eine Ruine nur dann, wenn wir davon ausgehen können, nicht gegen den Willen des Eigentümers dort zu sein. Eine gut erhaltene Umzäunung, oder ein ständiger Wachschutz sprechen dafür, dass der Eigentümer sich noch mit seiner Anlage befasst. Längst umgesunkene Zäune, Ruinen im letzten Stadium eines Verfalls sprecher dafür, dass dem Eigentümer das eher Wurst ist.
+        </li>
+        <li>
+            <b>Wir nehmen von einer Location nichts mit</b>, auch keine "kleinen Andenken", und lassen nichts da - auch keine Kippen, keine Verpackungen - nichts.
+            <b>Wir verändern am Ort nichts, nehmen nichts weg und fügen nichts hinzu.</b>
+        </li>
+        <li>
+            <b>Wir rauchen möglichst nicht.</b> Nicht nur, weil es stinkt und Müll verursacht. Es gibt immer die Chance, irgendwas durch Funkenflug anzuzünden. Lass es trockene Blätter an einem heißen Sommertag oder (potentielle) entflammbare Materialien in Industrieanlagen sein.
+        </li>
+        <li>    
+            <b>Sprayen ist ein absolutes "no-go"!</b>
+        </li>
+        <li>    
+            <b>In einer Location verhalten wir uns vorsichtig.</b> Wir werfen nichts in Löcher oder aus Fenstern und berühren auch keine elektrischen Anlagen. Nicht immer ist der Strom wirklich abgeschaltet. Deswegen öffnen wor auch keine Flaschen und andere Behälter. Wir gehen niemals ohne Licht in einen dunklen Raum, und nehmen immer eine Reservelampe mit. 
+        </li>
+        <li>    
+            <b>Wir sagen vor einer Tour mindestens einer Person unseres Vertrauens, wo wir sind</b> (Koordinaten!), wie lange wir uns dort aufhalten werden und was wir dort tun. Wir verabreden, daß wir uns bei einem längeren Aufenthalt dort regelmäßig melden, oder aber ein "okay" geben, wenn wir die Location wieder verlassen haben. Wenn wir uns verspäten, dann denken wir daran, eine entsprechende Nachricht abzusetzen. Unsere Kontaktperson soll nach einer gewissen Zeit, wenn sie nichts von mir hört, für Hilfe sorgen.
+        </li>
+        <li>
+            <b>Wir bereiten unsere Tour sorgfältig vor.</b> Es ist ärgerlich, wenn die Kamera-Akkus nicht geladen sind - aber gefährlich ist es keineswegs. Es ist aber lebensgefährlich, wenn ein verschmutzter Nagel durch eine Sohle getreten wird. Sicherheitsschuhe zu tragen ist eine gute Idee. Wenn wir unter Tage gehen, nehmen wir angemessenes Equipment mit um uns zu schützen — z. B. einen Gaswarner oder vllt. sogar einen Geigerzähler.
+        </li>
+        <li>
+            <b>Wir parken nicht so, daß Dritte auf unser Vorhaben aufmerksam werden.</b> Unser Hobby braucht keine öffentliche Aufmerksamkeit, die sich auf illegales Betreten von Grundstücken richtet (und illegal dürfte das Betreten ja meist sein ...).
+        </li>
+        <li>
+            <b>Wir verraten unsere Locations nicht</b> und veröffentlichen ausschließlich Fotos, bei denen Geodaten aus den Dateien (EXIF) entfernt worden sind. Deswegen posten wir unterwegs nur dann vom Smartphone, wenn wir absolut sicher sind, dass keine Koordinaten im Bild enthalten sind.
+        </li>
+        <li>
+            <b>Vor allem halten wir die Klappe</b> und geben nicht mit einer tollen, noch unberührt aussehenden Location an. Deine "Freunde" in Facebook kennst Du oft nicht mal persönlich, schon gar nicht in einer Gruppe. Nichts verbreitet sich schneller als ein "Geheimnis", das unter dem Siegel des Vertrauens weitergegeben wurde. Willst Du daran schuld sein, daß hirnbefreite Sprayer auch diesen Ort demolieren?
+        </li>
+        <li>
+            <b>Wir sorgen durch Argumente und Überzeugung dafür, daß unsere Begleiter sich ebenso verhalten!</b> In erster Linie versuchen wir durch unser eigenes Verhalten zu überzeugen.
+        </li>
+    </ul>
+</article>
+
+{% endblock maincontent %}

django_lostplaces/lostplaces/templates/flat/codex.html

@@ -29,22 +29,22 @@
             <b>In a location we are careful not to endanger ourselves or others.</b> We don't throw anything into holes or out of windows, and we don't touch electrical equipment. You can't tell from its look or sound if the power is really switched off. Therefore we do not open bottles and other containers. We never go into a dark room without light, and always have a spare lamp with us.
         </li>
         <li>    
-            <b>Before my tour we tell at least one person of my trust where we are</b> (coordinates!), how long we will be there and what we will do there. We arrange that we will contact him regularly if we stay there for a longer period of time, or give an "okay" when we have left the location again. If we am late, we will remember to send a message to that effect. Our contact person is supposed to provide help after a certain period of time if he does not hear from me.
+            <b>Before our tour we tell at least one person of our trust where we are</b> (coordinates!), how long we will be there and what we will do there. We arrange that we will contact him regularly if we stay there for a longer period of time, or give an "okay" when we have left the location again. If we am late, we will remember to send a message to that effect. Our contact person is supposed to provide help after a certain period of time if he does not hear from me.
         </li>
         <li>
-            <b>We prepare my tour carefully.</b> It is annoying when the camera batteries are not charged — but it is not dangerous at all. But it is life-threatening if you step unto a dirty nail that perforates your shoe. It is wise to wear sturdy shoes. When we go underground, we take appropiate equipment with us to protect ourselves — e. g. a gas warner or even a geiger counter.
+            <b>We prepare out tour carefully.</b> It is annoying when the camera batteries are not charged — but it is not dangerous at all. But it is life-threatening if you step unto a dirty nail that perforates your shoe. It is wise to wear sturdy shoes. When we go underground, we take appropiate equipment with us to protect ourselves — e. g. a gas warner or even a geiger counter.
         </li>
         <li>
-            <b>We do not park in such a way that third parties become aware of my intention.</b> Our hobby does not need public attention, which is directed to illegal entering of properties (and illegal entering is probably the most common way ...).
+            <b>We do not park in such a way that third parties become aware of our intention.</b> Our hobby does not need public attention, which is directed to illegal entering of properties (and illegal entering is probably the most common way ...).
         </li>
         <li>
-            <b>We do not disclose our locations</b> and only publish photos where geodata has been removed from the files (EXIF). Therefore we only post from my smartphone when we am absolutely sure that no coordinates are contained in the picture.
+            <b>We do not disclose our locations</b> and only publish photos where geodata has been removed from the files (EXIF). Therefore we only post from our smartphone when we am absolutely sure that no coordinates are contained in the picture.
         </li>
         <li>
-            <b>Above all, we keep my mouth shut</b> and don't brag about a great, still untouched looking location. You often don't even know your "friends" in Facebook personally, especially not in a group. Nothing spreads faster than a "secret" that has been passed on under the seal of trust. Do you want to be responsible for brainless sprayers destroying this place too?
+            <b>Above all, we keep our mouth shut</b> and don't brag about a great, still untouched looking location. You often don't even know your "friends" in Facebook personally, especially not in a group. Nothing spreads faster than a "secret" that has been passed on under the seal of trust. Do you want to be responsible for brainless sprayers destroying this place too?
         </li>
         <li>
-            <b>We make sure through argument and conviction that my companions behave the same way!</b> First and foremost we try to convince through our own behavior.
+            <b>We make sure through argument and conviction that our companions behave the same way!</b> First and foremost we try to convince through our own behavior.
         </li>
     </ul>
 </article>

django_lostplaces/lostplaces/templates/global.html

@@ -1,4 +1,5 @@
 {% load static %}
+{% load i18n %}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -28,15 +29,15 @@
                 <span class="LP-Paragraph">
                     {% if user.is_authenticated %}
                     Hi {{ user.username }}!
-                    <a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">logout</span></a>
+                    <a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">{% trans 'Logout' %}</span></a>
                     {% if user.is_superuser %}
-                    <a class="LP-Link" href="{% url 'admin:index' %}" target="_blank"><span class="LP-Link__Text">admin</span></a>
+                    <a class="LP-Link" href="{% url 'admin:index' %}" target="_blank"><span class="LP-Link__Text">{% trans 'Admin' %}</span></a>
                     {% endif %}
 
                     {% else %}
                     You are not logged in.
-                    <a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">login</span></a> |
-                    <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">signup</span></a>
+                    <a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">{% trans 'Login' %}</span></a> |
+                    <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign Up' %}</span></a>
                     {% endif %}
                 </span>
             </div>
@@ -46,14 +47,14 @@
         <aside class="LP-Main__Sidebar">
             <nav class="LP-Menu LP-Menu--sidebar">
                 <ul class="LP-Menu__List">
-                    <li class="LP-Menu__Item"><a href="{% url 'lostplaces_home' %}" class="LP-Link"><span class="LP-Link__Text">Home</span></a></li>
-                    <li class="LP-Menu__Item"><a href="{% url 'flatpage' slug='codex' %}" class="LP-Link"><span class="LP-Link__Text">UrBex codex</span></a></li>
+                    <li class="LP-Menu__Item"><a href="{% url 'lostplaces_home' %}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Home' %}</span></a></li>
+                    <li class="LP-Menu__Item"><a href="{% url 'flatpage' slug='codex' %}" class="LP-Link"><span class="LP-Link__Text">{% trans 'UrBex Codex' %}</span></a></li>
 
                     {% block additional_menu_items %}
                     {% endblock additional_menu_items %}
 
-                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_create'%}" class="LP-Link"><span class="LP-Link__Text">Create place</span></a></li>
-                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_list'%}" class="LP-Link"><span class="LP-Link__Text">See all places</span></a></li>
+                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_create'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Create Place' %}</span></a></li>
+                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_list'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'All Places' %}</span></a></li>
                 </ul>
             </nav>
         </aside>

django_lostplaces/lostplaces/templates/home.html

@@ -1,12 +1,13 @@
 {% extends 'global.html'%}
 
 {% load static %}
+{% load i18n %}
 {% block additional_head %}
 <link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
 <script src="{% static 'maps/ol.js' %}"></script>
 {% endblock additional_head %}
 
-# {% block title %}Start{% endblock %}
+# {% block title %}{% trans 'Home' %}{% endblock %}
 
 {% block maincontent %}
 
@@ -16,7 +17,7 @@
 
 {% include 'partials/osm_map.html' with config=mapping_config %}
 <div class="LP-PlaceGrid">
-    <h1 class="LP-Headline LP-Headline">Explore the latest locations</h1>
+    <h1 class="LP-Headline LP-Headline">{% trans 'Explore the latest places' %}</h1>
     <ul class="LP-PlaceGrid__Grid">
         {% for place in place_list %}
         <li class="LP-PlaceGrid__Item">

django_lostplaces/lostplaces/templates/home_unauth.html

@@ -1,4 +1,5 @@
 {% extends 'global.html'%}
+{% load i18n %}
 
 # {% block title %}Start{% endblock %}
 
@@ -7,27 +8,16 @@
 {% include 'partials/welcome.html' %}
 <article class="LP-TextSection">
     <p class="LP-Paragraph">
-        You can create, view and share your favorite lost places with other
-        members of this site. You can upload photos, place links to your 
-        web galleries and contribute your knowledge by tagging other places or
-        commenting on them. You will find detailed information on where these
-        locations are, how to get there and what to expect from them. This might
-        even include detailed information on the surroundings or the history
-        of a lost place.
+        {% blocktrans %}You can create, view and share your lost places with other members of this site. You can upload photos, place links to your web galleries and contribute your knowledge by tagging other places or commenting on them. You will find detailed information on where these locations are, how to get there and what to expect from them. This might even include detailed information on the surroundings or the history of a lost place.{% endblocktrans %}
     </p>
+    {% url 'signup' as signup_url %}
     <p class="LP-Paragraph">
-        Since vandalism is a growing problem these days, no sensitive
-        information is available to the public. You have to 
-        <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">sign up</span></a> 
-        with a voucher code as an invitation to join this community. Only admins
-        can create these codes. Usually you are given a code when we know you
-        in real life in person. A request from an unknown person will most
-        probably be denied.
+        {% blocktrans %}Since vandalism is a growing problem these days, no sensitive information is available to the public. You have to <a class="LP-Link" href="{{signup_url}}"><span class="LP-Link__Text">sign up</span></a> with a voucher code as an invitation to join this community. Only admins can create these codes. Usually you are given a code when we know you in real life in person and when we trust you. A request from an unknown person will most probably be denied.{% endblocktrans %}
     </p>
 </article>
 
 <div class="LP-PlaceGrid">
-    <h1 class="LP-Headline LP-Headline">Our latest locations</h1>
+    <h1 class="LP-Headline LP-Headline">{% trans 'Explore the latest places' %}</h1>
     <ul class="LP-PlaceGrid__Grid">
         {% for place in place_list %}
         <li class="LP-PlaceGrid__Item">

django_lostplaces/lostplaces/templates/partials/form/submit.html

@@ -0,0 +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>
+</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>
+    </a>
+</div>

django_lostplaces/lostplaces/templates/partials/nav/footer.html

@@ -1,3 +1,4 @@
+{% load i18n %}
 <footer class="LP-Footer">
     <div class="LP-FooterColumns__Container">
         
@@ -60,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">   
-            Proudly made by <a href="https://git.mowoe.com/reverend" class="LP-Footer__GenericAnchor">Reverend</a> 
-            and <a href="https://www.commander1024.de" class="LP-Footer__GenericAnchor">Commander1024.</a></span>
+            {% 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>
         </div>
         <div class="LP-Footer__BottomWrapper">
-            <a href="{% url 'flatpage' slug='privacy-policy' %}" class="LP-Footer__GenericAnchor">Privacy Policy</a> 
+            <a href="{% url 'flatpage' slug='privacy-policy' %}" class="LP-Footer__GenericAnchor">{% trans 'Privacy Policy' %}</a> 
             | 
-            <a href="{% url 'flatpage' slug='imprint' %}" class="LP-Footer__GenericAnchor">Imprint</a>
+            <a href="{% url 'flatpage' slug='imprint' %}" class="LP-Footer__GenericAnchor">{% trans 'Imprint' %}</a>
         </div>
     </section>
 </footer>

django_lostplaces/lostplaces/templates/partials/nav/pagination.html

@@ -1,3 +1,4 @@
+{% load i18n %}
 {% load lostplaces %}
 
 {% if is_paginated %}
@@ -7,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">First</span>
+                    <span class="LP-Text">{% trans '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">Previous</span>
+                        <span class="LP-Text">{% trans '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">First</span>
+                        <span class="LP-Text">{% trans '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">Previous</span>
+                        <span class="LP-Text">{% trans 'Previous' %}</span>
                     </a>
                 </li>
             {% endif %}
@@ -46,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">Next</span>
+                    <span class="LP-Text">{% trans '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">Last</span>
+                    <span class="LP-Text">{% trans '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">Next</span>
+                    <span class="LP-Text">{% trans '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">Last</span>
+                    <span class="LP-Text">{% trans 'Last' %}</span>
                     <span class="LP-Icon">⟫</span>
                 </a>
             </li>

django_lostplaces/lostplaces/templates/partials/osm_map.html

@@ -1,6 +1,6 @@
-
-<div tabindex="1" id="map" class="map" style="height: 300px"></div>
-    <div id="info" class="map-popup"></div>
+{% load static %}
+<div tabindex="1" id="map" class="LP-Map map" style="height: 300px"></div>
+    <div id="info" class="map-popup LP-Map__Popup"></div>
 
         <script type="text/javascript">
             var map = new ol.Map({
@@ -11,7 +11,7 @@
                 }),
             ],
             view: new ol.View({
-                center: ol.proj.fromLonLat([{{config.map_center.longitude}}, {{config.map_center.latitude}}]),
+                center: ol.proj.fromLonLat([{{config.map_center.longitude|safe}}, {{config.map_center.latitude|safe}}]),
                 zoom: 9
             })
             });
@@ -21,7 +21,7 @@
                     {% for point in config.all_points %}
                         new ol.Feature({
                             geometry: new ol.geom.Point(
-                                ol.proj.fromLonLat([{{point.longitude}},{{point.latitude}}])
+                                ol.proj.fromLonLat([{{point.longitude|safe}},{{point.latitude|safe}}])
                             ),
                             url: '{{point.get_absolute_url}}',
                             name: '  {{point.name}}'
@@ -37,8 +37,8 @@
                             anchor: [0.5, 46],
                             anchorXUnits: 'fraction',
                             anchorYUnits: 'pixels',
-                            scale: 0.3,
-                            src: 'http://icons.iconarchive.com/icons/paomedia/small-n-flat/128/map-marker-icon.png'
+                            scale: 0.02,
+                            src: '{% static "icons/map-marker-icon.png" %}'
                         })
                 })
             });

django_lostplaces/lostplaces/templates/partials/tagging.html

@@ -1,3 +1,5 @@
+{% load i18n %}
+
 <div class="LP-TagList">
     <ul class="LP-TagList__List">
         {% for tag in config.tagged_item.tags.all %}
@@ -25,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">Tags hinzufügen</legend>
+        <legend class="LP-Form__Legend">{% trans '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"> Tags hinzufügen</button>
+                <button id="id_tag_submit_button" class="LP-Button">{% trans '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" %}

django_lostplaces/lostplaces/templates/partials/welcome.html

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

django_lostplaces/lostplaces/templates/photo_album/photo_album_create.html

@@ -1,18 +1,19 @@
 {% extends 'global.html'%}
+{% load i18n %}
 
-{% block title %}Submit a photo album{% endblock %}
+{% block title %}{% trans 'Submit a photo album' %}{% 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">Edit place</span></a></li>
+			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">Delete place</span></a></li>
+			class="LP-Link__Text">{% trans 'Delete place' %}</span></a></li>
 {% endblock additional_menu_items %}
 
 {% block maincontent %}
 <form class="LP-Form" method="POST">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">Submit a photo album for {{place.name}}</legend>
+        <legend class="LP-Form__Legend">{% trans 'Submit a photo album for' %} {{place.name}}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition">
             <div class="LP-Form__Field">
@@ -27,14 +28,7 @@
         </div>
 
         <div class="LP-Form__Composition LP-Form__Composition--buttons">
-            <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <button class="LP-Button">Submit</button>
-            </div>
-            <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <a class="LP-Link" href="{% url 'place_detail' pk=place.id%}">
-                    <button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
-                </a>
-            </div>
+            {% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER %}
         </div>
     </fieldset>
 </form>

django_lostplaces/lostplaces/templates/place/place_create.html

@@ -1,12 +1,13 @@
 {% extends 'global.html'%}
 {% load static %}
+{% load i18n %}
 
-# {% block title %}Place erstellen{% endblock %}
+# {% block title %}{% trans '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">Create Place</legend>
+        <legend class="LP-Form__Legend">{% trans 'Create Place' %}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition LP-Form__Composition--breakable">
             <div class="LP-Form__Field">
@@ -38,15 +39,9 @@
             </div>
         </div>
 
+        {% trans 'Create' as action %}
         <div class="LP-Form__Composition LP-Form__Composition--buttons">
-            <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <button class="LP-Button">Create</button>
-            </div>
-            <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <a class="LP-Link" href="{% url 'place_list' %}">
-                    <button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
-                </a>
-            </div>
+            {% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER action=action %}
         </div>
     </fieldset>
 

django_lostplaces/lostplaces/templates/place/place_delete.html

@@ -1,29 +1,24 @@
 {% extends 'global.html'%}
 {% load static %}
+{% load i18n %}
 
-{% block title %}Lost Place Deletion{% endblock %}
+{% block title %}{% trans 'Lost Place Deletion' %}{% endblock %}
 
 {% block maincontent %}
 
 <form class="LP-Form" method="POST">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">Delete place</legend>
+        <legend class="LP-Form__Legend">{% trans 'Delete place' %}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition">
             <div class="LP-Form__Field LP-Form__InfoText">
-                <p class="LP-Paragraph">Are you sure you want to delete "{{place.name}}"? </p>
+                <p class="LP-Paragraph">{% trans 'Are you sure you want to delete' %} "{{place.name}}"?</p>
             </div>
         </div>
-
+        
+        {% trans 'Delete' as action %}
         <div class="LP-Form__Composition LP-Form__Composition--buttons">
-            <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <button class="LP-Button">Delete</button>
-            </div>
-            <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <a class="LP-Link" href="{% url 'place_detail' pk=place.pk %}">
-                    <button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
-                </a>
-            </div>
+            {% include 'partials/form/submit.html' with referer=request.META.HTTP_REFERER action=action %}
         </div>
     </fieldset>
 </form>

django_lostplaces/lostplaces/templates/place/place_detail.html

@@ -1,8 +1,10 @@
 {% extends 'global.html'%}
-
 {% load static %}
+{% load i18n %}
+
 {% load thumbnail %}
 {% load svg_icon %}
+{% load lostplaces %}
 
 {% block additional_head %}
 <link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
@@ -14,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">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">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">{% 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>
 {% endblock additional_menu_items %}
 
 {% block maincontent %}
@@ -35,34 +37,33 @@
     </div>
 
     <section class="LP-Section">
-
         {% url 'place_tag_submit' place_id=place.id as tag_submit_url%}
         {% include 'partials/tagging.html' with config=tagging_config %}
-
     </section>
 
     <section class="LP-Section">
-        <h1 class="LP-Headline">Map links</h1>
+        <h1 class="LP-Headline">{% trans 'Map links' %}</h1>
         {% include 'partials/osm_map.html' with 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}},{{place.longitude}}" class="LP-Link"><span class="LP-Text">Google Maps</span></a></li>
-                <li class="LP-LinkList__Item"><a target="_blank" href="https://www.tim-online.nrw.de/tim-online2/?center={{place.latitude}},{{place.longitude}}&icon=true&bg=dop" class="LP-Link"><span class="LP-Text">TIM Online</span></a></li>
-                <li class="LP-LinkList__Item"><a target="_blank" href="http://www.openstreetmap.org/?mlat={{place.latitude}}&mlon={{place.longitude}}&zoom=16" class="LP-Link"><span class="LP-Text">OSM</span></a></li>
+                <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>
+                <li class="LP-LinkList__Item"><a target="_blank" href="https://www.tim-online.nrw.de/tim-online2/?center={{place.latitude|safe}},{{place.longitude|safe}}&icon=true&bg=dop" class="LP-Link"><span class="LP-Text">TIM Online</span></a></li>
+                <li class="LP-LinkList__Item"><a target="_blank" href="http://www.openstreetmap.org/?mlat={{place.latitude|safe}}&mlon={{place.longitude|safe}}&zoom=16" class="LP-Link"><span class="LP-Text">OSM</span></a></li>
             </ul>
         </div>
     </section>
 
     <section class=" LP-Section">
-        <h1 class="LP-Headline">Photo albums</h1>
+        <h1 class="LP-Headline">{% trans 'Photo albums' %}</h1>
         <div class="LP-LinkList">
             <ul class="LP-LinkList__Container">
-                {% for photo_album in place.photo_albums.all %}
+                {% for photo_album in place.photoalbums.all %}
                 <li class="LP-LinkList__Item">
                     <a target="_blank" href="{{photo_album.url}}" class="LP-Link">
                         <span class="LP-Text">{{photo_album.label}}</span>
                     </a>
-                    {% if user.explorer == photo_album.submitted_by or user.explorer ==  place.submitted_by %}
+                    {% can_modify_place_asset photo_album request as authorized %}
+                    {% if authorized %}
                     <a href="{% url 'photo_album_delete' pk=photo_album.pk%}" class="LP-Link LP-LinkList__ItemHover" title="Delete Photo Album">
                         <div class="RV-Iconized__Container RV-Iconized__Container--small">
                             {% icon 'trash' className="RV-Iconized__Icon" %}
@@ -80,7 +81,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">Fotoalbum hinzufügen</span>
+                            <span class="RV-Iconized__Text">{% trans 'Add photo album' %}</span>
                         </div>
                     </a>
                 </li>
@@ -89,14 +90,29 @@
     </section>
 
     <section class="LP-Section">
-        <h1 class="LP-Headline">Images</h1>
+        <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>
+                    <a href="{{ place_image.filename.large.url }}" class="LP-Link">
+                        <img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
+                    </a>
+                    {% can_modify_place_asset place_image request as authorized %}
+                    {% if authorized %}
+                    <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>

django_lostplaces/lostplaces/templates/place/place_list.html

@@ -1,18 +1,19 @@
 {% extends 'global.html'%}
 {% load static %}
+{% load i18n %}
 
 {% block additional_head %}
 <link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
 <script src="{% static 'maps/ol.js' %}"></script>
 {% endblock additional_head %}
 
-{% block title %}Lost Places{% endblock %}
+{% block title %}{% trans 'Lost Places' %}{% endblock %}
 
 {% block maincontent %}
 
 {% include 'partials/osm_map.html' with config=mapping_config %}
 <div class="LP-PlaceList">
-    <h1 class="LP-Headline">Listing our places</h1>
+    <h1 class="LP-Headline">{% trans 'Listing our places' %}</h1>
     <ul class="LP-PlaceList__List">
         {% for place in place_list %}
         <li class="LP-PlaceList__Item">

django_lostplaces/lostplaces/templates/place/place_update.html

@@ -1,12 +1,13 @@
 {% extends 'global.html'%}
 {% load static %}
+{% load i18n %}
 
-# {% block title %}Update place{% endblock %}
+# {% block title %}{% trans 'Update place' %}{% endblock %}
 
 {% block maincontent %}
 <form class="LP-Form" method="POST" enctype="multipart/form-data">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">Update place</legend>
+        <legend class="LP-Form__Legend">{% trans 'Update place' %}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition LP-Form__Composition--breakable">
             <div class="LP-Form__Field">
@@ -38,15 +39,9 @@
             </div>
         </div>
         
+        {% trans 'Update' as action %}
         <div class="LP-Form__Composition LP-Form__Composition--buttons">
-            <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <button class="LP-Button">Update</button>
-            </div>
-            <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <a class="LP-Link" href="{% url 'place_detail' pk=place.pk %}">
-                    <button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
-                </a>
-            </div>
+            {% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER action=action %}
         </div>
     </fieldset>
 

django_lostplaces/lostplaces/templates/place_image/place_image_create.html

@@ -0,0 +1,22 @@
+{% extends 'global.html'%}
+{% load i18n %}
+
+{% block maincontent %}
+<form class="LP-Form" method="POST" enctype="multipart/form-data">
+    <fieldset class="LP-Form__Fieldset">
+        <legend class="LP-Form__Legend">{% trans 'Submit images to a place' %}</legend>
+        {% csrf_token %}
+
+        <div class="LP-Form__Composition">
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=form.filename %}
+            </div>
+        </div>
+
+        <div class="LP-Form__Composition LP-Form__Composition--buttons">
+            {% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER %}
+        </div>
+    </fieldset>
+
+</form>
+{% endblock maincontent %}

django_lostplaces/lostplaces/templates/registration/login.html

@@ -1,13 +1,13 @@
 {% extends 'global.html'%}
 {% load static %}
-
-# {% block title %}Login{% endblock %}
+{% load i18n %}
+# {% block title %}{% trans 'Login' %}{% endblock %}
 
 {% block maincontent %}
 
 <form class="LP-Form" method="POST" enctype="multipart/form-data">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">Login</legend>
+        <legend class="LP-Form__Legend">{% trans 'Login' %}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition LP-Form__Composition--breakable">
             <div class="LP-Form__Field">
@@ -20,12 +20,12 @@
 
 		<div class="LP-Form__Composition LP-Form__Composition--buttons">
 			<div class="LP-Form__Field LP-Form__Button LP-Input">
-				<button class="LP-Button">Login</button>
+				<button class="LP-Button">{% trans 'Login' %}</button>
 			</div>
 		</div>
     </fieldset>
 </form>
 
-<p class="LP-Headline">No account? <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">Sign up here</span></a></p>
+<p class="LP-Headline">{% trans 'Have No Account Yet?' %} <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign Up' %}</span></a></p>
 
 {% endblock maincontent %}

django_lostplaces/lostplaces/templates/signup.html

@@ -1,14 +1,15 @@
 {% extends 'global.html'%}
 {% load static %}
+{% load i18n %}
 {% load widget_tweaks %}
 
-# {% block title %}Registrierung{% endblock %}
+# {% block title %}{% trans 'Sign up' %}{% endblock %}
 
 {% block maincontent %}
 
 <form class="LP-Form" method="POST">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">Registration</legend>
+        <legend class="LP-Form__Legend">{% trans 'Sign Up' %}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition LP-Form__Composition--breakable">
             <div class="LP-Form__Field">
@@ -37,7 +38,7 @@
 
         <div class="LP-Form__Composition LP-Form__Composition--buttons">
             <div class="LP-Form__Field LP-Form__Button LP-Input">
-                <button class="LP-Button">Sign up</button>
+                <button class="LP-Button">{% trans 'Sign Up' %}</button>
             </div>
         </div>
     </fieldset>

django_lostplaces/lostplaces/templatetags/lostplaces.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from django import template
+from django.http import request
 
 register = template.Library()
 
@@ -22,4 +23,14 @@ def proper_paginate(paginator, current_page, neighbors=2):
             end_index = paginator.num_pages
         page_list = [f for f in range(start_index, end_index+1)]
         return page_list[:(2*neighbors + 1)]
-    return paginator.page_range
+    return paginator.page_range
+
+@register.simple_tag
+def can_modify_place_asset(place_asset, request, *args, **kwargs):
+    print(place_asset.place.submitted_by, place_asset.submitted_by, request.user)
+    if request.user.is_superuser:
+        return True
+    if request.user.explorer == place_asset.place.submitted_by or request.user.explorer == place_asset.submitted_by:
+        return True
+    else:
+        return False

django_lostplaces/lostplaces/tests/forms/__init__.py

@@ -0,0 +1,76 @@
+from django.test import TestCase
+from django.core.exceptions import FieldDoesNotExist
+
+class FormTestCase(TestCase):
+    '''
+    Base class for FormTests.
+    Parameters:
+    - form : Form to test
+    '''
+    form = None
+
+    def assertField(self, field_name, field_class, must_have={}, must_not_have={}):
+        '''
+        Tests if a field exists under the given name and
+        if the field is of the right type.
+        Also checks if the field has the given must_have attributes
+        and does not have any of the must_not_have attributes. If you
+        dont care about the value of the attribute you can just set it to 
+        something that fullfills value == False (i.e. '' or 0)
+        '''
+        try:
+            field = self.form.base_fields[field_name]
+        except FieldDoesNotExist:
+            self.fail(
+                'Expecting %s to have a field named \'%s\'' % (
+                    self.form.__name__,
+                    field_name
+                )
+            )
+        self.assertEqual(
+            type(field), field_class,
+            msg='Expecting type of %s to be %s' % (
+                str(field),
+                field_class.__name__
+            )
+        )
+
+        for key, value in must_have.items():
+            if value:
+                self.assertEqual(
+                    getattr(field, key), value,
+                    msg='Expeting the value of %s %s to be \'%s\'' % (
+                        str(field),
+                        key,
+                        value
+                    )
+                )
+            else:
+                self.assertTrue(
+                    hasattr(field, key),
+                    msg='Expeting %s to have \'%s\'' % (
+                        str(field),
+                        key
+                    )
+                )
+
+        for key, value in must_not_have.items():
+            if value:
+                self.assertTrue(
+                    getattr(field, key) != value,
+                    msg='Expeting the value of %s %s to not be \'%s\'' % (
+                        str(field),
+                        key,
+                        value
+                    )
+                )
+            else:
+                self.assertFalse(
+                    hasattr(field, value),
+                    msg='Expeting %s to not have \'%s\'' % (
+                        str(field),
+                        key
+                    )
+                )
+
+        return field

django_lostplaces/lostplaces/tests/forms/test_explorer_forms.py

@@ -0,0 +1,59 @@
+import datetime
+
+from django import forms
+from django.utils import timezone
+
+from lostplaces.tests.forms import FormTestCase
+from lostplaces.forms import ExplorerCreationForm
+from lostplaces.models.models import Voucher
+
+class ExplorerCreationFormTestCase(FormTestCase):
+    """
+    This test case only tests for the voucher since all other aspects don't realy matter
+    to this project and are already tested by django
+    """
+    form = ExplorerCreationForm
+    
+    @classmethod
+    def setUpTestData(cls):
+        Voucher.objects.create(
+            code='Imacode123',
+            expires_when=timezone.now() + datetime.timedelta(minutes=1)
+        )
+    
+    def setUp(self):
+        self.post_data = {
+            'voucher': 'Imacode123',
+            'username': 'testpeter',
+            'email': 'testpeter@example.org',
+            'password1': 'Develop123',
+            'password2': 'Develop123'
+        }
+    
+    def test_voucher_field(self):
+        self.assertField(
+            field_name='voucher',
+            field_class=forms.CharField
+        )
+        
+    def test_validation_valid(self):
+        form = ExplorerCreationForm(self.post_data)
+        self.assertTrue(
+            form.is_valid(),
+            msg='Expecting the %s to validate' % (
+                self.form.__name__
+            )
+        )
+        
+    def test_validation_invalid(self):
+        self.post_data = {
+            'voucher': 'Imanotacode123'
+        }
+        form = ExplorerCreationForm(self.post_data)
+        self.assertFalse(
+            form.is_valid(),
+            msg='Expecting the %s to not validate' % (
+                self.form.__name__
+            )
+        )
+    

django_lostplaces/lostplaces/tests/models/__init__.py

@@ -2,11 +2,9 @@
 # -*- coding: utf-8 -*-
 
 from django.db import models
-from django.contrib.auth.models import User
 from django.core.exceptions import FieldDoesNotExist
 from django.test import TestCase
 
-# Creating a test user
 
 class ModelTestCase(TestCase):
     '''

django_lostplaces/lostplaces/tests/models/test_abstract_models.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import datetime
+
+from django.utils import timezone
 from django.test import TestCase
 from django.db import models
 from django.contrib.auth.models import User
@@ -8,7 +11,10 @@ from django.contrib.auth.models import User
 from lostplaces.models import (
     Taggable,
     Mapable,
-    Submittable
+    Submittable,
+    PlaceAsset,
+    Expireable,
+    Voucher
 )
 from lostplaces.tests.models import ModelTestCase
 
@@ -65,8 +71,8 @@ class SubmittableTestCase(ModelTestCase):
         )
         self.assertEqual(
             submitted_by.remote_field.related_name,
-            '%(class)s',
-            msg='Expecting the related_name of %s to be \'%%(class)s\', got %s' % (
+            '%(class)ss',
+            msg='Expecting the related_name of %s to be \'%%(class)ss\', got %s' % (
                 str(submitted_by),
                 submitted_by.remote_field.related_name
             )
@@ -91,3 +97,53 @@ class SubmittableTestCase(ModelTestCase):
             )
         )
 
+class PlaceAssetTestCase(ModelTestCase):
+    model = PlaceAsset
+
+    def test_place(self):
+        field = self.assertField('place', models.ForeignKey)
+        self.assertEqual(field.remote_field.on_delete, models.CASCADE,
+            msg='Expecting the deletion of %s to be cascading' % (
+                str(field)
+            )
+        )
+        expected_related_name = '%(class)ss'
+        self.assertEqual(field.remote_field.related_name, expected_related_name,
+            msg='Expecting the related name of %s to be %s' % (
+                str(field),
+                expected_related_name
+            )
+        )
+
+class ExpireableTestCase(ModelTestCase):
+    model = Expireable
+    
+    def test_fields(self):
+        self.assertField(
+            field_name='created_when',
+            field_class=models.DateTimeField,
+            must_have={'auto_now_add': True}
+        )
+        self.assertField(
+            field_name='expires_when',
+            field_class=models.DateTimeField
+        )
+        
+    def test_is_expired(self):
+        valid_voucher = Voucher.objects.create(
+            code='Test123',
+            expires_when=timezone.now() + datetime.timedelta(minutes=2)
+        )
+        self.assertFalse(
+            valid_voucher.is_expired,
+            msg='Expecing the expirable object to not be expired'
+        )
+        
+        invalid_voucher = Voucher.objects.create(
+            code='Test1234',
+            expires_when=timezone.now() - datetime.timedelta(minutes=2)
+        )
+        self.assertTrue(
+            invalid_voucher.is_expired,
+            msg='Expecing the expirable object to be expired'
+        )

django_lostplaces/lostplaces/tests/models/test_link_model.py

@@ -69,7 +69,7 @@ class PhotoAlbumTestCase(ModelTestCase):
                 str(field)
             )
         )
-        expected_related_name = 'photo_albums'
+        expected_related_name = 'photoalbums'
         self.assertEqual(field.remote_field.related_name, expected_related_name,
             msg='Expecting the related name of %s to be %s' % (
                 str(field),
@@ -90,4 +90,12 @@ class PhotoAlbumTestCase(ModelTestCase):
         self.assertTrue('lostplaces.example.com' in albumlink.url,
             msg='Expecting albumlink.url to contain \'lostplaces.example.com\' string'
         )
-        
+        
+    def test_linked_place(self):
+        albumlink = self.albumlink
+        place = self.place
+        self.assertTrue(str(albumlink.place) in str(place.name),
+            msg='Expecting %s.__str__ to contain the name' % (
+                self.model.__name__
+            )
+        )

django_lostplaces/lostplaces/urls.py

@@ -13,6 +13,8 @@ from lostplaces.views import (
 	PlaceTagSubmitView,
 	PhotoAlbumCreateView,
 	PhotoAlbumDeleteView,
+    PlaceImageCreateView,
+    PlaceImageDeleteView,
     FlatView
 )
 
@@ -25,6 +27,8 @@ urlpatterns = [
     path('place/update/<int:pk>/', PlaceUpdateView.as_view(), name='place_edit'),
     path('place/delete/<int:pk>/', PlaceDeleteView.as_view(), name='place_delete'),
     path('place/', PlaceListView.as_view(), name='place_list'),
+    path('place_image/create/<int:place_id>', PlaceImageCreateView.as_view(), name='place_image_create'),
+    path('place_image/delete/<int:pk>', PlaceImageDeleteView.as_view(), name='place_image_delete'),
     path('flat/<slug:slug>/', FlatView, name='flatpage'),
 
     # POST-only URLs for tag submission

django_lostplaces/lostplaces/views/__init__.py

@@ -3,4 +3,5 @@
 
 from lostplaces.views.base_views import *
 from lostplaces.views.views import * 
-from lostplaces.views.place_views import *
+from lostplaces.views.place_views import *
+from lostplaces.views.place_image_views import *

django_lostplaces/lostplaces/views/base_views.py

@@ -11,6 +11,7 @@ from django.contrib.messages.views import SuccessMessageMixin
 
 from django.shortcuts import redirect, get_object_or_404
 from django.urls import reverse_lazy
+from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.models import Place
 
@@ -21,7 +22,7 @@ class IsAuthenticatedMixin(LoginRequiredMixin, View):
     the login page.
     '''
     login_url = reverse_lazy('login')
-    permission_denied_message = 'Please login to proceed'
+    permission_denied_message = _('Please login to proceed')
 
     def handle_no_permission(self):
         messages.error(self.request, self.permission_denied_message)
@@ -60,7 +61,6 @@ class IsPlaceSubmitterMixin(UserPassesTestMixin, View):
 
 class PlaceAssetCreateView(IsAuthenticatedMixin, SuccessMessageMixin, CreateView):
     model = None
-    fields = []
     template_name = ''
     success_message = ''
 

django_lostplaces/lostplaces/views/place_image_views.py

@@ -0,0 +1,42 @@
+from django.views import View
+from django.shortcuts import get_object_or_404, redirect
+from django.utils.translation import ugettext_lazy as _
+
+from lostplaces.views.base_views import PlaceAssetCreateView, PlaceAssetDeleteView
+from lostplaces.models import PlaceImage, Place
+from lostplaces.forms import PlaceImageForm
+
+class MultiplePlaceImageUploadMixin:
+    
+    def handle_place_images(self, request, place):
+        if request.FILES:
+            submitted_by = request.user.explorer
+            for image in request.FILES.getlist('filename'):
+                place_image = PlaceImage.objects.create(
+                    filename=image,
+                    place=place,
+                    submitted_by=submitted_by
+                )
+                place_image.save()
+            
+class PlaceImageCreateView(MultiplePlaceImageUploadMixin, PlaceAssetCreateView):
+    model = PlaceImage
+    form_class = PlaceImageForm
+    template_name = 'place_image/place_image_create.html'
+    success_message = _('Image(s) submitted successfully')
+    commit = False
+
+    def post(self, request, place_id, *args, **kwargs):
+        self.place = get_object_or_404(Place, pk=place_id)
+        self.handle_place_images(request, self.place)
+        return redirect(self.get_success_url())
+        
+    def form_valid(self, form):
+        form.instance.place = self.place
+        form.instance.submitted_by = self.request.user.explorer
+        return super().form_valid(form)
+        
+class PlaceImageDeleteView(PlaceAssetDeleteView):
+    model = PlaceImage
+    success_message = _('Image(s) deleted successfully')
+    permission_denied_message = _('You are not allowed to delete this image')

django_lostplaces/lostplaces/views/place_views.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from django.db.models.functions import Lower
+
 from django.views import View
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
 from django.views.generic.detail import SingleObjectMixin
@@ -8,12 +10,14 @@ from django.views.generic import ListView
 
 from django.contrib import messages
 from django.contrib.messages.views import SuccessMessageMixin
+from django.utils.translation import ugettext_lazy as _
 
 from django.shortcuts import render, redirect, get_object_or_404
 from django.urls import reverse_lazy
 
 from lostplaces.models import Place, PlaceImage
-from lostplaces.views import IsAuthenticatedMixin, IsPlaceSubmitterMixin
+from lostplaces.views.base_views import IsAuthenticatedMixin, IsPlaceSubmitterMixin
+from lostplaces.views.place_image_views import MultiplePlaceImageUploadMixin
 from lostplaces.forms import PlaceForm, PlaceImageForm, TagSubmitForm
 
 from taggit.models import Tag
@@ -22,7 +26,7 @@ class PlaceListView(IsAuthenticatedMixin, ListView):
     paginate_by = 5
     model = Place
     template_name = 'place/place_list.html'
-    ordering = ['name']
+    ordering = [Lower('name')]
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -55,8 +59,8 @@ class PlaceUpdateView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, SuccessMessag
     template_name = 'place/place_update.html'
     model = Place
     form_class = PlaceForm
-    success_message = 'Successfully updated place.'
-    place_submitter_error_message = 'You do no have permissions to alter this place'
+    success_message = _('Successfully updated place')
+    place_submitter_error_message = _('You do no have permissions to alter this place')
 
     def get_success_url(self):
         return reverse_lazy('place_detail', kwargs={'pk':self.get_object().pk})
@@ -64,7 +68,7 @@ class PlaceUpdateView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, SuccessMessag
     def get_place(self):
         return self.get_object()
 
-class PlaceCreateView(IsAuthenticatedMixin, View):
+class PlaceCreateView(MultiplePlaceImageUploadMixin, IsAuthenticatedMixin, View):
 
     def get(self, request, *args, **kwargs):
         place_image_form = PlaceImageForm()
@@ -86,16 +90,11 @@ class PlaceCreateView(IsAuthenticatedMixin, View):
             place.submitted_by = submitter
             place.save()
 
-            if request.FILES:
-                self._apply_multipart_image_upload(
-                    files=request.FILES.getlist('filename'),
-                    place=place, 
-                    submitter=submitter
-                )
+            self.handle_place_images(request, place)
             
             messages.success(
                 self.request,
-                'Successfully created place.'
+                _('Successfully created place')
             )
             return redirect(reverse_lazy('place_detail', kwargs={'pk': place.pk}))
         
@@ -107,26 +106,16 @@ class PlaceCreateView(IsAuthenticatedMixin, View):
             )
             return render(request, 'place/place_create.html', context={'form': place_form})
 
-    def _apply_multipart_image_upload(self, files, place, submitter):
-        for image in files:
-            place_image = PlaceImage.objects.create(
-                filename=image,
-                place=place,
-                submitted_by=submitter
-            )
-            place_image.save()
-
 class PlaceDeleteView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, DeleteView):
     template_name = 'place/place_delete.html'
     model = Place
-    success_message = 'Successfully deleted place.'
+    success_message = _('Successfully deleted place')
     success_url = reverse_lazy('place_list')
-    success_message = 'Place deleted'
-    place_submitter_error_message = 'You do no have permission to delete this place'
+    place_submitter_error_message = _('You do no have permission to delete this place')
 
     def delete(self, request, *args, **kwargs):
         messages.success(self.request, self.success_message)
         return super().delete(request, *args, **kwargs)
 
     def get_place(self):
-        return self.get_object()
+        return self.get_object()

django_lostplaces/lostplaces/views/views.py

@@ -9,6 +9,7 @@ from django.contrib import messages
 from django.urls import reverse_lazy
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponseForbidden
+from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.forms import ExplorerCreationForm, TagSubmitForm
 from lostplaces.models import Place, PhotoAlbum
@@ -25,7 +26,7 @@ class SignUpView(SuccessMessageMixin, CreateView):
     form_class = ExplorerCreationForm
     success_url = reverse_lazy('login')
     template_name = 'signup.html'
-    success_message = 'User created.'
+    success_message = _('User created')
 
 class HomeView(IsAuthenticatedMixin, View):
     def get(self, request, *args, **kwargs):
@@ -50,13 +51,13 @@ class PhotoAlbumCreateView(PlaceAssetCreateView):
     model = PhotoAlbum
     fields = ['url', 'label']
     template_name = 'photo_album/photo_album_create.html'
-    success_message = 'Photo Album submitted'
+    success_message = _('Photo Album submitted')
 
 class PhotoAlbumDeleteView(PlaceAssetDeleteView):
     model = PhotoAlbum
     pk_url_kwarg = 'pk'
-    success_message = 'Photo Album deleted'
-    permission_denied_messsage = 'You do not have permissions to alter this photo album'
+    success_message = _('Photo Album deleted')
+    permission_denied_messsage = _('You do not have permissions to alter this photo album')
 
 class PlaceTagSubmitView(IsAuthenticatedMixin, View):
 	def post(self, request, tagged_id, *args, **kwargs):
@@ -81,4 +82,7 @@ class PlaceTagDeleteView(IsAuthenticatedMixin, View):
         return redirect(reverse_lazy('place_detail', kwargs={'pk': tagged_id}))
 
 def FlatView(request, slug):
-    return render(request, 'flat/' + slug + '.html')
+    if request.LANGUAGE_CODE == 'de':
+        return render(request, 'flat/' + slug + '-de' + '.html')
+    else:
+        return render(request, 'flat/' + slug + '.html')

django_lostplaces/testdata/testdata.md

@@ -1,5 +1,7 @@
 # testdata
 
+This testdata is provided for you to see the database filled with some dummycontent.
+
 ## Database content
 testdata is provided in this repository / directory in testdata.json. It has been
 dumped using: 
@@ -8,7 +10,8 @@ dumped using:
 manage.py dumpdata --all --exclude=auth --exclude=sessions --indent 4 --o testdata/testdata.json
 ```
 
-You can import it using 
+To successfully import this testdata, you have to create 2 users. ID=1 is your normal superuser, ID=2 is an unprivileged user.
+You can import it using:
 
 ```
 manage.py loaddata testdata.json

setup.py

@@ -8,7 +8,7 @@ with open('Readme.md') as f:
 
 setup(
     name='django-lostplaces',
-    version='0.1.a5',
+    version='0.1.2 HotFix',
     description='A django app to manage lost places',
     author='Reverend',
     author_email='reverend@reverend2048.de',