diff --git a/lostplaces/lostplaces_app/forms.py b/lostplaces/lostplaces_app/forms.py index 5e79612..7e1d942 100644 --- a/lostplaces/lostplaces_app/forms.py +++ b/lostplaces/lostplaces_app/forms.py @@ -11,7 +11,7 @@ class ExplorerCreationForm(UserCreationForm): class Meta: model = Explorer fields = ('username', 'email') - voucher = forms.CharField(max_length=10) + voucher = forms.CharField(max_length=10, help_text='The Voucher you got from an administrator') def is_valid(self): super().is_valid() diff --git a/lostplaces/lostplaces_app/migrations/0009_place_submitted_when.py b/lostplaces/lostplaces_app/migrations/0009_place_submitted_when.py new file mode 100644 index 0000000..44a6ff9 --- /dev/null +++ b/lostplaces/lostplaces_app/migrations/0009_place_submitted_when.py @@ -0,0 +1,18 @@ +# 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), + ), + ] diff --git a/lostplaces/lostplaces_app/migrations/0010_auto_20200803_1707.py b/lostplaces/lostplaces_app/migrations/0010_auto_20200803_1707.py new file mode 100644 index 0000000..186860e --- /dev/null +++ b/lostplaces/lostplaces_app/migrations/0010_auto_20200803_1707.py @@ -0,0 +1,20 @@ +# 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), + ), + ] diff --git a/lostplaces/lostplaces_app/static/main.css b/lostplaces/lostplaces_app/static/main.css index 7bcb71c..63e7add 100644 --- a/lostplaces/lostplaces_app/static/main.css +++ b/lostplaces/lostplaces_app/static/main.css @@ -1,11 +1,3 @@ -@font-face { - font-family: Crimson; - src: url("fonts/Crimson/CrimsonText-Regular.ttf"), url("fonts/Crimson/CrimsonText-Bold.ttf"), url("fonts/Crimson/CrimsonText-Italic.ttf"); } - -@font-face { - font-family: Montserrat; - src: url("fonts/Montserrat/Montserrat-Regular.otf"), url("fonts/Montserrat/Montserrat-Bold.otf"), url("fonts/Montserrat/Montserrat-Italic.otf"); } - .LP-Link { color: #565656; text-decoration: none; @@ -420,6 +412,9 @@ .LP-HorizontalLine { color: #565656; } +.LP-Section { + clear: both; } + @media (max-width: 650px) { .LP-MainContainer { width: 100%; } } diff --git a/lostplaces/templates/signup.html b/lostplaces/templates/signup.html index abfce8d..2ef3042 100644 --- a/lostplaces/templates/signup.html +++ b/lostplaces/templates/signup.html @@ -29,6 +29,11 @@ {% include 'partials/form/inputField.html' with field=form.password2 %} +
+
+ {% include 'partials/form/inputField.html' with field=form.voucher %} +
+