diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py index 42993ac3abd99a9b510c526339e0f208ac574ca1..ad5aecb3cb293b1ffe022ceb512f7da07252a7d9 100644 --- a/pinaxcon/proposals/models.py +++ b/pinaxcon/proposals/models.py @@ -45,67 +45,77 @@ class TalkProposal(Proposal): class Meta: verbose_name = "talk proposal" + class TutorialProposal(Proposal): class Meta: verbose_name = "tutorial proposal" + class MiniconfProposal(ProposalBase): class Meta: verbose_name = "miniconf proposal" + class SysAdminProposal(Proposal): TYPE_SHORT_PRESENTATION = 1 TYPE_LIGHTNING_TALK = 2 - + TALK_FORMATS = [ (TYPE_SHORT_PRESENTATION, "Short Presentation (15-25 min)"), (TYPE_LIGHTNING_TALK, "Lightning Talk (5-10 min)"), ] - - talk_format = models.IntegerField(choices=TALK_FORMATS, + + talk_format = models.IntegerField( + choices=TALK_FORMATS, help_text="Please indicate your preferred talk length in the private abstract field below.") - + class Meta: verbose_name = "System Administration Miniconf Proposal" + class WriteTheDocsProposal(Proposal): - TYPE_LONG_PRESENTATION = 1 + TYPE_LONG_PRESENTATION = 1 TYPE_SHORT_PRESENTATION = 2 - + TALK_FORMATS = [ - (TYPE_LONG_PRESENTATION, "Long Presentation (40 min)"), + (TYPE_LONG_PRESENTATION, "Long Presentation (40 min)"), (TYPE_SHORT_PRESENTATION, "Short Presentation (20 min)"), ] - + talk_format = models.IntegerField(choices=TALK_FORMATS) - + class Meta: verbose_name = "WriteThe Docs Miniconf Proposal" + class OpenRadioProposal(Proposal): class Meta: verbose_name = "OpenRadio Miniconf Proposal" + class WootconfProposal(Proposal): class Meta: verbose_name = "WOOTCONF Miniconf Proposal" + class KernelProposal(Proposal): class Meta: verbose_name = "Kernel Miniconf Proposal" + class SecurityProposal(Proposal): class Meta: verbose_name = "Security/Privacy Miniconf Proposal" + class GamesProposal(Proposal): TYPE_PRESENTATION = 1 @@ -117,38 +127,42 @@ class GamesProposal(Proposal): (TYPE_DEMONSTRATION, "Demonstration"), (TYPE_OTHER, "Other"), ] - + talk_format = models.IntegerField(choices=TALK_FORMATS) - + class Meta: verbose_name = "Games and FOSS Miniconf Proposal" + class TestingProposal(Proposal): class Meta: verbose_name = "Testing/Automation Miniconf Proposal" + class KnowledgeProposal(Proposal): class Meta: verbose_name = "Open Knowledge Australia Miniconf Proposal" + class LawProposal(Proposal): class Meta: verbose_name = "Open Law and Policy Miniconf Proposal" + class OpenHardwareProposal(Proposal): - TYPE_NORMAL_PRESENTATION = 1 + TYPE_NORMAL_PRESENTATION = 1 TYPE_LIGHTNING_TALK = 2 - + TALK_FORMATS = [ - (TYPE_NORMAL_PRESENTATION, "Presentation (20 min)"), + (TYPE_NORMAL_PRESENTATION, "Presentation (20 min)"), (TYPE_LIGHTNING_TALK, "Lightning Talk (5 min)"), ] - + talk_format = models.IntegerField(choices=TALK_FORMATS) - + class Meta: verbose_name = "Open Hardware Miniconf Proposal"