Updated translations (de).

Added Edit button to profile page.
Changed easy_thumbnails image/thumb deletion. Now working.
2020-12-25 16:07:50 +01:00 · 2020-12-25 16:00:29 +01:00 · 2020-12-25 15:42:02 +01:00 · 2020-12-25 14:29:38 +01:00 · 2020-12-25 14:06:53 +01:00 · 2020-12-25 13:19:34 +01:00
40 changed files with 776 additions and 417 deletions
--- a/django_lostplaces/lostplaces/admin.py
+++ b/django_lostplaces/lostplaces/admin.py
@@ -9,8 +9,6 @@ from django.contrib.auth.admin import UserAdmin
 from django.utils import timezone
 from lostplaces.models import *

-from lostplaces.forms import ExplorerCreationForm, ExplorerChangeForm
-
 # Register your models here.

 class VoucherAdmin(admin.ModelAdmin):
--- a/django_lostplaces/lostplaces/forms.py
+++ b/django_lostplaces/lostplaces/forms.py
@@ -8,12 +8,12 @@ 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
+from lostplaces.models import Place, PlaceImage, Voucher, Explorer

-class ExplorerCreationForm(UserCreationForm):
+class SignupVoucherForm(UserCreationForm):
    class Meta:
        model = User
-        fields = ('username', 'email')
+        fields = ('username', 'email', 'first_name', 'last_name')
    voucher = forms.CharField(
        max_length=30,
        help_text=_('The Voucher you got from an administrator')
@@ -35,10 +35,33 @@ class ExplorerCreationForm(UserCreationForm):
        fetched_voucher.delete()
        return True

-class ExplorerChangeForm(UserChangeForm):
+class ExplorerUserChangeForm(UserChangeForm):
    class Meta:
        model = User
-        fields = ('username', 'email')
+        fields = [ 'username', 'first_name', 'last_name', 'email' ]
+    ''' Hide password hint.'''
+    password = None
+
+    ''' Display username, but display it non-editable and not required. '''
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['username'].required = False
+        self.fields['username'].help_text = None
+        self.fields['username'].widget.attrs['disabled'] = 'disabled'
+    
+    def clean_username(self):
+        # As shown in the above answer.
+        instance = getattr(self, 'instance', None)
+        if instance:
+            return instance.username
+        else:
+            return self.cleaned_data.get('username', None)
+
+class ExplorerChangeForm(forms.ModelForm):
+    class Meta:
+        model = Explorer
+        fields = '__all__'
+        exclude = ['user', 'favorite_places']

 class PlaceForm(forms.ModelForm):
    class Meta:
--- 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-12-25 16:04+0100\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"
@@ -30,7 +30,7 @@ msgstr "Ungültiger Voucher"
 msgid "Expired voucher"
 msgstr "Abgelaufener Voucher"

-#: models/abstract_models.py:29
+#: models/abstract_models.py:29 templates/explorer/profile.html:31
 msgid "Name"
 msgstr "Name"

@@ -74,6 +74,22 @@ msgstr "Adresse (URL)"
 msgid "link text"
 msgstr "Linktext"

+#: models/models.py:47
+msgid "Biography"
+msgstr "Beschreibung"
+
+#: models/models.py:48
+msgid "Describe yourself, your preferences, etc. in a few sentences."
+msgstr "Beschreibe Dich selbst, Deine Vorlieben, usw. in ein paar Sätzen."
+
+#: models/models.py:56
+msgid "Profile image"
+msgstr "Profilbild"
+
+#: models/models.py:57
+msgid "Optional profile image for display in Explorer profile"
+msgstr "Optionales Profilbild zur Anzeige im Explorerprofil"
+
 #: models/place.py:21
 msgid "Location"
 msgstr "Ort"
@@ -110,38 +126,92 @@ msgstr "Du wirst in 5 Sekunden weitergeleitet"
 msgid "Go Back"
 msgstr "Zurück"

+#: templates/explorer/profile.html:41
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: templates/explorer/profile.html:52
+msgid "Joined"
+msgstr "Beigetreten"
+
+#: templates/explorer/profile.html:60
+#, fuzzy
+#| msgid "All Places"
+msgid "Places"
+msgstr "Alle Places"
+
+#: templates/explorer/profile.html:68
+msgid "Place assets"
+msgstr ""
+
+#: templates/explorer/profile.html:76
+#, fuzzy
+#| msgid "Edit Explorer profile"
+msgid "Edit Profile"
+msgstr "Explorerprofil bearbeiten"
+
+#: templates/explorer/profile.html:87
+msgid "Favorite places"
+msgstr "Favoriten"
+
+#: templates/explorer/profile.html:103
+msgid "Places submitted by"
+msgstr "Places hinzugefügt von"
+
+#: templates/explorer/profile.html:118
+msgid "Images submitted by"
+msgstr "Bilder hinzugefügt von"
+
+#: templates/explorer/profile.html:140
+msgid "Photo albums submitted by"
+msgstr "Fotoalben hinzugefügt von"
+
+#: templates/explorer/profile_update.html:6
+#: templates/explorer/profile_update.html:12
+msgid "Edit Explorer profile"
+msgstr "Explorerprofil bearbeiten"
+
+#: templates/explorer/profile_update.html:48
+#: templates/place/place_update.html:42
+msgid "Update"
+msgstr "Aktualisieren"
+
 #: templates/global.html:32
 msgid "Logout"
 msgstr "Ausloggen"

-#: templates/global.html:34
+#: templates/global.html:33
+msgid "Profile"
+msgstr "Profil"
+
+#: templates/global.html:35
 msgid "Admin"
 msgstr "Admin"

-#: templates/global.html:39 templates/registration/login.html:4
+#: templates/global.html:40 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:6 templates/signup.html:12 templates/signup.html:41
+#: templates/global.html:41 templates/registration/login.html:29
+#: templates/signup.html:6 templates/signup.html:12 templates/signup.html:49
 msgid "Sign up"
 msgstr "Registrieren"

-#: templates/global.html:50 templates/home.html:10
+#: templates/global.html:51 templates/home.html:10
 msgid "Home"
 msgstr "Startseite"

-#: templates/global.html:51
+#: templates/global.html:52
 msgid "UrBex Codex"
 msgstr "UrBex Codex"

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

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

@@ -194,6 +264,14 @@ msgstr "Abschicken"
 msgid "Cancel"
 msgstr "Abbrechen"

+#: templates/partials/icons/place_favorite.html:6
+msgid "Remove from favorites"
+msgstr "Aus den Favoriten entfernen"
+
+#: templates/partials/icons/place_favorite.html:10
+msgid "Save as favorite"
+msgstr "In den Favoriten speichern"
+
 #: templates/partials/nav/footer.html:64
 msgid "Made by"
 msgstr "Erstellt von"
@@ -318,10 +396,6 @@ msgstr "Alle Places"
 msgid "Our lost places"
 msgstr "Unsere Lost Places"

-#: 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"
@@ -334,6 +408,16 @@ msgstr "Noch kein Konto?"
 msgid "Please login to proceed"
 msgstr "Bitte log Dich ein um fortzufahren"

+#: views/explorer_views.py:78
+#, fuzzy
+#| msgid "Successfully updated place"
+msgid "Successfully updated Explorer profile"
+msgstr "Place erfolgreich aktualisiert"
+
+#: views/explorer_views.py:84 views/place_views.py:105
+msgid "Please fill in all required fields."
+msgstr "Bitte füll alle benötigten Felder aus."
+
 #: views/place_image_views.py:26
 msgid "Image(s) submitted successfully"
 msgstr "Bild(er) erfolgreich hinzugefügt"
@@ -358,10 +442,6 @@ msgstr "Du darfst diesen Place nicht bearbeiten"
 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."
-
 #: views/place_views.py:112
 msgid "Successfully deleted place"
 msgstr "Place erfolgreich gelöscht"
@@ -385,3 +465,8 @@ msgstr "Fotoalbum-Link 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"
+
+#, fuzzy
+#~| msgid "Filename(s)"
+#~ msgid "Filename"
+#~ msgstr "Dateiname(n)"
--- a/django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py
+++ b/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'
+        )
+    ]
--- 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 = [
--- 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/models.py
+++ b/django_lostplaces/lostplaces/models/models.py
@@ -6,19 +6,34 @@
 database.
 '''

+import os
 import uuid

 from django.db import models
 from django.contrib.auth.models import User
-from django.db.models.signals import post_save
+from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
+from django.utils.translation import ugettext_lazy as _

 from lostplaces.models.abstract_models import Expireable
+from lostplaces.models.place import Place
+
+from easy_thumbnails.fields import ThumbnailerImageField
+from easy_thumbnails.files import get_thumbnailer
+
+def generate_profile_image_filename(instance, filename):
+    """
+    Callback for generating filename for uploaded explorer profile images.
+    Returns filename as: explorer_pk-username.jpg
+    """
+
+    return 'explorers/' + str(instance.user.pk) + '-' + str(instance.user.username) + '.' + filename.split('.')[-1]

 class Explorer(models.Model):
    """
-    Profile that is linked to the a User.
+    Profile that is linked to the Django user.
    Every user has a profile.
+    Provides additional attributes for user profile.
    """
    
    user = models.OneToOneField(
@@ -26,10 +41,31 @@ class Explorer(models.Model):
        on_delete=models.CASCADE,
        related_name='explorer'
    )
+    bio = models.TextField(
+        blank=True,
+        null=True,
+        verbose_name=_('Biography / Description'),
+        help_text=_('Describe yourself, your preferences, etc. in a few sentences.')
+    )
+    profile_image = ThumbnailerImageField(
+        blank=True,
+        null=True,
+        upload_to=generate_profile_image_filename, 
+        resize_source=dict(size=(400, 400), 
+        sharpen=True),
+        verbose_name=_('Profile image'),
+        help_text=_('Optional profile image for display in Explorer profile')
+    )
+    favorite_places = models.ManyToManyField(
+        Place,
+        related_name='favorite_places',
+        verbose_name='Explorers favorite places',
+        blank=True
+    )

    def __str__(self):
        return self.user.username
-        
+
@receiver(post_save, sender=User)
 def create_user_profile(sender, instance, created, **kwargs):
    if created:
@@ -39,13 +75,34 @@ def create_user_profile(sender, instance, created, **kwargs):
 def save_user_profile(sender, instance, **kwargs):
    instance.explorer.save()

+@receiver(pre_save, sender=Explorer)
+def auto_delete_file_on_change(sender, instance, **kwargs):
+    """
+    Deletes old file from filesystem
+    when corresponding `Explorer` object is updated
+    with new file.
+    """
+    if not instance.pk:
+        return False
+
+    try:
+        old_file = Explorer.objects.get(pk=instance.pk).profile_image
+    except Explorer.DoesNotExist:
+        return False
+    print("Deleting:", old_file)
+    new_file = instance.profile_image
+    if not old_file == new_file:
+        old_file.delete(save=False)
+
 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.
+    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. 
+
+    created_when = models.DateTimeField(auto_now_add=True)
+    expires_when = models.DateTimeField()
    """

    code = models.CharField(unique=True, max_length=30)
@@ -56,4 +113,3 @@ class Voucher(Expireable):

    def __str__(self):
        return "Voucher " + str(self.code)
-
--- a/django_lostplaces/lostplaces/models/place.py
+++ b/django_lostplaces/lostplaces/models/place.py
@@ -49,10 +49,10 @@ class Place(Submittable, Taggable, Mapable):
        return self.name


-def generate_image_upload_path(instance, filename):
+def generate_place_image_filename(instance, filename):
    """
-    Callback for generating path for uploaded images.
-    Returns filename as: place_pk-placename{-rnd_string}.jpg
+    Callback for generating filename for uploaded place images.
+    Returns filename as: place_pk-placename{-number}.jpg
    """

    return 'places/' + str(instance.place.pk) + '-' + str(instance.place.name) + '.' + filename.split('.')[-1]
@@ -72,7 +72,7 @@ class PlaceAsset(Submittable):
        null=True
    )

-class PlaceImage (PlaceAsset):
+class PlaceImage(PlaceAsset):
    """
    PlaceImage defines an image file object that points to a file in uploads/.
    Intermediate image sizes are generated as defined in THUMBNAIL_ALIASES.
@@ -84,7 +84,7 @@ class PlaceImage (PlaceAsset):
        verbose_name=_('Description'),
    )
    filename = ThumbnailerImageField(
-        upload_to=generate_image_upload_path, 
+        upload_to=generate_place_image_filename, 
        resize_source=dict(size=(2560, 2560), 
        sharpen=True),
        verbose_name=_('Filename(s)'),
@@ -104,7 +104,6 @@ class PlaceImage (PlaceAsset):

        return 'Image ' + str(self.pk)

-
 # These two auto-delete files from filesystem when they are unneeded:

@receiver(post_delete, sender=PlaceImage)
@@ -118,7 +117,6 @@ def auto_delete_file_on_delete(sender, instance, **kwargs):
        thumbmanager = get_thumbnailer(instance.filename)
        thumbmanager.delete(save=False)

-
@receiver(pre_save, sender=PlaceImage)
 def auto_delete_file_on_change(sender, instance, **kwargs):
    """
@@ -137,5 +135,4 @@ def auto_delete_file_on_change(sender, instance, **kwargs):
    # 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)
+        old_file.delete(save=False)
--- a/django_lostplaces/lostplaces/static/icons/favourite_filled.svg
+++ b/django_lostplaces/lostplaces/static/icons/favourite_filled.svg
--- 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
@@ -7,16 +7,49 @@
 {% block maincontent %}

 <div class="LP-UserProfile">
+	<div class="LP-UserProfile__Bio">
+        <h2 class="LP-Headline">Bio</h2>
+        <p class="LP-Paragraph">{{explorer.bio}}</p>
+    </div>
    <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>
+						{% if explorer.profile_image %}
+						<figure class="LP-UserInfo__Image">
+							<img src="{{ explorer.profile_image.url }}" class="LP-Image" />
+						</figure>
+						{% endif %}
+                    <tr>
+						{% if explorer.user.first_name %}
+                        <td class="LP-UserInfo__Key">
+                            <span class="LP-Paragraph">{% trans 'Name' %}</span>
+                        </td>
+                        <td class="LP-UserInfo__Value">
+                            <span class="LP-Paragraph">{{explorer.user.first_name}} {{explorer.user.last_name}}</span>
+                        </td>
+						{% endif %}
+                    </tr>
+                    <tr>
+                        {% if explorer.user.email %}
+						<td class="LP-UserInfo__Key">
+                            <span class="LP-Paragraph">{% trans 'E-mail' %}</span>
+                        </td>
+                        <td class="LP-UserInfo__Value">
+							<span class="LP-Paragraph">
+                            	<a href="{{explorer.user.email}}" class="LP-Link">{{explorer.user.email}}</a>
+							</span>
+                        </td>
+						{% endif %}
+                    </tr>
                    <tr>
                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% translate 'Joined' %}</span>
+                            <span class="LP-Paragraph">{% trans 'Joined' %}</span>
                        </td>
                        <td class="LP-UserInfo__Value">
                            <span class="LP-Paragraph">{{explorer.user.date_joined|date:'d.m.Y'}}</span>
@@ -24,7 +57,7 @@
                    </tr>
                    <tr>
                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% translate 'Places'%}</span>
+                            <span class="LP-Paragraph">{% trans 'Places'%}</span>
                        </td>
                        <td class="LP-UserInfo__Value">
                            <span class="LP-Paragraph">{{place_count}}</span>
@@ -32,12 +65,17 @@
                    </tr>
                    <tr>
                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% translate 'Place Assets'%}</span>
+                            <span class="LP-Paragraph">{% trans 'Place assets'%}</span>
                        </td>
                        <td class="LP-UserInfo__Value">
                            <span class="LP-Paragraph">{{asset_count}}</span>
                        </td>
                    </tr>
+                    <tr>
+                        <td>
+                            <a href="/explorer/update/"><button class="LP-Button LP-Button">{% trans 'Edit Profile' %}</button></a>
+                        </td>
+                    </tr>
                </table>
            </div>
        </div>
@@ -45,48 +83,79 @@
 </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>
+    <div class="LP-PlaceList">
+        <h1 class="LP-Headline">{% trans 'Favorite places' %}</h1>
+        <ul class="LP-PlaceList__List">
+            {% for place in explorer.favorite_places.all %}
+            <li class="LP-PlaceList__Item">
+                {% include 'partials/place_teaser.html' with place=place extended=True %}
+            </li>
+            {% endfor %}
+        </ul>

-		{% include 'partials/nav/pagination.html' %}
+        {% include 'partials/nav/pagination.html' %}

-	</div>
+    </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%}
+    <div class="LP-PlaceList">
+        <h1 class="LP-Headline">{% trans 'Places submitted by' %} {{explorer.user.username}}</h1>
+        <ul class="LP-PlaceList__List">
+            {% for place in place_list %}
+            <li class="LP-PlaceList__Item">
+                {% include 'partials/place_teaser.html' with place=place extended=True %}
+            </li>
+            {% endfor %}
+        </ul>
+
+        {% include 'partials/nav/pagination.html' %}
+
+    </div>
+</section>
+
+<section class="LP-Section">
+    <h1 class="LP-Headline">{% trans 'Images submitted by' %} {{explorer.user.username}}</h1>
+    <div class="LP-ImageGrid">
+        <ul class="LP-ImageGrid__Container">
+            {% for place_image in assets.placeimages.all %}
+            <li class="LP-ImageGrid__Item">
+                <a href="{{ place_image.filename.large.url }}" class="LP-Link">
+                    <img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
+                </a>
+                {% if user.explorer == place_image.submitted_by%}
+                <span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
+                    <a href="{% url 'place_image_delete' pk=place_image.id %}" class="LP-Link">
+                        <img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
+                    </a>
+                </span>
+                {% endif %}
+            </li>
+            {% endfor %}
+        </ul>
+    </div>
 </section>

 <section class=" LP-Section">
-	<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>
+    <h1 class="LP-Headline">{% trans '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/explorer/profile_update.html
+++ b/django_lostplaces/lostplaces/templates/explorer/profile_update.html
@@ -0,0 +1,55 @@
+{% extends 'global.html'%}
+{% load i18n %}
+{% load thumbnail %}
+{% load widget_tweaks %}
+
+# {% block title %}{% trans 'Edit Explorer profile' %}{% endblock %}
+
+{% block maincontent %}
+
+<form class="LP-Form" method="POST" enctype="multipart/form-data">
+    <fieldset class="LP-Form__Fieldset">
+        <legend class="LP-Form__Legend">{% trans 'Edit Explorer profile' %}</legend>
+        {% csrf_token %}
+        <div class="LP-Form__Composition LP-Form__Composition--breakable">
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=explorer_user_change_form.username %}
+            </div>
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=explorer_user_change_form.email %}
+            </div>
+        </div>
+        <div class="LP-Form__Composition LP-Form__Composition--breakable">
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=explorer_user_change_form.first_name %}
+            </div>
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=explorer_user_change_form.last_name %}
+            </div>
+        </div>
+
+        <div class="LP-Form__Composition">
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=explorer_change_form.bio %}
+            </div>
+        </div>
+
+        <div class="LP-Form__Composition">
+            {% if explorer_image %}
+            <div class="LP-Form__Field">
+                <img src="{% thumbnail explorer_image 200x200 %}"/>
+            </div>
+            {% endif %}
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=explorer_change_form.profile_image %}
+            </div>
+        </div>
+
+        {% 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>
+    </fieldset>
+</form>
+
+{% endblock maincontent %}
--- a/django_lostplaces/lostplaces/templates/global.html
+++ b/django_lostplaces/lostplaces/templates/global.html
@@ -29,16 +29,16 @@
                <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> |
+					<a class="LP-Link" href="{% url 'explorer_profile' explorer_id=user.pk%}"><span class="LP-Link__Text">{% trans 'Profile' %}</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 +48,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,13 +17,11 @@

 {% 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%}
-            </a>
+            {% include 'partials/place_teaser.html' with place=place%}
        </li>
        {% endfor %}
    </ul>
--- 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/icons/place_favorite.html
+++ b/django_lostplaces/lostplaces/templates/partials/icons/place_favorite.html
@@ -0,0 +1,14 @@
+{%load static %}
+{% load i18n %}
+
+{% if request.user %}
+{% if place in request.user.explorer.favorite_places.all %}
+<a href="{% url 'place_unfavorite' place_id=place.id %}" class="LP-Link" title="{% trans 'Remove from favorites' %}">
+    <img class="LP-Icon" src="{% static '/icons/favourite_filled.svg' %}" />
+</a>
+{%else%}
+<a href="{% url 'place_favorite' place_id=place.id %}" class="LP-Link" title="{% trans 'Save as favorite' %}">
+    <img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" />
+</a>
+{% endif %}
+{% endif %}
--- 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,13 +1,15 @@
 {%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 %}
+    <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+        <div class="LP-PlaceTeaser__Image">
+            {% if place.placeimages.all|length > 0 %}
+            <img class="LP-Image" src="{{ place.placeimages.first.filename.thumbnail.url}}" />
+            {% else %}
            <img class="LP-Image" src="{% static 'images/missing_image.png' %}" />
-        {% endif %}
-    </div>
+            {% endif %}
+        </div>
+    </a>
    <div class="LP-PlaceTeaser__Meta">
        <div class="LP-PlaceTeaser__Info">
            <span class="LP-PlaceTeaser__Title">
@@ -20,15 +22,15 @@
        <div class="LP-PlaceTeaser__Description">
            <p class="LP-Paragraph">
                {% if place.description|length > 210 %}
-                    {{place.description|truncatechars:210|truncatewords:-1}}
+                {{place.description|truncatechars:210|truncatewords:-1}}
                {% else %}
-                    {{place.description}}
+                {{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">{% include 'partials/icons/place_favorite.html' with place=place%}</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>
--- 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 'Delete lost place' %}{% 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">{% blocktrans with place_name=place.name%}Are you sure you want to delete {{place_name}}?{% endblocktrans %}</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
@@ -4,7 +4,6 @@

 {% load thumbnail %}
 {% load svg_icon %}
-{% load lostplaces %}

 {% block additional_head %}
 <link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
@@ -16,21 +15,19 @@
 {% 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 %}
 <article class="LP-PlaceDetail">

    <header class="LP-PlaceDetail__Header">
-        <h1 class="LP-Headline">{{ place.name }}</h1>
+        <h1 class="LP-Headline">{{ place.name }} {% include 'partials/icons/place_favorite.html' %}</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>

@@ -41,15 +38,13 @@
    <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 +55,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 %}
@@ -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,30 @@
    </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>
+                    {% if user.explorer == place_image.submitted_by or user.explorer ==  place.submitted_by %}
+                    <span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
+                        <a href="{% url 'place_image_delete' pk=place_image.id %}" class="LP-Link">
+                            <img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
+                        </a>
+                    </span>
+                    {% endif %}
+                </li>
+                {% endfor %}
+                <li class="LP-ImageGrid__Item LP-ImageGrid__Item--add" title="Bild hinzufügen">
+                    <a class="LP-Link" href="{% url 'place_image_create' place_id=place.id%}">
+                        <img class="LP-Icon" src="{% static 'icons/plus.svg' %}" />
+                    </a>
+                </li>
+            </ul>
+        </div>
    </section>

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

-{% block title %}{% translate 'All Places' %}{% endblock %}
+{% block title %}{% trans 'All 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 'Our lost 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 %}
-            </a>
+            {% include 'partials/place_teaser.html' with place=place extended=True %}
        </li>
        {% endfor %}
    </ul>
--- 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 'Edit place' %}{% endblock %}

 {% block maincontent %}
 <form class="LP-Form" method="POST" enctype="multipart/form-data">
    <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% translate 'Edit place' %}</legend>
+        <legend class="LP-Form__Legend">{% trans 'Edit place' %}</legend>
        {% csrf_token %}
        <div class="LP-Form__Composition LP-Form__Composition--breakable">
            <div class="LP-Form__Field">
@@ -39,7 +39,7 @@
            </div>
        </div>
        
-        {% 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 '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">
@@ -19,6 +19,14 @@
                {% include 'partials/form/inputField.html' with field=form.email %}
            </div>
        </div>
+        <div class="LP-Form__Composition LP-Form__Composition--breakable">
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=form.first_name %}
+            </div>
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=form.last_name %}
+            </div>
+        </div>

        <div class="LP-Form__Composition">
            <div class="LP-Form__Field">
@@ -38,7 +46,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:
@@ -33,81 +24,3 @@ def proper_paginate(paginator, current_page, neighbors=2):
        page_list = [f for f in range(start_index, end_index+1)]
        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]
-    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)
-    
--- a/django_lostplaces/lostplaces/tests/forms/test_explorer_forms.py
+++ b/django_lostplaces/lostplaces/tests/forms/test_explorer_forms.py
@@ -4,15 +4,15 @@ from django import forms
 from django.utils import timezone

 from lostplaces.tests.forms import FormTestCase
-from lostplaces.forms import ExplorerCreationForm
+from lostplaces.forms import SignupVoucherForm
 from lostplaces.models.models import Voucher

-class ExplorerCreationFormTestCase(FormTestCase):
+class SignupVoucherFormTestCase(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
+    form = SignupVoucherForm
    
    @classmethod
    def setUpTestData(cls):
@@ -37,7 +37,7 @@ class ExplorerCreationFormTestCase(FormTestCase):
        )
        
    def test_validation_valid(self):
-        form = ExplorerCreationForm(self.post_data)
+        form = SignupVoucherForm(self.post_data)
        self.assertTrue(
            form.is_valid(),
            msg='Expecting the %s to validate' % (
@@ -49,7 +49,7 @@ class ExplorerCreationFormTestCase(FormTestCase):
        self.post_data = {
            'voucher': 'Imanotacode123'
        }
-        form = ExplorerCreationForm(self.post_data)
+        form = SignupVoucherForm(self.post_data)
        self.assertFalse(
            form.is_valid(),
            msg='Expecting the %s to not validate' % (
--- a/django_lostplaces/lostplaces/urls.py
+++ b/django_lostplaces/lostplaces/urls.py
@@ -11,12 +11,15 @@ from lostplaces.views import (
    PlaceDeleteView,
    PlaceTagDeleteView,
 	PlaceTagSubmitView,
+    PlaceFavoriteView,
+    PlaceUnfavoriteView,
 	PhotoAlbumCreateView,
 	PhotoAlbumDeleteView,
    PlaceImageCreateView,
    PlaceImageDeleteView,
    FlatView,
-    ExplorerProfileView
+    ExplorerProfileView,
+    ExplorerProfileUpdateView
 )

 urlpatterns = [
@@ -36,5 +39,9 @@ urlpatterns = [
 	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('explorer/<int:explorer_id>/', ExplorerProfileView.as_view(), name='explorer_profile'),
+    path('explorer/update/', ExplorerProfileUpdateView.as_view(), name='explorer_profile_update'),
+    
+    path('explorer/favorite/<int:place_id>/', PlaceFavoriteView.as_view(), name='place_favorite'),
+    path('explorer/unfavorite/<int:place_id>/', PlaceUnfavoriteView.as_view(), name='place_unfavorite')
 ]
--- a/django_lostplaces/lostplaces/views/explorer_views.py
+++ b/django_lostplaces/lostplaces/views/explorer_views.py
@@ -7,11 +7,13 @@ 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 django.contrib import messages

 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
+from lostplaces.forms import ExplorerChangeForm, ExplorerUserChangeForm

 class ExplorerProfileView(IsAuthenticatedMixin, View):
    def get(self, request, explorer_id):
@@ -33,13 +35,53 @@ class ExplorerProfileView(IsAuthenticatedMixin, View):
            asset_count += objects.count()
        
        context['asset_count'] = asset_count
-        
-        print(context['assets'])
-        
+                
        return render(
            request=request,
            template_name='explorer/profile.html',
            context=context
        )
-        
-        
+
+class ExplorerProfileUpdateView(IsAuthenticatedMixin, View):
+    success_message = ''
+    permission_denied_message = ''
+
+    def get(self, request, *args, **kwargs):
+        context = {
+            'explorer_user_change_form': ExplorerUserChangeForm(instance=request.user),
+            'explorer_change_form': ExplorerChangeForm(instance=request.user.explorer)
+        }
+        if request.user.explorer.profile_image:
+            context['explorer_image'] = request.user.explorer.profile_image
+        return render(request, 'explorer/profile_update.html', context)
+
+    def post(self, request, *args, **kwargs):
+        print(request.POST)
+        explorer_user_change_form = ExplorerUserChangeForm(
+            request.POST,
+            instance=request.user
+            )
+        explorer_change_form = ExplorerChangeForm(
+            request.POST,
+            request.FILES,
+            instance=request.user.explorer
+        )
+
+        if explorer_change_form.is_valid() and explorer_user_change_form.is_valid():
+            explorer_user_change_form.save()
+            explorer_change_form.save()
+
+            print(explorer_change_form.cleaned_data)
+
+            messages.success(
+                self.request,
+                _('Successfully updated Explorer profile')
+            )
+        else:
+            # Usually the browser should have checked the form before sending.
+            messages.error(
+                self.request,
+                _('Please fill in all required fields.')
+            )
+        return redirect(reverse_lazy('explorer_profile_update'))
+    
--- a/django_lostplaces/lostplaces/views/place_views.py
+++ b/django_lostplaces/lostplaces/views/place_views.py
@@ -119,3 +119,36 @@ class PlaceDeleteView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, DeleteView):

    def get_place(self):
        return self.get_object()
+
+class PlaceFavoriteView(IsAuthenticatedMixin, View):
+    
+    def get(self, request, place_id):
+        place = get_object_or_404(Place, id=place_id)
+        if request.user is not None:
+            request.user.explorer.favorite_places.add(place)
+            request.user.explorer.save()
+            
+        referer = request.META.get('HTTP_REFERER') 
+        if referer is not None:
+            return redirect(referer)
+        else:
+            return redirect(
+                reverse_lazy('place_detail', kwargs={'pk': place.pk})
+            )
+            
+class PlaceUnfavoriteView(IsAuthenticatedMixin, View):
+    
+    def get(self, request, place_id):
+        place = get_object_or_404(Place, id=place_id)
+        if request.user is not None:
+            request.user.explorer.favorite_places.remove(place)
+            request.user.explorer.save()
+            
+        referer = request.META.get('HTTP_REFERER')  
+        if referer is not None:
+            return redirect(referer)
+        else:
+            return redirect(
+                reverse_lazy('place_detail', kwargs={'pk': place.pk})
+            )       
+     
--- a/django_lostplaces/lostplaces/views/views.py
+++ b/django_lostplaces/lostplaces/views/views.py
@@ -11,7 +11,7 @@ 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.forms import SignupVoucherForm, TagSubmitForm
 from lostplaces.models import Place, PhotoAlbum
 from lostplaces.views.base_views import IsAuthenticatedMixin

@@ -23,7 +23,7 @@ from lostplaces.views.base_views import (
 from taggit.models import Tag

 class SignUpView(SuccessMessageMixin, CreateView):
-    form_class = ExplorerCreationForm
+    form_class = SignupVoucherForm
    success_url = reverse_lazy('login')
    template_name = 'signup.html'
    success_message = _('User created')
--- a/django_lostplaces/setup.py
+++ b/django_lostplaces/setup.py
@@ -8,7 +8,7 @@ with open('../Readme.md') as f:

 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',
Author	SHA1	Message	Date
Commander1024	c5f6355f19	Updated translations (de).	2020-12-25 16:07:50 +01:00
Commander1024	dac63e99ba	Added Edit button to profile page.	2020-12-25 16:00:29 +01:00
Commander1024	9f369456d5	Changed easy_thumbnails image/thumb deletion. Now working.	2020-12-25 15:42:02 +01:00
Commander1024	011a58f6b3	Use thumbnail in profile_update.	2020-12-25 14:29:38 +01:00
Commander1024	67ce6cb50b	Added working explorer_profile_image upload.	2020-12-25 14:06:53 +01:00
Commander1024	86cc7f23fe	description_fuckery.	2020-12-25 13:19:34 +01:00
Commander1024	3eaa186b66	Delete profile_image on user_deletion.	2020-12-25 12:53:52 +01:00
Commander1024	cc59254ba4	Added clean_username function to validate form.	2020-12-25 12:24:09 +01:00
Commander1024	67a6517716	Comment improved.	2020-12-25 11:14:54 +01:00
Commander1024	0f5474c2d3	half-working :P	2020-12-25 11:14:21 +01:00
Commander1024	17e71b71d4	Fix typo.	2020-12-25 08:04:35 +01:00
Commander1024	b1aa4473e9	Added failsafe, if there is no profile_image.	2020-12-25 02:11:02 +01:00
Commander1024	871acd1dce	Improved class comment.	2020-12-25 01:41:09 +01:00
Commander1024	14ca45d111	Comments for customizations of UserChangeForm.	2020-12-25 01:36:14 +01:00
Commander1024	c71fe4cf2d	Added new translations (de)	2020-12-25 01:31:43 +01:00
Commander1024	7359bf5fab	ExplorerChangeForms, with deactivated username field.	2020-12-25 01:31:01 +01:00
Commander1024	4f0182fc3e	Minor textual changes for consistency.	2020-12-25 01:28:23 +01:00
Commander1024	30f259fb4d	WIP-commit of translations to test against fuzzy detection.	2020-12-24 23:51:40 +01:00
Commander1024	53f89caef5	Added a ModelForm to change profile details.	2020-12-24 20:31:52 +01:00
Commander1024	3855fb28d7	Rename ExplorerCreationForm to SignupVoucherForm.	2020-12-24 20:25:05 +01:00
Commander1024	3a20a60f05	Remove obsolete ExplorerChangeForm.	2020-12-24 20:22:33 +01:00
Commander1024	648264c9fc	Remove obsoleted imports.	2020-12-24 20:13:06 +01:00
Commander1024	a7c8848fd6	Allow user to provide his first and last name on registration.	2020-12-24 19:36:41 +01:00
Commander1024	07ea2f164c	Name and E-Mail is only shown when populated in profile.	2020-12-24 19:13:55 +01:00
Commander1024	b0396f5223	Added bio and email link to profile template.	2020-12-24 19:04:04 +01:00
Commander1024	88bffbef8e	Added Explorer bio / description field.	2020-12-24 18:53:30 +01:00
Commander1024	2022a924c4	Added output of profile image to profile_page.	2020-12-24 18:30:29 +01:00
Commander1024	d5827b2006	Fixed filename generation.	2020-12-24 18:14:40 +01:00
Commander1024	a9013d9673	Pulled favorite_places out of explorer instance.	2020-12-24 18:03:31 +01:00
Commander1024	0c38ca9a15	Revert changes, as it was redundant.	2020-12-24 18:03:07 +01:00
Commander1024	734d09df90	Add favorite_places to user profile page.	2020-12-24 17:59:05 +01:00
Commander1024	e601b9bf6b	Merge commit '6f6bd6376d1ef2410a728cff2e9b883560c7f5c1' into feature/30-user-profile-fields	2020-12-24 17:34:09 +01:00
Commander1024	6f6bd6376d	Merge branch 'develop' of mowoe.com:reverend/lostplaces-backend into develop	2020-12-24 17:33:02 +01:00
reverend	dc2a703c39	More fuckery	2020-12-24 17:27:48 +01:00
reverend	063777ece4	Merge branch '27-Favorite-System' into develop	2020-12-24 17:27:20 +01:00
reverend	4675e5814f	Indention and stupid mistakes fix	2020-12-24 17:26:07 +01:00
Commander1024	35e0f912fe	Add profile_pic	2020-12-24 17:24:02 +01:00
Commander1024	07fe1bc3ca	Rename place_image_path function.	2020-12-24 17:23:20 +01:00
reverend	4a43a4bf37	typo	2020-12-24 16:43:43 +01:00
reverend	61cf148417	Displaying favorite icon on detail page	2020-12-24 16:43:33 +01:00
reverend	d547ee9db3	favorite partial	2020-12-24 16:43:14 +01:00
reverend	c7b699f615	Changed link location in place teaser	2020-12-24 16:43:01 +01:00
reverend	86f95a5dd0	New icon	2020-12-24 16:42:34 +01:00
reverend	916c4b80f7	Filed not required in django admin	2020-12-24 16:42:27 +01:00
reverend	b31dc9fc5f	Url name changed	2020-12-24 16:41:30 +01:00
reverend	8f048369bf	Favorite/Unfavorite Views	2020-12-24 15:56:33 +01:00
reverend	f974469996	formatting	2020-12-24 15:56:02 +01:00
reverend	dbbd7b0802	rename migrationfile	2020-12-24 15:55:37 +01:00
Commander1024	d04e986419	Added display of name and e-mail.	2020-12-24 15:33:46 +01:00
Commander1024	cbbda88850	Remove debug output.	2020-12-24 15:13:40 +01:00
Commander1024	981c440ce3	Fix voucher class description	2020-12-24 15:13:31 +01:00
Commander1024	c7368f5c44	Merge commit '20dd880a11a008ba95cd5aedce59590445430831' into develop	2020-12-24 14:57:09 +01:00
reverend	abca946883	Model for favorite system	2020-12-24 14:48:11 +01:00