0 2 2
Brett Smith - 14 months ago 2019-09-30 15:46:47
brettcsmith@brettcsmith.org
forms: Adjusted for CopyleftConf 2019. Including changes to the help text.
4 files changed with 108 insertions and 28 deletions:
↑ Collapse Diff ↑
...
 
@@ -17,6 +17,9 @@ class ConferenceSpeakerForm(forms.ModelForm):
17 17
 
            'invite_token',
18 18
 
            'annotation',
19 19
 
            'reviewer',
20
 
            # Not happening for CopyleftConf 2019.
21
 
            'travel_assistance',
22
 
            'lodging_assistance',
20 23
 
        ]
21 24
 

	
22 25
 
    def __init__(self, *a, **k):
...
 
@@ -74,7 +77,6 @@ class TalkProposalForm(ProposalForm):
74 77
 
            "description",
75 78
 
            "abstract",
76 79
 
            "new_presentation",
77
 
            "extended_presentation",
78 80
 
            "additional_notes",
79 81
 
            "extra_av",
80 82
 
            "slides_release",
 
new file 100644
1
 
# -*- coding: utf-8 -*-
2
 
# Generated by Django 1.10.7 on 2018-10-05 20:30
3
 
from __future__ import unicode_literals
4
 

	
5
 
from django.db import migrations, models
6
 

	
7
 

	
8
 
class Migration(migrations.Migration):
9
 

	
10
 
    dependencies = [
11
 
        ('proposals', '0006_conferencespeaker_reviewer'),
12
 
    ]
13
 

	
14
 
    operations = [
15
 
        migrations.RemoveField(
16
 
            model_name='talkproposal',
17
 
            name='extended_presentation',
18
 
        ),
19
 
        migrations.AlterField(
20
 
            model_name='conferencespeaker',
21
 
            name='experience',
22
 
            field=models.TextField(blank=True, help_text="List any past speaking experience you have. This can include user groups, meetups, or presentations at work or school.  Edit using <a href='http://warpedvisions.org/projects/markdown-cheat-sheet/' target='_blank'>Markdown</a>.", verbose_name='Past speaking experience'),
23
 
        ),
24
 
        migrations.AlterField(
25
 
            model_name='conferencespeaker',
26
 
            name='first_time',
27
 
            field=models.BooleanField(default=False, help_text='Check this field if this is your first time speaking at a free software conference.', verbose_name='First-time speaker?'),
28
 
        ),
29
 
        migrations.AlterField(
30
 
            model_name='conferencespeaker',
31
 
            name='home_city',
32
 
            field=models.CharField(blank=True, help_text='Which city (and state, and country) will you be traveling from to get to CopyleftConf?', max_length=127),
33
 
        ),
34
 
        migrations.AlterField(
35
 
            model_name='conferencespeaker',
36
 
            name='lodging_assistance',
37
 
            field=models.BooleanField(default=False, help_text='Check this field if you require lodging assistance.', verbose_name='Lodging assistance required?'),
38
 
        ),
39
 
        migrations.AlterField(
40
 
            model_name='conferencespeaker',
41
 
            name='minority_group',
42
 
            field=models.CharField(blank=True, help_text='If you are a member of one or more groups that are under-represented in the free software community, you may list these here. Your response is optional.', max_length=256, verbose_name='Diversity statement'),
43
 
        ),
44
 
        migrations.AlterField(
45
 
            model_name='conferencespeaker',
46
 
            name='travel_assistance',
47
 
            field=models.BooleanField(default=False, help_text='Check this field if you require travel assistance.', verbose_name='Travel assistance required?'),
48
 
        ),
49
 
        migrations.AlterField(
50
 
            model_name='conferencespeaker',
51
 
            name='twitter_username',
52
 
            field=models.CharField(blank=True, help_text='Your Twitter account', max_length=65),
53
 
        ),
54
 
        migrations.AlterField(
55
 
            model_name='talkproposal',
56
 
            name='new_presentation',
57
 
            field=models.BooleanField(default=False, help_text='Check this box if CopyleftConf will be the first time this talk is presented.', verbose_name='This is a new presentation'),
58
 
        ),
59
 
        migrations.AlterField(
60
 
            model_name='talkproposal',
61
 
            name='recording_release',
62
 
            field=models.BooleanField(default=True, help_text='I authorize Software Freedom Conservancy to distribute a recording of my talk under the same license I specify for my slides.'),
63
 
        ),
64
 
        migrations.AlterField(
65
 
            model_name='talkproposal',
66
 
            name='slides_release',
67
 
            field=models.BooleanField(default=True, help_text='I authorize Software Freedom Conservancy to distribute my slides and related materials under either the GNU General Public License, version 3.0 or the Creative Commons Attribution-ShareAlike License, version 4.0, as I specify; and certify that I have the authority to do so.'),
68
 
        ),
69
 
    ]
...
 
@@ -21,7 +21,7 @@ class ConferenceSpeaker(SpeakerBase):
21 21
 
        return super(ConferenceSpeaker, self).save(*args, **kwargs)
22 22
 

	
23 23
 
    twitter_username = models.CharField(
24
 
        max_length=15,
24
 
        max_length=65,
25 25
 
        blank=True,
26 26
 
        help_text=_(u"Your Twitter account")
27 27
 
    )
...
 
@@ -31,7 +31,7 @@ class ConferenceSpeaker(SpeakerBase):
31 31
 
        default=False,
32 32
 
        verbose_name=_("First-time speaker?"),
