Implemented tag that checks if user is authorized.

2020-10-11 09:46:15 +02:00
42 changed files with 249 additions and 674 deletions
--- a/django_lostplaces/MANIFEST.in
+++ b/django_lostplaces/MANIFEST.in
@@ -1,4 +1,3 @@
-exclude 
 include LICENSE
 include Readme.rst
 include Pipfile
--- a/Readme.md
+++ b/Readme.md
@@ -22,7 +22,7 @@ Right now it depends on the following non-core Python 3 libraries. These can be
  * [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
+  ### 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.
@@ -88,9 +88,7 @@ Run `django_lostplaces/managy.py collectstatic` and you should be ready to go.

 If you haven't already setup a django instance, see [django's documentation](https://docs.djangoproject.com/en/3.1/topics/install/).

-Afterwards, either
-  download the desired release [from the releases page](https://git.mowoe.com/reverend/lostplaces-backend/releases) and install it using  `pip install --user name-of-the-file.tar.gz`
- or install the latest release using `pip install django-lostplaces`
+After that, download the desired release (probably the latest one) [from the releases page](https://git.mowoe.com/reverend/lostplaces-backend/releases) and install it using  `pip install --user name-of-the-file.tar.gz`

 *Note: You can run pip install without the --user flag, which will require root privileges and introduces potential security issues.*

@@ -146,7 +144,3 @@ Before making the django instance public, you should tweak the config `settings.


 Run `django_lostplaces/manage.py collectstatic` you should be ready to go.
-
-
-### Contact
-If you run into any issues, have any questions or If you are interested in this project in general, feel free to get in touch with us via [reverend@reverend2048.de](mailto:reverend@reverend2048.de), we do speak English and German.
--- a/django_lostplaces/lostplaces/common.py
+++ b/django_lostplaces/lostplaces/common.py
@@ -1,11 +0,0 @@
-def get_all_subclasses(cls):
-    '''
-    Gets all subclasses recursively, does not contain
-    abstract classes
-    '''
-    subclass_list = []
-    for subclass in cls.__subclasses__():
-        if not subclass._meta.abstract:
-            subclass_list.append(subclass)
-        subclass_list += get_all_subclasses(subclass)
-    return subclass_list
--- a/django_lostplaces/lostplaces/locale/de/LC_MESSAGES/django.po
+++ b/django_lostplaces/lostplaces/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-11 21:53+0200\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"
@@ -50,22 +50,6 @@ msgstr "Längengrad"
 msgid "Longitude in decimal format: e. g. 2.17403"
 msgstr "Breitengrad in dezimaler Form: z. B. 7.4840155"

-#: models/abstract_models.py:59
-msgid "Submission date"
-msgstr "Einreichungsdatum"
-
-#: models/abstract_models.py:67
-msgid "Submitter"
-msgstr "Einreicher"
-
-#: models/abstract_models.py:79
-msgid "Creation date"
-msgstr "Erstellungsdatum"
-
-#: models/abstract_models.py:82
-msgid "Expiration date"
-msgstr "Ablaufdatum"
-
 #: models/external_links.py:13
 msgid "URL"
 msgstr "Adresse (URL)"
@@ -112,7 +96,7 @@ msgstr "Zurück"

 #: templates/global.html:32
 msgid "Logout"
-msgstr "Ausloggen"
+msgstr "Abmelden"

 #: templates/global.html:34
 msgid "Admin"
@@ -124,8 +108,8 @@ msgid "Login"
 msgstr "Anmelden"

 #: templates/global.html:40 templates/registration/login.html:29
-#: templates/signup.html:6 templates/signup.html:12 templates/signup.html:41
-msgid "Sign up"
+#: templates/signup.html:12 templates/signup.html:41
+msgid "Sign Up"
 msgstr "Registrieren"

 #: templates/global.html:50 templates/home.html:10
@@ -138,11 +122,11 @@ msgstr "UrBex Codex"

 #: templates/global.html:56 templates/place/place_create.html:5
 #: templates/place/place_create.html:10
-msgid "Create place"
+msgid "Create Place"
 msgstr "Place erstellen"

 #: templates/global.html:57
-msgid "All places"
+msgid "All Places"
 msgstr "Alle Places"

 #: templates/home.html:20 templates/home_unauth.html:20
@@ -263,8 +247,7 @@ msgid "Submit a photo album"
 msgstr "Fotoalbum hinzufügen"

 #: templates/photo_album/photo_album_create.html:8
-#: templates/place/place_detail.html:18 templates/place/place_update.html:5
-#: templates/place/place_update.html:10
+#: templates/place/place_detail.html:18
 msgid "Edit place"
 msgstr "Place bearbeiten"

@@ -282,13 +265,12 @@ msgid "Create"
 msgstr "Erstellen"

 #: templates/place/place_delete.html:5
-msgid "Delete lost place"
+msgid "Lost Place Deletion"
 msgstr "Lost Place löschen"

 #: templates/place/place_delete.html:15
-#, python-format
-msgid "Are you sure you want to delete %(place_name)s?"
-msgstr "Bist Du sicher, dass Du %(place_name)s löschen möchtest?"
+msgid "Are you sure you want to delete"
+msgstr "Willst Du den Ort wirklich löschen: "

 #: templates/place/place_delete.html:19
 msgid "Delete"
@@ -311,13 +293,17 @@ msgid "Images"
 msgstr "Bilder"

 #: templates/place/place_list.html:10
-msgid "All Places"
+msgid "Lost Places"
 msgstr "Alle Places"

 #: templates/place/place_list.html:16
-msgid "Our lost places"
+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"
@@ -327,9 +313,13 @@ msgid "Submit images to a place"
 msgstr "Bilder zu einem Place hinzufügen"

 #: templates/registration/login.html:29
-msgid "No account, yet?"
+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"
@@ -339,49 +329,49 @@ msgid "Image(s) submitted successfully"
 msgstr "Bild(er) erfolgreich hinzugefügt"

 #: views/place_image_views.py:41
-msgid "Image deleted successfully"
-msgstr "Bild erfolgreich gelöscht"
+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 aktualisiert"
+msgstr "Place erfolgreich gelöscht"

 #: views/place_views.py:63
-msgid "You are not allowed to edit this place"
-msgstr "Du darfst diesen Place nicht bearbeiten"
+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 erstellt"
-
-#: views/place_views.py:105
-msgid "Please fill in all required fields."
-msgstr "Bitte füll alle benötigten Felder aus."
+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 are not allowed to delete this place"
-msgstr "Du darfst diesen Place nicht löschen"
+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 "Benutzer erstellt"
+msgstr "User erstellt"

 #: views/views.py:54
-msgid "Photo album link submitted"
-msgstr "Fotoalbum-Link hinzugefügt"
+msgid "Photo Album submitted"
+msgstr "Fotoalbum hinzugefügt"

 #: views/views.py:59
-msgid "Photo album link deleted"
-msgstr "Fotoalbum-Link gelöscht"
+msgid "Photo Album deleted"
+msgstr "Fotoalbum gelöscht"

 #: views/views.py:60
-msgid "You are not allowed to edit this photo album link"
-msgstr "Du darfst diesen Fotoalbum-Link nicht bearbeiten"
+msgid "You do not have permissions to alter this photo album"
+msgstr "Du hast nicht die Berechtigung, diesen Place zu bearbeiten"
--- a/django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py
+++ b/django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py
@@ -19,4 +19,4 @@ class Migration(migrations.Migration):
        migrations.DeleteModel(
            name='Expireable'
        )
-    ]
+    ]
--- a/django_lostplaces/lostplaces/migrations/0003_voucher.py
+++ b/django_lostplaces/lostplaces/migrations/0003_voucher.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):

    dependencies = [
-        ('lostplaces', '0002_reomve_vouchers'),
+        ('lostplaces', '0002_remove_vouchers'),
    ]

    operations = [
@@ -22,4 +22,4 @@ class Migration(migrations.Migration):
                'abstract': False,
            },
        ),
-    ]
+    ]
--- a/django_lostplaces/lostplaces/migrations/0004_release_0_1_3.py
+++ b/django_lostplaces/lostplaces/migrations/0004_release_0_1_3.py
@@ -1,102 +0,0 @@
-# Generated by Django 3.1.1 on 2020-12-19 13:53
-
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import easy_thumbnails.fields
-import lostplaces.models.place
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces', '0003_voucher'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='photoalbum',
-            name='label',
-            field=models.CharField(max_length=100, verbose_name='link text'),
-        ),
-        migrations.AlterField(
-            model_name='photoalbum',
-            name='submitted_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer', verbose_name='Submitter'),
-        ),
-        migrations.AlterField(
-            model_name='photoalbum',
-            name='submitted_when',
-            field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date'),
-        ),
-        migrations.AlterField(
-            model_name='photoalbum',
-            name='url',
-            field=models.URLField(verbose_name='URL'),
-        ),
-        migrations.AlterField(
-            model_name='place',
-            name='description',
-            field=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'),
-        ),
-        migrations.AlterField(
-            model_name='place',
-            name='latitude',
-            field=models.FloatField(help_text='Latitude in decimal format: e. g. 41.40338', validators=[django.core.validators.MinValueValidator(-90), django.core.validators.MaxValueValidator(90)], verbose_name='Latitude'),
-        ),
-        migrations.AlterField(
-            model_name='place',
-            name='location',
-            field=models.CharField(max_length=50, verbose_name='Location'),
-        ),
-        migrations.AlterField(
-            model_name='place',
-            name='longitude',
-            field=models.FloatField(help_text='Longitude in decimal format: e. g. 2.17403', validators=[django.core.validators.MinValueValidator(-180), django.core.validators.MaxValueValidator(180)], verbose_name='Longitude'),
-        ),
-        migrations.AlterField(
-            model_name='place',
-            name='name',
-            field=models.CharField(max_length=50, verbose_name='Name'),
-        ),
-        migrations.AlterField(
-            model_name='place',
-            name='submitted_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to='lostplaces.explorer', verbose_name='Submitter'),
-        ),
-        migrations.AlterField(
-            model_name='place',
-            name='submitted_when',
-            field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date'),
-        ),
-        migrations.AlterField(
-            model_name='placeimage',
-            name='description',
-            field=models.TextField(blank=True, verbose_name='Description'),
-        ),
-        migrations.AlterField(
-            model_name='placeimage',
-            name='filename',
-            field=easy_thumbnails.fields.ThumbnailerImageField(help_text='Optional: One or more images to upload', upload_to=lostplaces.models.place.generate_image_upload_path, verbose_name='Filename(s)'),
-        ),
-        migrations.AlterField(
-            model_name='placeimage',
-            name='submitted_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer', verbose_name='Submitter'),
-        ),
-        migrations.AlterField(
-            model_name='placeimage',
-            name='submitted_when',
-            field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date'),
-        ),
-        migrations.AlterField(
-            model_name='voucher',
-            name='created_when',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='Creation date'),
-        ),
-        migrations.AlterField(
-            model_name='voucher',
-            name='expires_when',
-            field=models.DateTimeField(verbose_name='Expiration date'),
-        ),
-    ]
--- a/django_lostplaces/lostplaces/models/abstract_models.py
+++ b/django_lostplaces/lostplaces/models/abstract_models.py
@@ -53,18 +53,13 @@ class Submittable(models.Model):
    class Meta:
        abstract = True

-    submitted_when = models.DateTimeField(
-        auto_now_add=True,
-        null=True,
-        verbose_name=_('Submission date')
-    )
+    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',
-        verbose_name=_('Submitter')
+        related_name='%(class)ss'
    )

 class Expireable(models.Model):
@@ -74,13 +69,8 @@ class Expireable(models.Model):
    class Meta:
 	    abstract = True
        
-    created_when = models.DateTimeField(
-        auto_now_add=True,
-        verbose_name=_('Creation date')
-    )
-    expires_when = models.DateTimeField(
-        verbose_name=_('Expiration date')
-    )
+    created_when = models.DateTimeField(auto_now_add=True)
+    expires_when = models.DateTimeField()
    
    @property
    def is_expired(self):
--- a/django_lostplaces/lostplaces/models/place.py
+++ b/django_lostplaces/lostplaces/models/place.py
@@ -72,7 +72,7 @@ class PlaceAsset(Submittable):
        null=True
    )

-class PlaceImage (PlaceAsset):
+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.
@@ -138,4 +138,4 @@ def auto_delete_file_on_change(sender, instance, **kwargs):
    new_file = instance.filename
    if not old_file == new_file:
        if os.path.isfile(old_file.path):
-            os.remove(old_file.path)
+            os.remove(old_file.path)
--- a/django_lostplaces/lostplaces/static/images/missing_image.png
+++ b/django_lostplaces/lostplaces/static/images/missing_image.png
--- a/django_lostplaces/lostplaces/static/main.css
+++ b/django_lostplaces/lostplaces/static/main.css
@@ -862,9 +862,10 @@ body {
    margin: 0 3px; }

 .LP-PlaceTeaser {
-  width: 100%; }
+  width: 280px; }
  .LP-PlaceTeaser .LP-PlaceTeaser__Image {
-    width: 100%;
+    height: 165px;
+    width: 280px;
    overflow: hidden; }
    .LP-PlaceTeaser .LP-PlaceTeaser__Image .LP-Image {
      max-width: unset;
@@ -872,8 +873,6 @@ body {
      object-fit: cover; }
  .LP-PlaceTeaser .LP-PlaceTeaser__Meta {
    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
    align-items: center;
    justify-content: space-between;
    padding: 5px;
@@ -884,30 +883,19 @@ body {
      padding: 0;
      margin: 0;
      margin-top: 5px;
-      font-size: 1.3rem; }
+      font-size: 0.9rem; }
    .LP-PlaceTeaser .LP-PlaceTeaser__Meta .LP-Headline {
      font-family: "Montserrat", Helvetica, sans-serif;
      color: #565656;
-      font-size: 2rem;
+      font-size: 1rem;
      padding: 0px;
      margin: 0px; }
-    .LP-PlaceTeaser .LP-PlaceTeaser__Meta .LP-Icon {
-      height: 2em;
-      width: 2em; }
  .LP-PlaceTeaser .LP-PlaceTeaser__Description {
    font-family: "Montserrat", Helvetica, sans-serif;
    color: #565656;
-    order: 3;
-    flex-basis: 100%; }
-    .LP-PlaceTeaser .LP-PlaceTeaser__Description .LP-Paragraph {
-      font-size: 22px; }
+    display: none; }

@media (min-width: 650px) {
-  .LP-PlaceTeaser {
-    width: 280px; }
-    .LP-PlaceTeaser__Image {
-      width: 280px;
-      height: 165px; }
  .LP-PlaceTeaser--extended {
    display: flex;
    flex-direction: row;
@@ -916,15 +904,12 @@ body {
    height: 165px; }
    .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta {
      margin: 0;
+      padding: 5px;
      padding-left: 25px;
      display: flex;
-      flex-wrap: nowrap;
      flex-direction: column;
      justify-content: space-between;
-      align-items: flex-start;
-      gap: unset; }
-      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-Headline, .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-Paragraph {
-        font-size: unset; }
+      align-items: flex-start; }
      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Info .LP-Headline {
        font-size: 28px; }
      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Icons {
@@ -932,16 +917,10 @@ body {
        .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Icons ul {
          padding: 0;
          margin: 0; }
-      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-Icon {
-        height: 20px;
-        width: 20px; }
    .LP-PlaceTeaser--extended .LP-PlaceTeaser__Description {
      display: block;
      max-height: 55px;
-      overflow: hidden;
-      order: unset; }
-      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Description .LP-Paragraph {
-        font-size: unset; }
+      overflow: hidden; }
    .LP-PlaceTeaser--extended .LP-PlaceTeaser__Image {
      height: 165px;
      width: 280px;
@@ -1027,31 +1006,6 @@ body {
  .LP-MessageList .LP-MessageList__Item {
    margin: 5px 0; }

-.LP-UserInfo {
-  display: flex;
-  flex-direction: column;
-  background-color: #D7CEC7;
-  max-width: 400px;
-  width: 100%;
-  min-width: 300px; }
-  .LP-UserInfo__UserName {
-    background-color: #C09F80; }
-    .LP-UserInfo__UserName .LP-Headline {
-      color: black;
-      padding: 0;
-      margin: 0;
-      text-align: center;
-      padding: 5px;
-      font-size: 25px; }
-  .LP-UserInfo__Meta {
-    padding: 5px; }
-    .LP-UserInfo__Meta * {
-      font-family: "Montserrat", Helvetica, sans-serif;
-      font-size: 18px; }
-    .LP-UserInfo__Meta .LP-UserInfo__Key {
-      padding-right: 25px;
-      font-weight: bold; }
-
 .LP-Header {
  display: flex;
  align-items: center;
@@ -1115,9 +1069,7 @@ body {
    box-shadow: 0 0 2px #565656; }

 .LP-PlaceList .LP-PlaceList__List {
-  list-style-type: none;
-  padding: 0;
-  margin: 0; }
+  list-style-type: none; }
  .LP-PlaceList .LP-PlaceList__List .LP-Link .LP-Place:hover {
    color: #565656;
    background-color: #f9f9f9;
@@ -1128,10 +1080,6 @@ body {
  .LP-PlaceList .LP-PlaceList__List .LP-PlaceList__Item {
    max-width: 900px;
    margin: 18px 0; }
-    @media (max-width: 750px) {
-      .LP-PlaceList .LP-PlaceList__List .LP-PlaceList__Item {
-        width: 100%;
-        margin-bottom: 35px; } }

 .LP-PlaceList .LP-Pagination {
  margin-top: 50px; }
@@ -1713,18 +1661,6 @@ body {
    padding: .5em;
    border-radius: 2px; }

-.LP-UserProfile {
-  display: flex;
-  flex-direction: row; }
-  .LP-UserProfile__Bio {
-    flex-grow: 5;
-    flex-shrink: 10;
-    padding-right: 35px; }
-  .LP-UserProfile__Info {
-    flex-grow: 10;
-    flex-shrink: 1;
-    flex-basis: max-content; }
-
 .LP-MainContainer {
  margin: 0 auto;
  max-width: 1280px; }
@@ -1737,9 +1673,8 @@ body {
    width: 100%; } }

 .LP-PlaceDetail .LP-PlaceDetail__Image {
-  max-width: 700px;
+  width: 700px;
  max-height: 500px;
-  width: 50%;
  box-shadow: 0 0 10px #565656;
  box-shadow: 0 0 10px #565656;
  object-fit: cover;
@@ -1747,16 +1682,15 @@ body {
  margin: 0;
  padding: 0;
  float: right;
-  margin-left: 25px;
-  margin-bottom: 25px;
-  margin-right: 25px;
+  margin-left: 35px;
+  margin-bottom: 35px;
+  margin-right: 35px;
  overflow: hidden; }

-@media (max-width: 750px) {
+@media (max-width: 1000px) {
  .LP-PlaceDetail .LP-PlaceDetail__Header .LP-PlaceDetail__Image {
    float: none;
    width: 100%;
-    max-width: unset;
    height: auto;
    margin: 0;
    padding: 0;
--- a/django_lostplaces/lostplaces/templates/403.html
+++ b/django_lostplaces/lostplaces/templates/403.html
@@ -1,7 +1,7 @@
 {% extends 'global.html'%}
 {% load i18n %}

-{% block title %}{% translate 'Forbidden' %}{% endblock %}
+{% block title %}{% trans 'Forbidden' %}{% endblock %}

 {% block additional_head %}
 {% if request.META.HTTP_REFERER %}
@@ -11,6 +11,6 @@

 {% block maincontent %}
 {% if request.META.HTTP_REFERER %}
-    <p class="LP-Headline">{% translate 'You will be redirected in 5 seconds' %}</p><p class="LP-Headline"><a href="{{ request.META.HTTP_REFERER }}" class="LP-Link">{% translate '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 %}
--- a/django_lostplaces/lostplaces/templates/explorer/profile.html
+++ b/django_lostplaces/lostplaces/templates/explorer/profile.html
@@ -1,92 +0,0 @@
-{% extends 'global.html'%}
-{% load static %}
-{% load i18n %}
-
-{% load svg_icon %}
-
-{% block maincontent %}
-
-<div class="LP-UserProfile">
-    <div class="LP-UserProfile__Info">
-        <div class="LP-UserInfo">
-            <div class="LP-UserInfo__UserName">
-                <h1 class="LP-Headline">{{explorer.user.username}}</h1>
-            </div>
-            <div class="LP-UserInfo__Meta">
-                <table>
-                    <tr>
-                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% translate 'Joined' %}</span>
-                        </td>
-                        <td class="LP-UserInfo__Value">
-                            <span class="LP-Paragraph">{{explorer.user.date_joined|date:'d.m.Y'}}</span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% translate 'Places'%}</span>
-                        </td>
-                        <td class="LP-UserInfo__Value">
-                            <span class="LP-Paragraph">{{place_count}}</span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% translate 'Place Assets'%}</span>
-                        </td>
-                        <td class="LP-UserInfo__Value">
-                            <span class="LP-Paragraph">{{asset_count}}</span>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-
-<section class="LP-Section">
-	<div class="LP-PlaceList">
-		<h1 class="LP-Headline">{% translate 'Places submitted by' %} {{explorer.user.username}}</h1>
-		<ul class="LP-PlaceList__List">
-			{% for place in place_list %}
-			<li class="LP-PlaceList__Item">
-				<a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-					{% include 'partials/place_teaser.html' with place=place extended=True %}
-				</a>
-			</li>
-			{% endfor %}
-		</ul>
-
-		{% include 'partials/nav/pagination.html' %}
-
-	</div>
-</section>
-
-<section class="LP-Section">
-	{% translate 'Images submitted by' as submitted_by %}
-	{% include 'partials/placeImageGrid.html' with headline=submitted_by|add:' '|add:explorer.user.username image_list=assets.placeimages.all%}
-</section>
-
-<section class=" LP-Section">
-	<h1 class="LP-Headline">{% translate 'Photo albums submitted by' %} {{explorer.user.username}}</h1>
-	<div class="LP-LinkList">
-		<ul class="LP-LinkList__Container">
-			{% for photo_album in assets.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%}
-				<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" %}
-					</div>
-				</a>
-				{% endif %}
-			</li>
-			{% endfor %}
-		</ul>
-	</div>
-</section>
-
-{% endblock maincontent %}
--- a/django_lostplaces/lostplaces/templates/global.html
+++ b/django_lostplaces/lostplaces/templates/global.html
@@ -29,16 +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">{% translate 'Logout' %}</span></a> |
-					<a class="LP-Link" href="{% url 'explorer_profile' explorer_id=user.pk%}"><span class="LP-Link__Text">{% translate 'Profile' %}</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">{% translate '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">{% translate 'Login' %}</span></a> |
-                    <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% translate 'Sign up' %}</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>
@@ -48,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">{% translate 'Home' %}</span></a></li>
-                    <li class="LP-Menu__Item"><a href="{% url 'flatpage' slug='codex' %}" class="LP-Link"><span class="LP-Link__Text">{% translate '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">{% translate '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">{% translate '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>
--- a/django_lostplaces/lostplaces/templates/home.html
+++ b/django_lostplaces/lostplaces/templates/home.html
@@ -7,7 +7,7 @@
 <script src="{% static 'maps/ol.js' %}"></script>
 {% endblock additional_head %}

-# {% block title %}{% translate 'Home' %}{% endblock %}
+# {% block title %}{% trans 'Home' %}{% endblock %}

 {% block maincontent %}

@@ -17,12 +17,33 @@

 {% include 'partials/osm_map.html' with config=mapping_config %}
 <div class="LP-PlaceGrid">
-    <h1 class="LP-Headline LP-Headline">{% translate 'Explore the latest places' %}</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">
            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-                {% include 'partials/place_teaser.html' with place=place%}
+                <article class="LP-PlaceTeaser">
+                    <div class="LP-PlaceTeaser__Image">
+                        <img class="LP-Image" src="{{ place.placeimages.first.filename.thumbnail.url}}" />
+                    </div>
+                    <div class="LP-PlaceTeaser__Meta">
+                        <div class="LP-PlaceTeaser__Info">
+                            <span class="LP-PlaceTeaser__Title">
+                                <h1 class="LP-Headline LP-Headline--teaser">{{place.name|truncatechars:19}}</h1>
+                            </span>
+                            <span class="LP-PlaceTeaser__Detail">
+                                <p class="LP-Paragraph">{{place.location|truncatechars:25}}</p>
+                            </span>
+                        </div>
+                        <div class="LP-PlaceTeaser__Icons">
+                            <ul class="LP-Icon__List">
+                                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
+                                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/location.svg' %}" /></li>
+                                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/flag.svg' %}" /></li>
+                            </ul>
+                        </div>
+                    </div>
+                </article>
            </a>
        </li>
        {% endfor %}
--- a/django_lostplaces/lostplaces/templates/home_unauth.html
+++ b/django_lostplaces/lostplaces/templates/home_unauth.html
@@ -8,23 +8,23 @@
 {% include 'partials/welcome.html' %}
 <article class="LP-TextSection">
    <p class="LP-Paragraph">
-        {% blocktranslate %}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.{% endblocktranslate %}
+        {% 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">
-        {% blocktranslate %}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.{% endblocktranslate %}
+        {% 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">{% translate 'Explore the latest places' %}</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">
            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
                <article class="LP-PlaceTeaser">
                    <div class="LP-PlaceTeaser__Image">
-						{% include 'partials/image.html' with source_url=place.placeimages.first.filename.thumbnail.url %}
+                        <img class="LP-Image" src="{{ place.placeimages.first.filename.thumbnail.url}}" />
                    </div>
                    <div class="LP-PlaceTeaser__Meta">
                        <div class="LP-PlaceTeaser__Info">
--- a/django_lostplaces/lostplaces/templates/partials/form/submit.html
+++ b/django_lostplaces/lostplaces/templates/partials/form/submit.html
@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="LP-Form__Field LP-Form__Button LP-Input">
-    <button class="LP-Button">{% if action %}{{ action }}{% else %}{% translate 'Submit' %}{% endif %}</button>
+    <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">{% translate 'Cancel' %}</button>
+        <button type="button" class="LP-Button LP-Button--cancel">{% trans 'Cancel' %}</button>
    </a>
 </div>
--- a/django_lostplaces/lostplaces/templates/partials/image.html
+++ b/django_lostplaces/lostplaces/templates/partials/image.html
@@ -1,18 +0,0 @@
-{% if link_url %}
-	<a
-		class="LP-Link"
-		href="{{link_url}}"
-	>
-{% endif %}
-	<figure class="LP-Figure">
-		<img 
-			src="{{ source_url }}"
-			{% if alt_text %}
-				alt="{{alt_text}}"
-			{% else %}
-				alt="{{block}}"
-			{% endif %}
-			class="LP-Image" 
-		/>
-	</figure>
-{% if link_url %}</a>{% endif %}
--- a/django_lostplaces/lostplaces/templates/partials/nav/footer.html
+++ b/django_lostplaces/lostplaces/templates/partials/nav/footer.html
@@ -61,13 +61,13 @@
    <!-- Bottom section with last line of text and links. -->
    <section class="LP-Footer__BottomSection LP-Footer__Flex">
        <div class="LP-Footer__BottomWrapper">   
-            {% translate 'Made by' %} <a href="https://git.mowoe.com/reverend" class="LP-Footer__GenericAnchor">Reverend</a> 
-            {% translate 'and' %} <a href="https://www.commander1024.de" class="LP-Footer__GenericAnchor">Commander1024.</a></span>
+            {% 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">{% translate '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">{% translate 'Imprint' %}</a>
+            <a href="{% url 'flatpage' slug='imprint' %}" class="LP-Footer__GenericAnchor">{% trans 'Imprint' %}</a>
        </div>
    </section>
 </footer>
--- a/django_lostplaces/lostplaces/templates/partials/nav/pagination.html
+++ b/django_lostplaces/lostplaces/templates/partials/nav/pagination.html
@@ -8,26 +8,26 @@
            <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--first">
                <a href="?page=1" class="LP-Link">
                    <span class="LP-Icon">⟪</span>
-                    <span class="LP-Text">{% translate '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">{% translate '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">{% translate '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">{% translate 'Previous' %}</span>
+                        <span class="LP-Text">{% trans 'Previous' %}</span>
                    </a>
                </li>
            {% endif %}
@@ -47,25 +47,25 @@
            {% if page_obj.has_next %}
            <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--next">
                <a href="?page={{ page_obj.next_page_number }}" class="LP-Link">
-                    <span class="LP-Text">{% translate '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">{% translate '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">{% translate '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">{% translate 'Last' %}</span>
+                    <span class="LP-Text">{% trans 'Last' %}</span>
                    <span class="LP-Icon">⟫</span>
                </a>
            </li>
--- a/django_lostplaces/lostplaces/templates/partials/placeImageGrid.html
+++ b/django_lostplaces/lostplaces/templates/partials/placeImageGrid.html
@@ -1,21 +0,0 @@
-	{% load static %}
-	
-	{% if headline %}
-	<h1 class="LP-Headline">{{headline}}</h1>
-	{% endif %}
-	<div class="LP-ImageGrid">
-		<ul class="LP-ImageGrid__Container">
-		{% for image in image_list %}
-			<li class="LP-ImageGrid__Item">
-				{% include 'partials/image.html' with source_url=image.filename.thumbnail.url link_url=image.filename.large.url %}
-			{% if user.explorer == image.submitted_by%}
-				<span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
-					<a href="{% url 'place_image_delete' pk=image.id %}" class="LP-Link">
-						<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
-					</a>
-				</span>
-			{% endif %}
-			</li>
-		{% endfor %}
-		</ul>
-	</div>
--- a/django_lostplaces/lostplaces/templates/partials/place_teaser.html
+++ b/django_lostplaces/lostplaces/templates/partials/place_teaser.html
@@ -1,37 +0,0 @@
-{%load static %}
-
-<article class="LP-PlaceTeaser {% if extended %} LP-PlaceTeaser--extended{% endif %}">
-    <div class="LP-PlaceTeaser__Image">
-        {% if place.placeimages.all|length > 0 %}
-			{% include 'partials/image.html' with source_url=place.placeimages.first.filename.thumbnail.url %}
-        {% else %}
-            <img class="LP-Image" src="{% static 'images/missing_image.png' %}" />
-        {% endif %}
-    </div>
-    <div class="LP-PlaceTeaser__Meta">
-        <div class="LP-PlaceTeaser__Info">
-            <span class="LP-PlaceTeaser__Title">
-                <h1 class="LP-Headline LP-Headline--teaser">{{place.name|truncatechars:19}}</h1>
-            </span>
-            <span class="LP-PlaceTeaser__Detail">
-                <p class="LP-Paragraph">{{place.location|truncatechars:25}}</p>
-            </span>
-        </div>
-        <div class="LP-PlaceTeaser__Description">
-            <p class="LP-Paragraph">
-                {% if place.description|length > 210 %}
-                    {{place.description|truncatechars:210|truncatewords:-1}}
-                {% else %}
-                    {{place.description}}
-                {% endif %}
-            </p>
-        </div>
-        <div class="LP-PlaceTeaser__Icons">
-            <ul class="LP-Icon__List">
-                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
-                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/location.svg' %}" /></li>
-                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/flag.svg' %}" /></li>
-            </ul>
-        </div>
-    </div>
-</article>
--- a/django_lostplaces/lostplaces/templates/partials/tagging.html
+++ b/django_lostplaces/lostplaces/templates/partials/tagging.html
@@ -27,11 +27,11 @@

 <form id="id_tag_submit_form" class="LP-Form LP-Form--inline LP-Form--tagging" method="POST" action="{% url config.submit_url_name tagged_id=config.tagged_item.id%}">
    <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% translate 'Add tags' %}</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">{% translate 'Add tags' %}</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" %}
--- a/django_lostplaces/lostplaces/templates/partials/welcome.html
+++ b/django_lostplaces/lostplaces/templates/partials/welcome.html
@@ -1,21 +1,21 @@
 {% load i18n %}

 <header class="LP-TextSection__Headline">
-    <h1 class="LP-Headline">{% translate 'Start' %}</h1>
+    <h1 class="LP-Headline">{% trans 'Start' %}</h1>
 </header>

 <div class="LP-TextSection__Text">
-    <p class="LP-Paragraph">{% translate '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 %}
-            {% translate 'explorer' %}
+            {% trans 'explorer' %}
        {% endif %}
        !
    </p>
    <p class="LP-Paragraph">
-        {% translate 'We strictly follow our' %} 
-        <a class="LP-Link" href="{% url 'flatpage' slug='codex' %}"><span class="LP-Link__Text">{% translate 'UrBex codex' %}</span></a>
-        {% translate 'and expect you to do so, too.' %}'
+        {% 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>
--- a/django_lostplaces/lostplaces/templates/photo_album/photo_album_create.html
+++ b/django_lostplaces/lostplaces/templates/photo_album/photo_album_create.html
@@ -1,19 +1,19 @@
 {% extends 'global.html'%}
 {% load i18n %}

-{% block title %}{% translate '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">{% translate '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">{% translate '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">{% translate '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">
--- a/django_lostplaces/lostplaces/templates/place/place_create.html
+++ b/django_lostplaces/lostplaces/templates/place/place_create.html
@@ -2,12 +2,12 @@
 {% load static %}
 {% load i18n %}

-# {% block title %}{% translate 'Create place' %}{% 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">{% translate '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">
@@ -39,7 +39,7 @@
            </div>
        </div>

-        {% translate 'Create' as action %}
+        {% trans 'Create' as action %}
        <div class="LP-Form__Composition LP-Form__Composition--buttons">
            {% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER action=action %}
        </div>
--- a/django_lostplaces/lostplaces/templates/place/place_delete.html
+++ b/django_lostplaces/lostplaces/templates/place/place_delete.html
@@ -2,21 +2,21 @@
 {% load static %}
 {% load i18n %}

-{% block title %}{% translate 'Delete lost place' %}{% 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">{% translate '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">{% blocktranslate with place_name=place.name%}Are you sure you want to delete {{place_name}}?{% endblocktranslate %}</p>
+                <p class="LP-Paragraph">{% trans 'Are you sure you want to delete' %} "{{place.name}}"?</p>
            </div>
        </div>
        
-        {% translate 'Delete' as action %}
+        {% trans 'Delete' as action %}
        <div class="LP-Form__Composition LP-Form__Composition--buttons">
            {% include 'partials/form/submit.html' with referer=request.META.HTTP_REFERER action=action %}
        </div>
--- a/django_lostplaces/lostplaces/templates/place/place_detail.html
+++ b/django_lostplaces/lostplaces/templates/place/place_detail.html
@@ -16,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">{% translate 'Edit place' %}</span></a></li>
-<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_delete' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">{% translate 'Delete place' %}</span></a></li>
+<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 %}
@@ -26,11 +26,9 @@
    <header class="LP-PlaceDetail__Header">
        <h1 class="LP-Headline">{{ place.name }}</h1>
        {% if place.placeimages.first.filename.hero.url %}
-        <div class="LP-PlaceDetail__Image">
-			{% partial image %}
-				{% set source_url place.placeimages.first.filename.hero.url %}
-			{% endpartial %}
-        </div>
+        <figure class="LP-PlaceDetail__Image">
+            <img src="{{ place.placeimages.first.filename.hero.url }}" class="LP-Image" />
+        </figure>
        {% endif %}
    </header>

@@ -39,17 +37,13 @@
    </div>

    <section class="LP-Section">
-
        {% url 'place_tag_submit' place_id=place.id as tag_submit_url%}
-		{% partial tagging %}
-			{% set config=tagging_config %}
-		{% endpartial %}
-
+        {% include 'partials/tagging.html' with config=tagging_config %}
    </section>

    <section class="LP-Section">
-        <h1 class="LP-Headline">{% translate 'Map links' %}</h1>
-        {% partial osm_map config=mapping_config %}
+        <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|safe}},{{place.longitude|safe}}" class="LP-Link"><span class="LP-Text">Google Maps</span></a></li>
@@ -60,7 +54,7 @@
    </section>

    <section class=" LP-Section">
-        <h1 class="LP-Headline">{% translate '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.photoalbums.all %}
@@ -68,7 +62,8 @@
                    <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" %}
@@ -86,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">{% translate 'Add photo album' %}</span>
+                            <span class="RV-Iconized__Text">{% trans 'Add photo album' %}</span>
                        </div>
                    </a>
                </li>
@@ -95,8 +90,31 @@
    </section>

    <section class="LP-Section">
-		{% translate 'Images' as headline %}
-		{% partial "placeImageGrid" image_list=place.placeimages.all %}
+        <h1 class="LP-Headline">{% trans 'Images' %}</h1>
+        <div class="LP-ImageGrid">
+            <ul class="LP-ImageGrid__Container">
+                {% for place_image in place.placeimages.all %}
+                <li class="LP-ImageGrid__Item">
+                    <a href="{{ place_image.filename.large.url }}" class="LP-Link">
+                        <img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
+                    </a>
+                    {% 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>

 </article>
--- a/django_lostplaces/lostplaces/templates/place/place_list.html
+++ b/django_lostplaces/lostplaces/templates/place/place_list.html
@@ -7,18 +7,48 @@
 <script src="{% static 'maps/ol.js' %}"></script>
 {% endblock additional_head %}

-{% block title %}{% translate 'All 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">{% translate 'Our lost 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">
            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-                {% include 'partials/place_teaser.html' with place=place extended=True %}
+                <article class="LP-PlaceTeaser LP-PlaceTeaser--extended">
+                    <div class="LP-PlaceTeaser__Image">
+                        <img class="LP-Image" src="{{ place.placeimages.first.filename.thumbnail.url }}" />
+                    </div>
+                    <div class="LP-PlaceTeaser__Meta">
+                        <div class="LP-PlaceTeaser__Info">
+                            <span class="LP-PlaceTeaser__Title">
+                                <h2 class="LP-Headline LP-Headline--teaser">{{place.name}}</h2>
+                            </span>
+                            <span class="LP-PlaceTeaser__Detail">
+                                <p class="LP-Paragraph">{{place.location}}</p>
+                            </span>
+                        </div>
+                        <div class="LP-PlaceTeaser__Description">
+                            <p class="LP-Paragraph">
+                                {% if place.description|length > 210 %}
+                                {{place.description|truncatechars:210|truncatewords:-1}}
+                                {% else %}
+                                {{place.description}}
+                                {% endif %}
+                            </p>
+                        </div>
+                        <div class="LP-PlaceTeaser__Icons">
+                            <ul class="LP-Icon__List">
+                                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
+                                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/location.svg' %}" /></li>
+                                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/flag.svg' %}" /></li>
+                            </ul>
+                        </div>
+                    </div>
+                </article>
            </a>
        </li>
        {% endfor %}
--- a/django_lostplaces/lostplaces/templates/place/place_update.html
+++ b/django_lostplaces/lostplaces/templates/place/place_update.html
@@ -2,12 +2,12 @@
 {% load static %}
 {% load i18n %}

-# {% block title %}{% translate 'Edit 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">{% translate 'Edit 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">
@@ -39,7 +39,7 @@
            </div>
        </div>
        
-        {% translate 'Update' as action %}
+        {% trans 'Update' as action %}
        <div class="LP-Form__Composition LP-Form__Composition--buttons">
            {% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER action=action %}
        </div>
--- a/django_lostplaces/lostplaces/templates/place_image/place_image_create.html
+++ b/django_lostplaces/lostplaces/templates/place_image/place_image_create.html
@@ -4,7 +4,7 @@
 {% block maincontent %}
 <form class="LP-Form" method="POST" enctype="multipart/form-data">
    <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% translate 'Submit images to a place' %}</legend>
+        <legend class="LP-Form__Legend">{% trans 'Submit images to a place' %}</legend>
        {% csrf_token %}

        <div class="LP-Form__Composition">
--- a/django_lostplaces/lostplaces/templates/registration/login.html
+++ b/django_lostplaces/lostplaces/templates/registration/login.html
@@ -1,13 +1,13 @@
 {% extends 'global.html'%}
 {% load static %}
 {% load i18n %}
-# {% block title %}{% translate 'Login' %}{% endblock %}
+# {% 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">{% translate '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">{% translate 'Login' %}</button>
+				<button class="LP-Button">{% trans 'Login' %}</button>
 			</div>
 		</div>
    </fieldset>
 </form>

-<p class="LP-Headline">{% translate 'No account, yet?' %} <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% translate 'Sign up' %}</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 %}
--- a/django_lostplaces/lostplaces/templates/signup.html
+++ b/django_lostplaces/lostplaces/templates/signup.html
@@ -3,13 +3,13 @@
 {% load i18n %}
 {% load widget_tweaks %}

-# {% block title %}{% translate 'Sign up' %}{% 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">{% translate 'Sign up' %}</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">
@@ -38,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">{% translate 'Sign up' %}</button>
+                <button class="LP-Button">{% trans 'Sign Up' %}</button>
            </div>
        </div>
    </fieldset>
--- a/django_lostplaces/lostplaces/templatetags/lostplaces.py
+++ b/django_lostplaces/lostplaces/templatetags/lostplaces.py
@@ -6,15 +6,6 @@ from django.http import request

 register = template.Library()

-def remove_formatting(string):
-    for to_strip in ["'", '"', ' ']:
-        string = string.strip(to_strip)
-        
-    for to_remove in ['\t', '\n',]:
-        string = string.replace(to_remove, '')
-        
-    return string
-
@register.filter(name='proper_paginate')
 def proper_paginate(paginator, current_page, neighbors=2):
    if paginator.num_pages > 2*neighbors:
@@ -34,80 +25,12 @@ def proper_paginate(paginator, current_page, neighbors=2):
        return page_list[:(2*neighbors + 1)]
    return paginator.page_range

-
-class VariableNode(template.Node):
-    def __init__(self, name, content=None):
-        if content==None and '=' in name:
-            self.content = name.split('=')[1]
-            self.name = name.split('=')[0]
-        else:
-            self.content = content
-            self.name = name
-        
-    def render(self, context):
-        if type(self.content) is not str:
-            self.content = self.content.render(context)
-        
-        self.content = remove_formatting(self.content)
-        
-        self.content = template.Variable(self.content).resolve(context)
-        
-        context[self.name] = self.content
-        return ''
-
-class PartialNode(template.Node):
-    def __init__(self, name, block):
-        self.name = remove_formatting(name)
-        self.block = block
-        
-    def render(self, context):
-        if type(self.block) is template.NodeList:
-               self.block = self.block.render(context)
-        
-        self.block = remove_formatting(self.block)
-        
-        context = context.flatten()
-        context['block'] = self.block
-        t = template.loader.get_template('partials/%s.html' % self.name)
-        return t.render(context)
-
-@register.tag(name='set')
-def set_block(parser, token):
-    split = token.split_contents()
-    if len(split) >= 1:
-        variable_name = split[1]
+@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:
-        raise template.TemplateSyntaxError('%r expects a variable name' % split[0])
-            
-    if len(split) == 2:
-        content=None
-        if '=' not in variable_name:
-            content = parser.parse(('end%s'%split[0],))
-        parser.delete_first_token()
-        return VariableNode(variable_name, content)
-    else:
-        return VariableNode(variable_name, split[2])
-
-@register.tag(name='partial')
-def partial(parser, token):
-    split = token.split_contents()
-    if len(split) >= 1:
-        partial_name = split[1]
-    else:
-        raise template.TemplateSyntaxError('%r expects a partial name' % split[0])
-    
-    if len(split) == 2:
-        nodeList = parser.parse(('end%s'%split[0],))
-        parser.delete_first_token()
-        return PartialNode(partial_name, nodeList)
-    else:
-        nodeList = template.NodeList()
-        for parameter in split[2:]:
-            if '=' in parameter:
-                nodeList.append(
-                    VariableNode(name=parameter)
-                )
-            else:
-                raise template.TemplateSyntaxError('%r expects kwargs, got args' % split[0])
-        return PartialNode(partial_name, nodeList)
-    
+        return False
--- a/django_lostplaces/lostplaces/urls.py
+++ b/django_lostplaces/lostplaces/urls.py
@@ -15,8 +15,7 @@ from lostplaces.views import (
 	PhotoAlbumDeleteView,
    PlaceImageCreateView,
    PlaceImageDeleteView,
-    FlatView,
-    ExplorerProfileView
+    FlatView
 )

 urlpatterns = [
@@ -34,7 +33,5 @@ urlpatterns = [

    # POST-only URLs for tag submission
 	path('place/tag/<int:tagged_id>', PlaceTagSubmitView.as_view(), name='place_tag_submit'),
-    path('place/tag/delete/<int:tagged_id>/<int:tag_id>', PlaceTagDeleteView.as_view(), name='place_tag_delete'),
-    
-    path('explorer/<int:explorer_id>/', ExplorerProfileView.as_view(), name='explorer_profile')
+    path('place/tag/delete/<int:tagged_id>/<int:tag_id>', PlaceTagDeleteView.as_view(), name='place_tag_delete')
 ]
--- a/django_lostplaces/lostplaces/views/init.py
+++ b/django_lostplaces/lostplaces/views/init.py
@@ -4,5 +4,4 @@
 from lostplaces.views.base_views import *
 from lostplaces.views.views import * 
 from lostplaces.views.place_views import *
-from lostplaces.views.place_image_views import *
-from lostplaces.views.explorer_views import *
+from lostplaces.views.place_image_views import *
--- a/django_lostplaces/lostplaces/views/explorer_views.py
+++ b/django_lostplaces/lostplaces/views/explorer_views.py
@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from django.views import View
-
-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.common import get_all_subclasses
-from lostplaces.views.base_views import IsAuthenticatedMixin
-from lostplaces.models.models import Explorer
-from lostplaces.models.place import Place, PlaceAsset
-
-class ExplorerProfileView(IsAuthenticatedMixin, View):
-    def get(self, request, explorer_id):
-        explorer = get_object_or_404(Explorer, pk=explorer_id)
-        place_list = Place.objects.filter(submitted_by=explorer)
-        place_count = place_list.count()
-
-        context={
-            'explorer': explorer,
-            'place_count': place_count,
-            'place_list': place_list,
-            'assets': {}
-        }
-
-        asset_count = 0
-        for subclass in get_all_subclasses(PlaceAsset): # kinda ugly, but PlaceAsset cannot be abstract according to django ORM
-            objects = subclass.objects.filter(submitted_by=explorer)
-            context['assets'][subclass.__name__.lower()+'s'] = objects
-            asset_count += objects.count()
-        
-        context['asset_count'] = asset_count
-        
-        print(context['assets'])
-        
-        return render(
-            request=request,
-            template_name='explorer/profile.html',
-            context=context
-        )
-        
-        
--- a/django_lostplaces/lostplaces/views/place_image_views.py
+++ b/django_lostplaces/lostplaces/views/place_image_views.py
@@ -38,5 +38,5 @@ class PlaceImageCreateView(MultiplePlaceImageUploadMixin, PlaceAssetCreateView):
        
 class PlaceImageDeleteView(PlaceAssetDeleteView):
    model = PlaceImage
-    success_message = _('Image deleted successfully')
+    success_message = _('Image(s) deleted successfully')
    permission_denied_message = _('You are not allowed to delete this image')
--- a/django_lostplaces/lostplaces/views/place_views.py
+++ b/django_lostplaces/lostplaces/views/place_views.py
@@ -60,7 +60,7 @@ class PlaceUpdateView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, SuccessMessag
    model = Place
    form_class = PlaceForm
    success_message = _('Successfully updated place')
-    place_submitter_error_message = _('You are not allowed to edit this 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})
@@ -102,7 +102,7 @@ class PlaceCreateView(MultiplePlaceImageUploadMixin, IsAuthenticatedMixin, View)
            # Usually the browser should have checked the form before sending.
            messages.error(
                self.request,
-                _('Please fill in all required fields.')
+                'Please fill in all required fields.'
            )
            return render(request, 'place/place_create.html', context={'form': place_form})

@@ -111,7 +111,7 @@ class PlaceDeleteView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, DeleteView):
    model = Place
    success_message = _('Successfully deleted place')
    success_url = reverse_lazy('place_list')
-    place_submitter_error_message = _('You are not allowed 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)
--- a/django_lostplaces/lostplaces/views/views.py
+++ b/django_lostplaces/lostplaces/views/views.py
@@ -51,13 +51,13 @@ class PhotoAlbumCreateView(PlaceAssetCreateView):
    model = PhotoAlbum
    fields = ['url', 'label']
    template_name = 'photo_album/photo_album_create.html'
-    success_message = _('Photo album link submitted')
+    success_message = _('Photo Album submitted')

 class PhotoAlbumDeleteView(PlaceAssetDeleteView):
    model = PhotoAlbum
    pk_url_kwarg = 'pk'
-    success_message = _('Photo album link deleted')
-    permission_denied_messsage = _('You are not allowed to edit this photo album link')
+    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):
--- a/django_lostplaces/setup.cfg
+++ b/django_lostplaces/setup.cfg
@@ -0,0 +1,8 @@
+# Config options for coverage
+# Docs: https://coverage.readthedocs.io/en/latest/config.html
+
+[coverage:run]
+source = .
+
+[coverage:report]
+show_missing = True
--- a/django_lostplaces/setup.py
+++ b/django_lostplaces/setup.py
@@ -1,19 +1,19 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-

 from setuptools import setup, find_packages

-with open('../Readme.md') as f:
+with open('Readme.md') as f:
    readme = f.read()

 setup(
    name='django-lostplaces',
-    version='0.1.3',
+    version='0.1.2 HotFix',
    description='A django app to manage lost places',
    author='Reverend',
    author_email='reverend@reverend2048.de',
    url='https://git.mowoe.com/reverend/lostplaces-backend',
-    packages=find_packages(exclude=['django_lostplaces']),
+    packages=find_packages(exclude=['lostplaces']),
 	long_description=readme,
 	long_description_content_type='text/markdown',
    classifiers=[
@@ -31,6 +31,5 @@ setup(
        'django-widget-tweaks',
        'django-taggit'
    ],
-    include_package_data=True,
-    license='MIT'
+    include_package_data=True
 )