diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py index fb0d400b..e79f9749 100644 --- a/pinaxcon/proposals/forms.py +++ b/pinaxcon/proposals/forms.py @@ -2,6 +2,7 @@ import copy from django import forms +from pinaxcon.proposals.fields import HelpTextField from pinaxcon.proposals.models import TalkProposal, TutorialProposal, MiniconfProposal from pinaxcon.proposals.models import SysAdminProposal, KernelProposal, OpenHardwareProposal from pinaxcon.proposals.models import GamesProposal, DevDevProposal, ArtTechProposal @@ -104,11 +105,30 @@ class KernelProposalForm(ProposalForm): model = KernelProposal fields = DEFAULT_FIELDS + class GamesProposalForm(ProposalForm): + HELP_TEXT = ("If you have any questions please contact " + "the games miniconf organisers. We're excited to hear from you! You " + "can reach us via email " + "games@lca.lonely.coffee or twitter DM " + "@ducky_tape and @the_mcjones.") + + help_field = HelpTextField(text=HELP_TEXT, label='') + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fields['private_abstract'].help_text = ("it would be helpful if " + "you could please include a rough (don't worry, " + "we know it might change!) Outline of your presentation, e.g. " + "'0-2mins intro, 2-5mins the problem, 5-10mins things, 10-15mins " + "stuff 15-20mins solution'.") + class Meta: model = GamesProposal - fields = TALK_FORMAT_FIELDS + fields = ['help_field', ] + TALK_FORMAT_FIELDS class OpenHardwareProposalForm(ProposalForm): diff --git a/pinaxcon/proposals/migrations/0010_auto_20181006_0542.py b/pinaxcon/proposals/migrations/0010_auto_20181006_0542.py new file mode 100644 index 00000000..6f4b99b5 --- /dev/null +++ b/pinaxcon/proposals/migrations/0010_auto_20181006_0542.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.15 on 2018-10-05 19:42 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('proposals', '0009_docsproposal'), + ] + + operations = [ + migrations.AlterField( + model_name='gamesproposal', + name='talk_format', + field=models.IntegerField(choices=[(1, 'Presentation (long)'), (1, 'Presentation (short)'), (3, 'Demonstration'), (4, 'Other')]), + ), + ] diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py index 676e4e24..b2a68e69 100644 --- a/pinaxcon/proposals/models.py +++ b/pinaxcon/proposals/models.py @@ -103,11 +103,13 @@ class KernelProposal(Proposal): class GamesProposal(Proposal): TYPE_PRESENTATION = 1 - TYPE_DEMONSTRATION = 2 - TYPE_OTHER = 3 + TYPE_SHORT_PRESENTATION = 2 + TYPE_DEMONSTRATION = 3 + TYPE_OTHER = 4 TALK_FORMATS = [ - (TYPE_PRESENTATION, "Presentation"), + (TYPE_PRESENTATION, "Presentation (long)"), + (TYPE_PRESENTATION, "Presentation (short)"), (TYPE_DEMONSTRATION, "Demonstration"), (TYPE_OTHER, "Other"), ]