33 33
 
        help_text=_("Check this field if this is your first time speaking "
34
 
                    "at a technical conference."),
34
 
                    "at a free software conference."),
35 35
 
        )
36 36
 

	
37 37
 
    experience = models.TextField(blank=True, help_text=_
...
 
@@ -48,29 +48,27 @@ class ConferenceSpeaker(SpeakerBase):
48 48
 
        blank=True,
49 49
 
        default=False,
50 50
 
        verbose_name=_("Travel assistance required?"),
51
 
        help_text=_("Check this field if you require travel assistance to get "
52
 
                    "to North Bay Python in Petaluma, California."),
51
 
        help_text=_("Check this field if you require travel assistance."),
53 52
 
    )
54 53
 

	
55 54
 
    lodging_assistance = models.BooleanField(
56 55
 
        blank=True,
57 56
 
        default=False,
58 57
 
        verbose_name=_("Lodging assistance required?"),
59
 
        help_text=_("Check this field if you require lodging assistance in "
60
 
                    "Petaluma, California during North Bay Python."),
58
 
        help_text=_("Check this field if you require lodging assistance."),
61 59
 
    )
62 60
 

	
63 61
 
    home_city = models.CharField(
64 62
 
        blank=True,
65 63
 
        max_length=127,
66 64
 
        help_text=_("Which city (and state, and country) will you be "
67
 
                    "traveling from to get to North Bay Python?"),
65
 
                    "traveling from to get to CopyleftConf?"),
68 66
 
    )
69 67
 

	
70 68
 
    minority_group = models.CharField(blank=True, max_length=256,
71 69
 
        verbose_name=_("Diversity statement"),
72 70
 
        help_text=_("If you are a member of one or more groups that are "
73
 
                    "under-represented in the tech industry, you may list "
71
 
                    "under-represented in the free software community, you may list "
74 72
 
                    "these here. Your response is optional."),
75 73
 
    )
76 74
 

	
...
 
@@ -92,16 +90,6 @@ class ConferenceSpeaker(SpeakerBase):
92 90
 

	
93 91
 

	
94 92
 
class Proposal(ProposalBase):
95
 

	
96
 
    extended_presentation = models.BooleanField(
97
 
        default=False,
98
 
        verbose_name=_("Optionally consider this proposal for a 45-minute "
99
 
                       "slot"),
100
 
        help_text=_("Most talks at North Bay Python go for 30 minutes. We "
101
 
                    "have some openings for 45-minute talks. If you check this "
102
 
                    "field, please explain in your additional notes how you "
103
 
                    "would use the extra 15 minutes."),
104
 
    )
105 93
 
    extra_av = models.TextField(
106 94
 
        blank=True,
107 95
 
        verbose_name=_("Extra tech and A/V requirements"),
...
 
@@ -113,21 +101,22 @@ class Proposal(ProposalBase):
113 101
 
    new_presentation = models.BooleanField(
114 102
 
        default=False,
115 103
 
        verbose_name=_("This is a new presentation"),
116
 
        help_text=_("Check this box if North Bay Python will be the first "
117
 
                    "time this talk is presented at a technical conference."),
104
 
        help_text=_("Check this box if CopyleftConf will be the first "
105
 
                    "time this talk is presented."),
118 106
 
    )
119 107
 
    slides_release = models.BooleanField(
120 108
 
        default=True,
121
 
        help_text=_("I authorize North Bay Python to release a copy of my "
122
 
                    "slides and related materials under the Creative Commons "
123
 
                    "Attribution-ShareAlike 3.0 United States licence, and "
124
 
                    "certify that I have the authority to do so."),
109
 
        help_text=_("I authorize Software Freedom Conservancy to distribute my "
110
 
                    "slides and related materials under either the GNU General "
111
 
                    "Public License, version 3.0 or the Creative Commons "
112
 
                    "Attribution-ShareAlike License, version 4.0, as I specify; "
113
 
                    "and certify that I have the authority to do so."),
125 114
 
    )
126 115
 
    recording_release = models.BooleanField(
127 116
 
        default=True,
128
 
        help_text=_("I authorize North Bay Python to release a recording of "
129
 
                    "my talk under the Creative Commons "
130
 
                    "Attribution-ShareAlike 3.0 United States licence."),
117
 
        help_text=_("I authorize Software Freedom Conservancy to distribute a "
118
 
                    "recording of my talk under the same license I specify for "
119
 
                    "my slides."),
131 120
 

	
132 121
 
    )
133 122
 

	
 
new file 100644
1
 
# -*- coding: utf-8 -*-
2
 
# Generated by Django 1.10.7 on 2018-10-05 20:30
3
 
from __future__ import unicode_literals
4
 

	
5
 
from django.db import migrations, models
6
 

	
7
 

	
8
 
class Migration(migrations.Migration):
9
 

	
10
 
    dependencies = [
11
 
        ('pinaxcon_registrasion', '0004_attendeeprofile_agreement'),
12
 
    ]
13
 

	
14
 
    operations = [
15
 
        migrations.AlterField(
16
 
            model_name='attendeeprofile',
17
 
            name='agreement',
18
 
            field=models.BooleanField(default=False, help_text=b"I agree to act according to the <a href='/code-of-conduct'> North Bay Python Code of Conduct</a>. I also agree with the North Bay Python <a href='/terms'>Terms and Conditions</a>.", verbose_name=b'Agreement'),
19
 
        ),
20
 
    ]
0 comments (0 inline, 0 general)