Converted indentation to spaces globally.

Added migrations directory to .gitignore.
Deleted old migrations.
2020-08-17 15:38:52 +02:00 · 2020-08-17 12:36:27 +02:00 · 2020-08-17 12:30:45 +02:00 · 2020-08-17 12:03:30 +02:00 · 2020-08-17 08:45:12 +02:00 · 2020-08-16 16:29:04 +02:00
24 changed files with 271 additions and 468 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,10 @@ coverage.xml
 *.mo

 # Django stuff:
+# exclude migrations from repository. These should be created locally, matching local DB requirements.
+# lostplaces/manage.py makemigrations && lostplaces/manage.py migrate
+
+lostplaces/lostplaces_app/migrations/

 # pyenv
 .python-version
--- a/lostplaces/lostplaces_app/migrations/0001_initial.py
+++ b/lostplaces/lostplaces_app/migrations/0001_initial.py
@@ -1,67 +0,0 @@
-# Generated by Django 3.0.8 on 2020-07-28 19:00
-
-import django.contrib.auth.models
-import django.contrib.auth.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-import django_thumbs.fields
-import lostplaces_app.models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('auth', '0011_update_proxy_permissions'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Place',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=50)),
-                ('location', models.CharField(max_length=50)),
-                ('latitude', models.FloatField()),
-                ('longitude', models.FloatField()),
-                ('description', models.TextField()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='PlaceImage',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('filename', django_thumbs.fields.ImageThumbsField(max_length=50, sizes=({'code': 'thumbnail', 'wxh': '390x390'}, {'code': 'hero', 'wxh': '700x700'}, {'code': 'large', 'wxh': '1920x1920'}), upload_to=lostplaces_app.models.generate_image_upload_path)),
-                ('description', models.TextField(blank=True)),
-                ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='lostplaces_app.Place')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Explorer',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
-                ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
-                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
-                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
-                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
-                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
-            ],
-            options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-                'abstract': False,
-            },
-            managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
-            ],
-        ),
-    ]
--- a/lostplaces/lostplaces_app/migrations/0002_place_submitted_by.py
+++ b/lostplaces/lostplaces_app/migrations/0002_place_submitted_by.py
@@ -1,20 +0,0 @@
-# Generated by Django 3.0.8 on 2020-07-29 16:29
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces_app', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='place',
-            name='submitted_by',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
--- a/lostplaces/lostplaces_app/migrations/0003_auto_20200729_1822.py
+++ b/lostplaces/lostplaces_app/migrations/0003_auto_20200729_1822.py
@@ -1,20 +0,0 @@
-# Generated by Django 3.0.8 on 2020-07-29 18:22
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces_app', '0002_place_submitted_by'),
-    ]
-
-    operations = [
-        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=settings.AUTH_USER_MODEL),
-        ),
-    ]
--- a/lostplaces/lostplaces_app/migrations/0004_placeimage_submitted_by.py
+++ b/lostplaces/lostplaces_app/migrations/0004_placeimage_submitted_by.py
@@ -1,20 +0,0 @@
-# Generated by Django 3.0.8 on 2020-07-30 09:18
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces_app', '0003_auto_20200729_1822'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='placeimage',
-            name='submitted_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='images', to=settings.AUTH_USER_MODEL),
-        ),
-    ]
--- a/lostplaces/lostplaces_app/migrations/0005_voucher.py
+++ b/lostplaces/lostplaces_app/migrations/0005_voucher.py
@@ -1,22 +0,0 @@
-# Generated by Django 3.0.8 on 2020-08-01 10:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces_app', '0004_placeimage_submitted_by'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Voucher',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('code', models.CharField(max_length=10)),
-                ('created', models.DateField(auto_now_add=True)),
-                ('expires', models.DateField()),
-            ],
-        ),
-    ]
--- a/lostplaces/lostplaces_app/migrations/0006_auto_20200801_1037.py
+++ b/lostplaces/lostplaces_app/migrations/0006_auto_20200801_1037.py
@@ -1,22 +0,0 @@
-# Generated by Django 3.0.8 on 2020-08-01 10:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces_app', '0005_voucher'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='voucher',
-            name='id',
-        ),
-        migrations.AlterField(
-            model_name='voucher',
-            name='code',
-            field=models.CharField(max_length=10, primary_key=True, serialize=False, unique=True),
-        ),
-    ]
--- a/lostplaces/lostplaces_app/migrations/0007_auto_20200801_1039.py
+++ b/lostplaces/lostplaces_app/migrations/0007_auto_20200801_1039.py
@@ -1,18 +0,0 @@
-# Generated by Django 3.0.8 on 2020-08-01 10:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces_app', '0006_auto_20200801_1037'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='voucher',
-            name='created',
-            field=models.DateTimeField(auto_now_add=True),
-        ),
-    ]
--- a/lostplaces/lostplaces_app/migrations/0008_auto_20200801_1044.py
+++ b/lostplaces/lostplaces_app/migrations/0008_auto_20200801_1044.py
@@ -1,24 +0,0 @@
-# Generated by Django 3.0.8 on 2020-08-01 10:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces_app', '0007_auto_20200801_1039'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='voucher',
-            name='id',
-            field=models.AutoField(auto_created=True, default=0, primary_key=True, serialize=False, verbose_name='ID'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='voucher',
-            name='code',
-            field=models.CharField(max_length=10, unique=True),
-        ),
-    ]
--- a/lostplaces/lostplaces_app/migrations/0009_place_submitted_when.py
+++ b/lostplaces/lostplaces_app/migrations/0009_place_submitted_when.py
@@ -1,18 +0,0 @@
-# Generated by Django 3.0.9 on 2020-08-03 16:36
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces_app', '0008_auto_20200801_1044'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='place',
-            name='submitted_when',
-            field=models.DateTimeField(auto_now_add=True, null=True),
-        ),
-    ]
--- a/lostplaces/lostplaces_app/migrations/0010_auto_20200803_1707.py
+++ b/lostplaces/lostplaces_app/migrations/0010_auto_20200803_1707.py
@@ -1,20 +0,0 @@
-# Generated by Django 3.0.9 on 2020-08-03 17:07
-
-from django.db import migrations
-import easy_thumbnails.fields
-import lostplaces_app.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lostplaces_app', '0009_place_submitted_when'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='placeimage',
-            name='filename',
-            field=easy_thumbnails.fields.ThumbnailerImageField(upload_to=lostplaces_app.models.generate_image_upload_path),
-        ),
-    ]
--- a/lostplaces/lostplaces_app/static/main.css
+++ b/lostplaces/lostplaces_app/static/main.css
@@ -1,4 +1,3 @@
-@charset "UTF-8";
@font-face {
  font-family: Crimson;
  src: url("fonts/Crimson/CrimsonText-Regular.ttf"), url("fonts/Crimson/CrimsonText-Bold.ttf"), url("fonts/Crimson/CrimsonText-Italic.ttf"); }
