JonathanWilliamson/bconla
0
0
Fork 1
forked from infrastructure/conference-website
Code Issues Pull Requests Activity

Adding placeholder text in the presentation proposal form #1

Closed
Jason van Gumster wants to merge 16 commits from (deleted):proposal_placeholders into staging
pull from: (deleted):proposal_placeholders
merge into: JonathanWilliamson:staging

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 16 Files Changed 5 +16 -2
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -6,5 +6,5 @@
*.sock *.sock
*.pid *.pid
*.python-version *.python-version
/conference/settings.py.backup
99_vault.yaml 99_vault.yaml

4
conference/settings.py
View File

@ -29,6 +29,10 @@ INSTALLED_APPS.append('storages')
SITE_ID = int(os.environ.get('SITE_ID')) SITE_ID = int(os.environ.get('SITE_ID'))
INSTALLED_APPS.append('storages')
SITE_ID = 2
BLENDER_ID = { BLENDER_ID = {
# MUST end in a slash: # MUST end in a slash:
'BASE_URL': os.environ.get('BASE_URL'), 'BASE_URL': os.environ.get('BASE_URL'),

6
conference_main/forms.py
View File

@ -37,7 +37,11 @@ class PresentationForm(forms.ModelForm):
class MessageForm(forms.Form): 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): class FestivalEntryForm(forms.ModelForm):

5
conference_main/templates/flatpages/default_with_header.pug
View File

@ -10,4 +10,9 @@ a.whoosh.whoosh-page(href="{% url 'admin:flatpages_flatpage_change' flatpage.id
| {% block content_main %} | {% block content_main %}
.flatpage .flatpage
| {{ flatpage.content }} | {{ flatpage.content }}
| {% endblock content_main %} | {% endblock content_main %}
| {% block site_footer %}
| {% include "conference_main/components/sponsors.pug" %}
| {% endblock site_footer %}

1
tickets/views/tickets.py
View File

@ -1,4 +1,5 @@
import logging import logging
from datetime import datetime
from django import urls from django import urls
from django.contrib import messages from django.contrib import messages