Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Games Miniconf CFP (#70)

Browse source
This commit is contained in:
Scott Bragg 2016-09-25 15:38:15 +10:00 committed by GitHub
parent 57ed5e546b
commit df808d52f3
5 changed files with 98 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pinaxcon/proposals/forms.py
View file

@ -137,6 +137,10 @@ class RadioProposalForm(ProposalForm):
"abstract",
"private_abstract",
"technical_requirements",
"project",
"project_url",
"recording_release",
"materials_release",
]
widgets = {
@ -154,6 +158,10 @@ class KernelProposalForm(ProposalForm):
"abstract",
"private_abstract",
"technical_requirements",
"project",
"project_url",
"recording_release",
"materials_release",
]
widgets = {
@ -171,6 +179,10 @@ class WootconfProposalForm(ProposalForm):
"abstract",
"private_abstract",
"technical_requirements",
"project",
"project_url",
"recording_release",
"materials_release",
]
widgets = {
@ -188,6 +200,33 @@ class SecurityProposalForm(ProposalForm):
"abstract",
"private_abstract",
"technical_requirements",
"project",
"project_url",
"recording_release",
"materials_release",
]
widgets = {
"abstract" : widgets.AceMarkdownEditor(),
"private_abstract" : widgets.AceMarkdownEditor(),
"technical_requirements" : widgets.AceMarkdownEditor(),
}
class GamesProposalForm(ProposalForm):
class Meta:
model = GamesProposal
fields = [
"title",
"talk_format",
"target_audience",
"abstract",
"private_abstract",
"technical_requirements",
"project",
"project_url",
"recording_release",
"materials_release",
]
widgets = {

36
pinaxcon/proposals/migrations/0004_auto_20160925_0534.py Normal file
View file

@ -0,0 +1,36 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.7 on 2016-09-25 05:34
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('symposion_proposals', '0001_initial'),
('proposals', '0003_kernelproposal_openradioproposal_securityproposal_wootconfproposal'),
]
operations = [
migrations.CreateModel(
name='GamesProposal',
fields=[
('proposalbase_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='symposion_proposals.ProposalBase')),
('target_audience', models.IntegerField(choices=[(1, b'User'), (2, b'Business'), (3, b'Community'), (4, b'Developer')])),
('recording_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>")),
('materials_release', models.BooleanField(default=True, help_text=b"I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>")),
('talk_format', models.IntegerField(choices=[(1, b'Presentation'), (2, b'Demonstration'), (3, b'Other')])),
],
options={
'verbose_name': 'Games and FOSS Miniconf Proposal',
},
bases=('symposion_proposals.proposalbase',),
),
migrations.AlterField(
model_name='sysadminproposal',
name='talk_format',
field=models.IntegerField(choices=[(1, b'Short Presentation (15-25 min)'), (2, b'Lightning Talk (5-10 min)')], help_text=b'Please indicate your preferred talk length in the private abstract field below.'),
),
]

24
pinaxcon/proposals/models.py
View file

@ -61,11 +61,12 @@ class SysAdminProposal(Proposal):
TYPE_LIGHTNING_TALK = 2
TALK_FORMATS = [
(TYPE_SHORT_PRESENTATION, "Short Presentation (20 min)"),
(TYPE_LIGHTNING_TALK, "Lightning Talk (5 min)"),
(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"
@ -104,3 +105,20 @@ class SecurityProposal(ProposalBase):
class Meta:
verbose_name = "Security/Privacy Miniconf Proposal"
class GamesProposal(Proposal):
TYPE_PRESENTATION = 1
TYPE_DEMONSTRATION = 2
TYPE_OTHER = 3
TALK_FORMATS = [
(TYPE_PRESENTATION, "Presentation"),
(TYPE_DEMONSTRATION, "Demonstration"),
(TYPE_OTHER, "Other"),
]
talk_format = models.IntegerField(choices=TALK_FORMATS)
class Meta:
verbose_name = "Games and FOSS Miniconf Proposal"

1
pinaxcon/settings.py
View file

@ -259,6 +259,7 @@ PROPOSAL_FORMS = {
"writethedocs-miniconf": "pinaxcon.proposals.forms.WriteTheDocsProposalForm",
"security-miniconf": "pinaxcon.proposals.forms.SecurityProposalForm",
"kernel-miniconf": "pinaxcon.proposals.forms.KernelProposalForm",
"games-miniconf": "pinaxcon.proposals.forms.GamesProposalForm",
}
#PINAX_PAGES_HOOKSET = "pinaxcon.hooks.PinaxPagesHookSet"

2
pinaxcon/templates/dashboard.html
View file

@ -179,7 +179,7 @@
{% for team in available_teams %}
<tr>
<td>
<a href="{% url team_detail team.slug %}">{{ team }}</a>
<a href="{% url "team_detail" team.slug %}">{{ team }}</a>
{% if team.description %}<br>{{ team.description }}{% endif %}
</td>
<td>