diff --git a/.gitignore b/.gitignore index afaa203c..c79329de 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ *.sock *.pid *.python-version - +/conference/settings.py.backup 99_vault.yaml diff --git a/conference/settings.py b/conference/settings.py index 0479e8f5..72121e48 100644 --- a/conference/settings.py +++ b/conference/settings.py @@ -29,6 +29,10 @@ INSTALLED_APPS.append('storages') SITE_ID = int(os.environ.get('SITE_ID')) +INSTALLED_APPS.append('storages') + +SITE_ID = 2 + BLENDER_ID = { # MUST end in a slash: 'BASE_URL': os.environ.get('BASE_URL'), diff --git a/conference_main/forms.py b/conference_main/forms.py index c9f4c4f5..571691d1 100644 --- a/conference_main/forms.py +++ b/conference_main/forms.py @@ -37,7 +37,11 @@ class PresentationForm(forms.ModelForm): class MessageForm(forms.Form): - message = forms.CharField(widget=forms.Textarea) + message = forms.CharField(widget=forms.Textarea( + attrs={'placeholder': ''' + (Main Stage, 20 minutes)\n\nThis totally awesome talk is going to be about... + ''' + )) class FestivalEntryForm(forms.ModelForm): diff --git a/conference_main/templates/flatpages/default_with_header.pug b/conference_main/templates/flatpages/default_with_header.pug index ae9f7693..0c571928 100644 --- a/conference_main/templates/flatpages/default_with_header.pug +++ b/conference_main/templates/flatpages/default_with_header.pug @@ -10,4 +10,9 @@ a.whoosh.whoosh-page(href="{% url 'admin:flatpages_flatpage_change' flatpage.id | {% block content_main %} .flatpage | {{ flatpage.content }} + | {% endblock content_main %} + +| {% block site_footer %} +| {% include "conference_main/components/sponsors.pug" %} +| {% endblock site_footer %} diff --git a/tickets/views/tickets.py b/tickets/views/tickets.py index 4e82ded1..4792f7fa 100644 --- a/tickets/views/tickets.py +++ b/tickets/views/tickets.py @@ -1,4 +1,5 @@ import logging +from datetime import datetime from django import urls from django.contrib import messages