Implemented tag that checks if user is authorized.

MANIFEST.in

@@ -1,4 +1,3 @@
-exclude 
 include LICENSE
 include Readme.rst
 include Pipfile

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.

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

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"

django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py

@@ -19,4 +19,4 @@ class Migration(migrations.Migration):
         migrations.DeleteModel(
             name='Expireable'
         )
-    ]
+    ]

django_lostplaces/lostplaces/migrations/0003_voucher.py

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

django_lostplaces/lostplaces/models/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):

django_lostplaces/lostplaces/models/models.py

@@ -14,7 +14,6 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 
 from lostplaces.models.abstract_models import Expireable
-from lostplaces.models.place import Place
 
 class Explorer(models.Model):
     """
@@ -28,13 +27,6 @@ class Explorer(models.Model):
         related_name='explorer'
     )
 
-    favorite_places = models.ManyToManyField(
-        Place,
-        related_name='favorite_places',
-        verbose_name='Explorers favorite places',
-        blank=True
-    )
-
     def __str__(self):
         return self.user.username
         

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)

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;

django_lostplaces/lostplaces/templates/explorer/profile.html

@@ -1,107 +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">{% trans '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">{% trans '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">{% trans '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">{% 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">{% 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 %}

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">{% 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>
+                    <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">{% trans '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">{% trans 'Login' %}</span></a> |
-                    <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign up' %}</span></a>
+                    <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign Up' %}</span></a>
                     {% endif %}
                 </span>
             </div>
@@ -54,8 +53,8 @@
                     {% 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">{% 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>
+                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_create'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Create Place' %}</span></a></li>
+                    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_list'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'All Places' %}</span></a></li>
                 </ul>
             </nav>
         </aside>

django_lostplaces/lostplaces/templates/home.html

@@ -21,7 +21,30 @@
     <ul class="LP-PlaceGrid__Grid">
         {% for place in place_list %}
         <li class="LP-PlaceGrid__Item">
-            {% include 'partials/place_teaser.html' with place=place%}
+            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+                <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 %}
     </ul>

django_lostplaces/lostplaces/templates/partials/icons/place_favorite.html

@@ -1,14 +0,0 @@
-{%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 %}

django_lostplaces/lostplaces/templates/partials/place_teaser.html

@@ -1,39 +0,0 @@
-{%load static %}
-
-<article class="LP-PlaceTeaser {% if extended %} LP-PlaceTeaser--extended{% endif %}">
-    <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>
-    </a>
-    <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">{% 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>
-        </div>
-    </div>
-</article>

django_lostplaces/lostplaces/templates/place/place_create.html

@@ -2,12 +2,12 @@
 {% load static %}
 {% load i18n %}
 
-# {% block title %}{% trans '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">{% trans '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">

django_lostplaces/lostplaces/templates/place/place_delete.html

@@ -2,7 +2,7 @@
 {% load static %}
 {% load i18n %}
 
-{% block title %}{% trans 'Delete lost place' %}{% endblock %}
+{% block title %}{% trans 'Lost Place Deletion' %}{% endblock %}
 
 {% block maincontent %}
 
@@ -12,7 +12,7 @@
         {% csrf_token %}
         <div class="LP-Form__Composition">
             <div class="LP-Form__Field LP-Form__InfoText">
-                <p class="LP-Paragraph">{% blocktrans with place_name=place.name%}Are you sure you want to delete {{place_name}}?{% endblocktrans %}</p>
+                <p class="LP-Paragraph">{% trans 'Are you sure you want to delete' %} "{{place.name}}"?</p>
             </div>
         </div>
         

django_lostplaces/lostplaces/templates/place/place_detail.html

@@ -4,6 +4,7 @@
 
 {% load thumbnail %}
 {% load svg_icon %}
+{% load lostplaces %}
 
 {% block additional_head %}
 <link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
@@ -23,7 +24,7 @@
 <article class="LP-PlaceDetail">
 
     <header class="LP-PlaceDetail__Header">
-        <h1 class="LP-Headline">{{ place.name }} {% include 'partials/icons/place_favorite.html' %}</h1>
+        <h1 class="LP-Headline">{{ place.name }}</h1>
         {% if place.placeimages.first.filename.hero.url %}
         <figure class="LP-PlaceDetail__Image">
             <img src="{{ place.placeimages.first.filename.hero.url }}" class="LP-Image" />
@@ -36,10 +37,8 @@
     </div>
 
     <section class="LP-Section">
-
         {% url 'place_tag_submit' place_id=place.id as tag_submit_url%}
         {% include 'partials/tagging.html' with config=tagging_config %}
-
     </section>
 
     <section class="LP-Section">
@@ -63,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" %}
@@ -98,7 +98,8 @@
                     <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 %}
+                    {% 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' %}" />

django_lostplaces/lostplaces/templates/place/place_list.html

@@ -7,17 +7,49 @@
 <script src="{% static 'maps/ol.js' %}"></script>
 {% endblock additional_head %}
 
-{% block title %}{% trans '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">{% trans '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">
-            {% include 'partials/place_teaser.html' with place=place extended=True %}
+            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+                <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 %}
     </ul>

django_lostplaces/lostplaces/templates/place/place_update.html

@@ -2,12 +2,12 @@
 {% load static %}
 {% load i18n %}
 
-# {% block title %}{% trans '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">{% trans '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">

django_lostplaces/lostplaces/templates/registration/login.html

@@ -26,6 +26,6 @@
     </fieldset>
 </form>
 
-<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>
+<p class="LP-Headline">{% trans 'Have No Account Yet?' %} <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign Up' %}</span></a></p>
 
 {% endblock maincontent %}

django_lostplaces/lostplaces/templates/signup.html

@@ -9,7 +9,7 @@
 
 <form class="LP-Form" method="POST">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% trans '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">{% trans 'Sign up' %}</button>
+                <button class="LP-Button">{% trans 'Sign Up' %}</button>
             </div>
         </div>
     </fieldset>

django_lostplaces/lostplaces/templatetags/lostplaces.py

@@ -24,3 +24,13 @@ 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
+
+@register.simple_tag
+def can_modify_place_asset(place_asset, request, *args, **kwargs):
+    print(place_asset.place.submitted_by, place_asset.submitted_by, request.user)
+    if request.user.is_superuser:
+        return True
+    if request.user.explorer == place_asset.place.submitted_by or request.user.explorer == place_asset.submitted_by:
+        return True
+    else:
+        return False

django_lostplaces/lostplaces/urls.py

@@ -11,14 +11,11 @@ from lostplaces.views import (
     PlaceDeleteView,
     PlaceTagDeleteView,
 	PlaceTagSubmitView,
-    PlaceFavoriteView,
-    PlaceUnfavoriteView,
 	PhotoAlbumCreateView,
 	PhotoAlbumDeleteView,
     PlaceImageCreateView,
     PlaceImageDeleteView,
-    FlatView,
-    ExplorerProfileView
+    FlatView
 )
 
 urlpatterns = [
@@ -36,12 +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('explorer/favorite/<int:place_id>/', PlaceFavoriteView.as_view(), name='place_favorite'),
-    path('explorer/unfavorite/<int:place_id>/', PlaceUnfavoriteView.as_view(), name='place_unfavorite')
-    
-    
+    path('place/tag/delete/<int:tagged_id>/<int:tag_id>', PlaceTagDeleteView.as_view(), name='place_tag_delete')
 ]

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 *

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
-        )
-        
-        

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')

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)
@@ -119,35 +119,3 @@ 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})
-            )            

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):

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

setup.py

@@ -1,9 +1,9 @@
-#!/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(
@@ -13,7 +13,7 @@ setup(
     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
 )