@@ -56,17 +55,11 @@ body {
    .LP-Section .LP-Headline {
      margin: 0; } }

+@media (max-width: 450px) {
+  .LP-Main__Sidebar {
+    max-width: 100vw; } }
+
@media (max-width: 650px) {
-  @keyframes slide_out_siedebar {
-    from {
-      left: -250px; }
-    to {
-      left: 0; } }
-  @keyframes slide_in_siedebar {
-    from {
-      left: 0; }
-    to {
-      left: -250px; } }
  .LP-Wrapper__Site {
    grid-template-columns: 0 1fr; }
  .LP-Main__Sidebar {
@@ -77,16 +70,14 @@ body {
    left: -251px;
    height: 100vh;
    top: 60px;
-    border-right: 1px solid #C09F80; }
+    border-right: 1px solid #C09F80;
+    transition: left 0.3s; }
    .LP-Main__Sidebar--hidden {
      visibility: hidden; }
  #toggle_sidebar:checked ~ .LP-Main__Sidebar {
-    animation-name: slide_out_siedebar;
-    animation-duration: .3s;
    left: 0; }
  #toggle_sidebar ~ .LP-Main__Sidebar {
-    animation-name: slide_in_siedebar;
-    animation-duration: .3s; }
+    left: -251px; }
  .LP-Menu__TriggerLabel {
    z-index: 20;
    height: 60px;
@@ -315,41 +306,50 @@ body {
  .LP-Pagination .LP-Pagination__List {
    list-style-type: none;
    display: flex;
-    flex-direction: row; }
+    flex-direction: row;
+    padding-left: 0;
+    padding-right: 0; }
  .LP-Pagination .LP-Pagination__Item {
    margin: 0 4px; }
    .LP-Pagination .LP-Pagination__Item--disabled {
      color: #b6b6b6; }
+      .LP-Pagination .LP-Pagination__Item--disabled .LP-Link {
+        color: #b6b6b6;
+        cursor: default; }
+        .LP-Pagination .LP-Pagination__Item--disabled .LP-Link:hover {
+          background-color: unset;
+          color: unset; }
    .LP-Pagination .LP-Pagination__Item--current .LP-Link {
-      background-color: #D7CEC7;
-      border-radius: 2px; }
+      background-color: #D7CEC7; }
      .LP-Pagination .LP-Pagination__Item--current .LP-Link:hover {
        background-color: #D7CEC7;
        color: #565656; }
  .LP-Pagination .LP-Link {
-    padding: 15px 25px;
-    vertical-align: sub; }
+    padding: 15px 20px;
+    vertical-align: sub;
+    border-radius: 2px; }
    .LP-Pagination .LP-Link:active, .LP-Pagination .LP-Link:hover {
      background-color: #D7CEC7;
-      border-radius: 2px;
      color: #565656; }
-  .LP-Pagination .LP-Pagination__First:before {
-    content: "⟪";
-    padding-right: 1em;
-    font-size: larger; }
-  .LP-Pagination .LP-Pagination__Previous:before {
-    content: "⟨";
-    padding-right: 1em;
-    font-size: larger; }
-  .LP-Pagination .LP-Pagination__Next:after {
-    content: "⟩";
-    padding-left: 1em;
-    font-size: larger; }
-  .LP-Pagination .LP-Pagination__Last:after {
-    content: "⟫";
-    padding-left: 1em;
+  .LP-Pagination .LP-Icon {
    font-size: larger; }

+@media (max-width: 1000px) {
+  .LP-Pagination .LP-Link {
+    padding: 10px 15px; }
+  .LP-Pagination .LP-Pagination__Item--other .LP-Text {
+    display: none; } }
+
+@media (max-width: 650px) {
+  .LP-Pagination .LP-Pagination__Item {
+    margin: 0 1px; }
+    .LP-Pagination .LP-Pagination__Item .LP-Link {
+      padding: 13px 16px; } }
+
+@media (max-width: 450px) {
+  .LP-Pagination .LP-Pagination__Item .LP-Link {
+    padding: 8px 11px; } }
+
 .LP-Content {
  padding: 35px; }

@@ -512,12 +512,12 @@ body {
  height: 60px;
  box-shadow: 0 0 2px #C09F80;
  grid-area: header;
-  background-color: white; }
+  background-color: white;
+  padding-left: 25px; }
  .LP-Header__Navigation {
    flex-grow: 2; }
  .LP-Header__Logo {
    height: 45px;
-    margin: 25px;
    object-fit: cover;
    max-height: 100%;
    width: 225px;
@@ -550,8 +550,8 @@ body {

@media (max-width: 650px) {
  .LP-Header {
-    padding-left: 40px;
-    width: calc(100% - 40px);
+    padding-left: 60px;
+    width: calc(100% - 60px);
    position: fixed;
    z-index: 10; } }

@@ -578,7 +578,6 @@ body {
      border-left: 2px #565656 solid; }
  .LP-PlaceList .LP-PlaceList__List .LP-PlaceList__Item {
    max-width: 900px;
-    min-width: 450px;
    margin: 18px 0; }

 .LP-PlaceList .LP-Pagination {
--- a/lostplaces/lostplaces_app/templates/global.html
+++ b/lostplaces/lostplaces_app/templates/global.html
@@ -8,89 +8,89 @@
        <link rel="icon" type="image/png" href="{% static 'favicon.ico' %}">
        <title>
            {% block title %}Urban Exploration{% endblock %}
-		</title>
-		
-		{% block additional_head %}
-		{% endblock additional_head %}
+        </title>
+        
+        {% block additional_head %}
+        {% endblock additional_head %}

-		<script>
-			document.addEventListener("DOMContentLoaded", function(){
-					Array.from(document.getElementsByClassName('LP-Main__Sidebar')).forEach(function(element){
-							element.classList.add('LP-Main__Sidebar--hidden')
-					})
-					setTimeout(function(){
-						Array.from(document.getElementsByClassName('LP-Main__Sidebar')).forEach(function(element){
-							element.classList.remove('LP-Main__Sidebar--hidden')
-					})
-				}, 500)
-			})
-		</script>
-		
+        <script>
+            document.addEventListener("DOMContentLoaded", function(){
+                    Array.from(document.getElementsByClassName('LP-Main__Sidebar')).forEach(function(element){
+                            element.classList.add('LP-Main__Sidebar--hidden')
+                    })
+                    setTimeout(function(){
+                        Array.from(document.getElementsByClassName('LP-Main__Sidebar')).forEach(function(element){
+                            element.classList.remove('LP-Main__Sidebar--hidden')
+                    })
+                }, 500)
+            })
+        </script>
+        
    </head>

    <body>
-		<div class="LP-Wrapper__Site">
-			<header class="LP-Header">
-				<div class="LP-Header__Logo">
-					<a class="LP-Link" href="/">
-						<img src="{% static 'logo.png' %}" class="LP-Image" />
-					</a>    
-				</div>
-				<div class="LP-Header__UserInformation">
-					<span class="LP-Paragraph">
-						{% if user.is_authenticated %}
-							Hi {{ user.username }}!
-								<a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">logout</span></a> 
-								{% if user.is_superuser %}
-								| <a class="LP-Link" href="{% url 'admin:index' %}" target="_blank"><span class="LP-Link__Text">admin</span></a>
-								{% endif %}
-								
-							{% else %}
-								You are not logged in.
-								<a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">login</span></a> |
-								<a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">signup</span></a>
-							{% endif %}
-					</span>
-				</div>
-			</header>
-			<input id="toggle_sidebar" class="LP-Menu__Trigger" type="checkbox"/>
-			<label id="toggle_sidebar_label" for="toggle_sidebar" class="LP-Menu__TriggerLabel"></label>
-			<aside class="LP-Main__Sidebar">
-				<nav class="LP-Menu LP-Menu--sidebar">
-					<ul class="LP-Menu__List">
-						<li class="LP-Menu__Item"><a href="/" class="LP-Link"><span class="LP-Link__Text">Home</span></a></li>
-						<li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">About</span></a></li>
-						<li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">Contact</span></a></li>
-						{% block additional_menu_items %}
-						{% endblock additional_menu_items %}
-						<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_create'%}" class="LP-Link"><span class="LP-Link__Text">Create place</span></a></li>
-						<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_list'%}" class="LP-Link"><span class="LP-Link__Text">See all places</span></a></li>
-					</ul>
-				</nav>
-			</aside>
-			<main class="LP-Main__Content">
-				{% if messages %}
-				<div class="LP-MessageList">
-					<ul class="LP-MessageList__List">
-						{% for message in messages %}
-						<li class="LP-MessageList__Item">
-							<div class="LP-Message {% if message.tags %}LP-Message--{{ message.tags }}{% endif %}">
-								<div>
-									<div class="LP-Message__Icon">
-									</div>
-								</div>
-								<div class="LP-Message__Text">
-									{{ message }}
-								</div>
-							</div>
-						</li>
-						{% endfor %}
-					</ul>
-				</div>
-				{% endif %}
-				{% block maincontent %}
-				{% endblock maincontent %}
-			</main>
-		</div>
+        <div class="LP-Wrapper__Site">
+            <header class="LP-Header">
+                <div class="LP-Header__Logo">
+                    <a class="LP-Link" href="/">
+                        <img src="{% static 'logo.png' %}" class="LP-Image" />
+                    </a>    
+                </div>
+                <div class="LP-Header__UserInformation">
+                    <span class="LP-Paragraph">
+                        {% if user.is_authenticated %}
+                            Hi {{ user.username }}!
+                                <a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">logout</span></a> 
+                                {% if user.is_superuser %}
+                                | <a class="LP-Link" href="{% url 'admin:index' %}" target="_blank"><span class="LP-Link__Text">admin</span></a>
+                                {% endif %}
+                                
+                            {% else %}
+                                You are not logged in.
+                                <a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">login</span></a> |
+                                <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">signup</span></a>
+                            {% endif %}
+                    </span>
+                </div>
+            </header>
+            <input id="toggle_sidebar" class="LP-Menu__Trigger" type="checkbox"/>
+            <label id="toggle_sidebar_label" for="toggle_sidebar" class="LP-Menu__TriggerLabel"></label>
+            <aside class="LP-Main__Sidebar">
+                <nav class="LP-Menu LP-Menu--sidebar">
+                    <ul class="LP-Menu__List">
+                        <li class="LP-Menu__Item"><a href="/" class="LP-Link"><span class="LP-Link__Text">Home</span></a></li>
+                        <li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">About</span></a></li>
+                        <li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">Contact</span></a></li>
+                        {% block additional_menu_items %}
+                        {% endblock additional_menu_items %}
+                        <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_create'%}" class="LP-Link"><span class="LP-Link__Text">Create place</span></a></li>
+                        <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_list'%}" class="LP-Link"><span class="LP-Link__Text">See all places</span></a></li>
+                    </ul>
+                </nav>
+            </aside>
+            <main class="LP-Main__Content">
+                {% if messages %}
+                <div class="LP-MessageList">
+                    <ul class="LP-MessageList__List">
+                        {% for message in messages %}
+                        <li class="LP-MessageList__Item">
+                            <div class="LP-Message {% if message.tags %}LP-Message--{{ message.tags }}{% endif %}">
+                                <div>
+                                    <div class="LP-Message__Icon">
+                                    </div>
+                                </div>
+                                <div class="LP-Message__Text">
+                                    {{ message }}
+                                </div>
+                            </div>
+                        </li>
+                        {% endfor %}
+                    </ul>
+                </div>
+                {% endif %}
+                {% block maincontent %}
+                {% endblock maincontent %}
+            </main>
+        </div>
    </body>
 </html>
--- a/lostplaces/lostplaces_app/templates/partials/nav/pagination.html
+++ b/lostplaces/lostplaces_app/templates/partials/nav/pagination.html
@@ -1,44 +1,73 @@
+{% load lostplaces %}
+
 {% if is_paginated %}
    <div class="LP-Pagination">
        <ul class="LP-Pagination__List">
            {% if page_obj.has_previous %}
-                <li class="LP-Pagination__Item LP-Pagination__Item--first">
-                    <a href="?page=1" class="LP-Link"><span class="LP-Pagination__First">first</span></a>
-                </li>
-                <li class="LP-Pagination__Item LP-Pagination__Item--previous">
-                    <a href="?page={{ page_obj.previous_page_number }}" class="LP-Link"><span class="LP-Pagination__Previous">previous</span></a>
+            <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--first">
+                <a href="?page=1" class="LP-Link">
+                    <span class="LP-Icon">⟪</span>
+                    <span class="LP-Text">First</span>
+                </a>
+            </li>
+                <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--previous">
+                    <a href="?page={{ page_obj.previous_page_number }}" class="LP-Link">
+                        <span class="LP-Icon">⟨</span>
+                        <span class="LP-Text">Previous</span>
+                    </a>
                </li>
            {% else %}
-                <li class="LP-Pagination__Item LP-Pagination__Item--first LP-Pagination__Item--disabled">
-                    <span class="LP-Pagination__First">first</span>
+                <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--first LP-Pagination__Item--disabled">
+                    <a href="#" class="LP-Link">
+                        <span class="LP-Icon">⟪</span>
+                        <span class="LP-Text">First</span>
+                    </a>
                </li>
-                <li class="LP-Pagination__Item LP-Pagination__Item--previous LP-Pagination__Item--disabled">
-                    <span class="LP-Pagination__Previous">previous</span>
+                <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--previous LP-Pagination__Item--disabled">
+                    <a href="#" class="LP-Link">
+                        <span class="LP-Icon">⟨</span>
+                        <span class="LP-Text">Previous</span>
+                    </a>
                </li>
            {% endif %}
-            {% for i in page_obj.paginator %}
-                {% if i.number == page_obj.number %}
-                    <li class="LP-Pagination__Item LP-Pagination__Item--number LP-Pagination__Item--current">
+            
+            {% for i in page_obj.paginator|proper_paginate:page_obj.number %}
+                {% if i == page_obj.number %}
+                    <li class="LP-Pagination__Item LP-Pagination__Item--current">
                {% else %}
-                    <li class="LP-Pagination__Item LP-Pagination__Item--number">
+                    <li class="LP-Pagination__Item LP-Pagination__Item--neighbor">
                {% endif %}
-                        <a href="?page={{i.number}}" class="LP-Link"><span class="LP-Pagination__Number">{{i.number}}</span></a>
+                        <a href="?page={{i}}" class="LP-Link">
+                            <span class="LP-Text">{{i}}</span>
+                        </a>
                    </li>
            {% endfor %}
+            
            {% if page_obj.has_next %}
-                <li class="LP-Pagination__Item LP-Pagination__Item--next">
-                    <a href="?page={{ page_obj.next_page_number }}" class="LP-Link"><span class="LP-Pagination__Next">next</span></a>
-                </li>
-                <li class="LP-Pagination__Item LP-Pagination__Item--last">
-                    <a href="?page={{ page_obj.paginator.num_pages }}" class="LP-Link"><span class="LP-Pagination__Last">last</span></a>
-                </li>
+            <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--next">
+                <a href="?page={{ page_obj.next_page_number }}" class="LP-Link">
+                    <span class="LP-Text">Next</span>
+                    <span class="LP-Icon">⟩</span>
+                </a>
+            </li>
+            <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--last">
+                <a href="?page={{ page_obj.paginator.num_pages }}" class="LP-Link">
+                    <span class="LP-Text">Last</span>
+                    <span class="LP-Icon">⟫</span>
+                </a>
+            </li>
            {% else %}
-                <li class="LP-Pagination__Item LP-Pagination__Item--next LP-Pagination__Item--disabled">
-                    <span class="LP-Pagination__Next">next</span>
-                </li>
-                <li class="LP-Pagination__Item LP-Pagination__Item--last LP-Pagination__Item--disabled">
-                    <span class="LP-Pagination__Last">last</span>
-                </li>
+            <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--next LP-Pagination__Item--disabled">
+                <a href="#" class="LP-Link">
+                    <span class="LP-Text">Next</span>
+                    <span class="LP-Icon">⟩</span>
+                </a>
+            <li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--last LP-Pagination__Item--disabled">
+                <a href="#" class="LP-Link">
+                    <span class="LP-Text">Last</span>
+                    <span class="LP-Icon">⟫</span>
+                </a>
+            </li>
            {% endif %}
        </ul>
    </div>
--- a/lostplaces/lostplaces_app/templates/place/place_create.html
+++ b/lostplaces/lostplaces_app/templates/place/place_create.html
@@ -38,16 +38,16 @@
            </div>
        </div>

-		<div class="LP-Form__Composition LP-Form__Composition--buttons">
-			<div class="LP-Form__Field LP-Form__Button LP-Input">
-				<button class="LP-Button">Create</button>
-			</div>
-			<div class="LP-Form__Field LP-Form__Button LP-Input">
-				<a class="LP-Link" href="{% url 'place_list' %}">
-					<button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
-				</a>
-			</div>
-		</div>
+        <div class="LP-Form__Composition LP-Form__Composition--buttons">
+            <div class="LP-Form__Field LP-Form__Button LP-Input">
+                <button class="LP-Button">Create</button>
+            </div>
+            <div class="LP-Form__Field LP-Form__Button LP-Input">
+                <a class="LP-Link" href="{% url 'place_list' %}">
+                    <button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
+                </a>
+            </div>
+        </div>
    </fieldset>

 </form>
--- a/lostplaces/lostplaces_app/templates/place/place_delete.html
+++ b/lostplaces/lostplaces_app/templates/place/place_delete.html
@@ -9,22 +9,22 @@
    <fieldset class="LP-Form__Fieldset">
        <legend class="LP-Form__Legend">Delete place</legend>
        {% csrf_token %}
-		<div class="LP-Form__Composition">
-			<div class="LP-Form__Field LP-Form__InfoText">
-				<p class="LP-Paragraph">Are you sure you want to delete "{{place.name}}"? </p>
-			</div>
-		</div>
+        <div class="LP-Form__Composition">
+            <div class="LP-Form__Field LP-Form__InfoText">
+                <p class="LP-Paragraph">Are you sure you want to delete "{{place.name}}"? </p>
+            </div>
+        </div>

-		<div class="LP-Form__Composition LP-Form__Composition--buttons">
-			<div class="LP-Form__Field LP-Form__Button LP-Input">
-				<button class="LP-Button">Delete</button>
-			</div>
-			<div class="LP-Form__Field LP-Form__Button LP-Input">
-				<a class="LP-Link" href="{% url 'place_detail' pk=place.pk %}">
-					<button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
-				</a>
-			</div>
-		</div>
+        <div class="LP-Form__Composition LP-Form__Composition--buttons">
+            <div class="LP-Form__Field LP-Form__Button LP-Input">
+                <button class="LP-Button">Delete</button>
+            </div>
+            <div class="LP-Form__Field LP-Form__Button LP-Input">
+                <a class="LP-Link" href="{% url 'place_detail' pk=place.pk %}">
+                    <button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
+                </a>
+            </div>
+        </div>
    </fieldset>
 </form>
 {% endblock maincontent %}
--- a/lostplaces/lostplaces_app/templates/place/place_detail.html
+++ b/lostplaces/lostplaces_app/templates/place/place_detail.html
@@ -5,20 +5,20 @@
 {% block title %}{{place.name}}{% endblock %}

 {% block additional_menu_items %}
-	<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_edit' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">Edit place</span></a></li>
-	<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_delete' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">Delete place</span></a></li>
+    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_edit' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">Edit place</span></a></li>
+    <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_delete' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">Delete place</span></a></li>
 {% endblock additional_menu_items %}
-	
+    
 {% block maincontent %}
 <article class="LP-PlaceDetail">

    <header class="LP-PlaceDetail__Header">
-		<h1 class="LP-Headline">{{ place.name }}</h1>
-		{% if place.images.first.filename.hero.url %}
-			<figure class="LP-PlaceDetail__Image">
-				<img src="{{ place.images.first.filename.hero.url }}" class="LP-Image" />
-			</figure>
-		{% endif %}
+        <h1 class="LP-Headline">{{ place.name }}</h1>
+        {% if place.images.first.filename.hero.url %}
+            <figure class="LP-PlaceDetail__Image">
+                <img src="{{ place.images.first.filename.hero.url }}" class="LP-Image" />
+            </figure>
+        {% endif %}
    </header>

    <div class="LP-PlaceDetail__Description">
@@ -29,25 +29,25 @@
        <h1 class="LP-Headline">Map-Links</h1>
        <div class="LP-LinkList">
            <ul class="LP-LinkList__List">
-				<li class="LP-LinkList__Item"><a target="_blank" href="https://www.google.com/maps?q={{place.latitude}},{{place.longitude}}" class="LP-Link"><span class="LP-Text">Google Maps</span></a></li>
+                <li class="LP-LinkList__Item"><a target="_blank" href="https://www.google.com/maps?q={{place.latitude}},{{place.longitude}}" class="LP-Link"><span class="LP-Text">Google Maps</span></a></li>
                <li class="LP-LinkList__Item"><a target="_blank" href="https://www.tim-online.nrw.de/tim-online2/?center={{place.latitude}},{{place.longitude}}&icon=true&bg=dop" class="LP-Link"><span class="LP-Text">TIM Online</span></a></li>
                <li class="LP-LinkList__Item"><a target="_blank" href="http://www.openstreetmap.org/?mlat={{place.latitude}}&mlon={{place.longitude}}&zoom=16" class="LP-Link"><span class="LP-Text">OSM</span></a></li>
            </ul>
        </div>
-	</section>
-	
+    </section>
+    
    <section class="LP-Section">
        <h1 class="LP-Headline">Bilder</h1>
        <div class="LP-ImageGrid">
            <ul class="LP-ImageGrid__List">
-				{% for place_image in place.images.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>
-				</li>
-				{% endfor %}
+                {% for place_image in place.images.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>
+                </li>
+                {% endfor %}
            </ul>
        </div>
-	</section>
-	
+    </section>
+    
 </article>
 {% endblock maincontent %}
--- a/lostplaces/lostplaces_app/templates/place/place_update.html
+++ b/lostplaces/lostplaces_app/templates/place/place_update.html
@@ -37,17 +37,17 @@
                {% include 'partials/form/inputField.html' with field=form.filename %}
            </div>
        </div>
-		
-		<div class="LP-Form__Composition LP-Form__Composition--buttons">
-			<div class="LP-Form__Field LP-Form__Button LP-Input">
-				<button class="LP-Button">Update</button>
-			</div>
-			<div class="LP-Form__Field LP-Form__Button LP-Input">
-				<a class="LP-Link" href="{% url 'place_detail' pk=place.pk %}">
-					<button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
-				</a>
-			</div>
-		</div>
+        
+        <div class="LP-Form__Composition LP-Form__Composition--buttons">
+            <div class="LP-Form__Field LP-Form__Button LP-Input">
+                <button class="LP-Button">Update</button>
+            </div>
+            <div class="LP-Form__Field LP-Form__Button LP-Input">
+                <a class="LP-Link" href="{% url 'place_detail' pk=place.pk %}">
+                    <button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
+                </a>
+            </div>
+        </div>
    </fieldset>

 </form>
--- a/lostplaces/lostplaces_app/templatetags/init.py
+++ b/lostplaces/lostplaces_app/templatetags/init.py
--- a/lostplaces/lostplaces_app/templatetags/lostplaces.py
+++ b/lostplaces/lostplaces_app/templatetags/lostplaces.py
@@ -0,0 +1,22 @@
+from django import template
+
+register = template.Library()
+
+@register.filter(name='proper_paginate')
+def proper_paginate(paginator, current_page, neighbors=2):
+    if paginator.num_pages > 2*neighbors:
+        start_index = max(1, current_page-neighbors)
+        end_index = min(paginator.num_pages, current_page + neighbors)
+        if end_index < start_index + 2*neighbors:
+            end_index = start_index + 2*neighbors
+        elif start_index > end_index - 2*neighbors:
+            start_index = end_index - 2*neighbors
+        if start_index < 1:
+            end_index -= start_index
+            start_index = 1
+        elif end_index > paginator.num_pages:
+            start_index -= (end_index-paginator.num_pages)
+            end_index = paginator.num_pages
+        page_list = [f for f in range(start_index, end_index+1)]
+        return page_list[:(2*neighbors + 1)]
+    return paginator.page_range
--- a/lostplaces/lostplaces_app/views.py
+++ b/lostplaces/lostplaces_app/views.py
@@ -50,7 +50,7 @@ class SignUpView(SuccessMessageMixin, CreateView):
    success_message = 'User created.'

 class PlaceListView(IsAuthenticated, ListView):
-    paginate_by = 5
+    paginate_by = 2
    model = Place
    template_name = 'place/place_list.html'

--- a/lostplaces/templates/403.html
+++ b/lostplaces/templates/403.html
@@ -4,12 +4,12 @@

 {% block additional_head %}
 {% if request.META.HTTP_REFERER %}
-	<meta http-equiv="refresh" content="5;url={{ request.META.HTTP_REFERER }}" />
+    <meta http-equiv="refresh" content="5;url={{ request.META.HTTP_REFERER }}" />
 {% endif %}
 {% endblock additional_head %}

 {% block maincontent %}
 {% if request.META.HTTP_REFERER %}
-	<p class="LP-Headline">You will be redirected in 5 seconds</p><p class="LP-Headline"><a href="{{ request.META.HTTP_REFERER }}" class="LP-Link">Go Back</a></p>
+    <p class="LP-Headline">You will be redirected in 5 seconds</p><p class="LP-Headline"><a href="{{ request.META.HTTP_REFERER }}" class="LP-Link">Go Back</a></p>
 {% endif %}
 {% endblock maincontent %}
--- a/lostplaces/templates/registration/login.html
+++ b/lostplaces/templates/registration/login.html
@@ -18,12 +18,12 @@
            </div>
        </div>

-		<div class="LP-Form__Composition LP-Form__Composition--buttons">
-			<div class="LP-Form__Field LP-Form__Button LP-Input">
-				<button class="LP-Button">Login</button>
-			</div>
-		</div>
-	</div>
+        <div class="LP-Form__Composition LP-Form__Composition--buttons">
+            <div class="LP-Form__Field LP-Form__Button LP-Input">
+                <button class="LP-Button">Login</button>
+            </div>
+        </div>
+    </div>
    </fieldset>

 </form>
--- a/lostplaces/templates/signup.html
+++ b/lostplaces/templates/signup.html
@@ -35,11 +35,11 @@
            </div>
        </div>

-		<div class="LP-Form__Composition LP-Form__Composition--buttons">
-			<div class="LP-Form__Field LP-Form__Button LP-Input">
-				<button class="LP-Button">Sign up</button>
-			</div>
-		</div>
+        <div class="LP-Form__Composition LP-Form__Composition--buttons">
+            <div class="LP-Form__Field LP-Form__Button LP-Input">
+                <button class="LP-Button">Sign up</button>
+            </div>
+        </div>
    </fieldset>

 </form>
Author	SHA1	Message	Date
Commander1024	6b90ca39eb	Converted indentation to spaces globally.	2020-08-17 15:38:52 +02:00
Commander1024	c1007fb7bc	Added migrations directory to .gitignore.	2020-08-17 12:36:27 +02:00
Commander1024	aa4c77e675	Deleted old migrations.	2020-08-17 12:30:45 +02:00
Commander1024	7a378c26d0	Unified first/last - next/prev behaviour. Fixed previous button.	2020-08-17 12:03:30 +02:00
reverend	d58d118953	New Markup for Pagination	2020-08-17 08:45:12 +02:00
reverend	4ea8d16253	Fixed pagiatation	2020-08-16 16:29:04 +02:00