forms: Adjusted for CopyleftConf 2019.

Including changes to the help text.

pinaxcon/proposals/forms.py

@@ -17,6 +17,9 @@ class ConferenceSpeakerForm(forms.ModelForm):
             'invite_token',
             'annotation',
             'reviewer',
+            # Not happening for CopyleftConf 2019.
+            'travel_assistance',
+            'lodging_assistance',
         ]
 
     def __init__(self, *a, **k):
@@ -74,7 +77,6 @@ class TalkProposalForm(ProposalForm):
             "description",
             "abstract",
             "new_presentation",
-            "extended_presentation",
             "additional_notes",
             "extra_av",
             "slides_release",

pinaxcon/proposals/migrations/0007_auto_20181005_1630.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-10-05 20:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0006_conferencespeaker_reviewer'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='talkproposal',
+            name='extended_presentation',
+        ),
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='experience',
+            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'),
+        ),
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='first_time',
+            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?'),
+        ),
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='home_city',
+            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),
+        ),
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='lodging_assistance',
+            field=models.BooleanField(default=False, help_text='Check this field if you require lodging assistance.', verbose_name='Lodging assistance required?'),
+        ),
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='minority_group',
+            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'),
+        ),
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='travel_assistance',
+            field=models.BooleanField(default=False, help_text='Check this field if you require travel assistance.', verbose_name='Travel assistance required?'),
+        ),
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='twitter_username',
+            field=models.CharField(blank=True, help_text='Your Twitter account', max_length=65),
+        ),
+        migrations.AlterField(
+            model_name='talkproposal',
+            name='new_presentation',
+            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'),
+        ),
+        migrations.AlterField(
+            model_name='talkproposal',
+            name='recording_release',
+            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.'),
+        ),
+        migrations.AlterField(
+            model_name='talkproposal',
+            name='slides_release',
+            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.'),
+        ),
+    ]

pinaxcon/proposals/models.py

@@ -21,7 +21,7 @@ class ConferenceSpeaker(SpeakerBase):
         return super(ConferenceSpeaker, self).save(*args, **kwargs)
 
     twitter_username = models.CharField(
-        max_length=15,
+        max_length=65,
         blank=True,
         help_text=_(u"Your Twitter account")
     )
@@ -31,7 +31,7 @@ class ConferenceSpeaker(SpeakerBase):
         default=False,
         verbose_name=_("First-time speaker?"),
         help_text=_("Check this field if this is your first time speaking "
-                    "at a technical conference."),
+                    "at a free software conference."),
         )
 
     experience = models.TextField(blank=True, help_text=_
@@ -48,29 +48,27 @@ class ConferenceSpeaker(SpeakerBase):
         blank=True,
         default=False,
         verbose_name=_("Travel assistance required?"),
-        help_text=_("Check this field if you require travel assistance to get "
+        help_text=_("Check this field if you require travel assistance."),
-                    "to North Bay Python in Petaluma, California."),
     )
 
     lodging_assistance = models.BooleanField(
         blank=True,
         default=False,
         verbose_name=_("Lodging assistance required?"),
-        help_text=_("Check this field if you require lodging assistance in "
+        help_text=_("Check this field if you require lodging assistance."),
-                    "Petaluma, California during North Bay Python."),
     )
 
     home_city = models.CharField(
         blank=True,
         max_length=127,
         help_text=_("Which city (and state, and country) will you be "
-                    "traveling from to get to North Bay Python?"),
+                    "traveling from to get to CopyleftConf?"),
     )
 
     minority_group = models.CharField(blank=True, max_length=256,
         verbose_name=_("Diversity statement"),
         help_text=_("If you are a member of one or more groups that are "
-                    "under-represented in the tech industry, you may list "
+                    "under-represented in the free software community, you may list "
                     "these here. Your response is optional."),
     )
 
@@ -92,16 +90,6 @@ class ConferenceSpeaker(SpeakerBase):
 
 
 class Proposal(ProposalBase):
-
-    extended_presentation = models.BooleanField(
-        default=False,
-        verbose_name=_("Optionally consider this proposal for a 45-minute "
-                       "slot"),
-        help_text=_("Most talks at North Bay Python go for 30 minutes. We "
-                    "have some openings for 45-minute talks. If you check this "
-                    "field, please explain in your additional notes how you "
-                    "would use the extra 15 minutes."),
-    )
     extra_av = models.TextField(
         blank=True,
         verbose_name=_("Extra tech and A/V requirements"),
@@ -113,21 +101,22 @@ class Proposal(ProposalBase):
     new_presentation = models.BooleanField(
         default=False,
         verbose_name=_("This is a new presentation"),
-        help_text=_("Check this box if North Bay Python will be the first "
+        help_text=_("Check this box if CopyleftConf will be the first "
-                    "time this talk is presented at a technical conference."),
+                    "time this talk is presented."),
     )
     slides_release = models.BooleanField(
         default=True,
-        help_text=_("I authorize North Bay Python to release a copy of my "
+        help_text=_("I authorize Software Freedom Conservancy to distribute my "
-                    "slides and related materials under the Creative Commons "
+                    "slides and related materials under either the GNU General "
-                    "Attribution-ShareAlike 3.0 United States licence, and "
+                    "Public License, version 3.0 or the Creative Commons "
-                    "certify that I have the authority to do so."),
+                    "Attribution-ShareAlike License, version 4.0, as I specify; "
+                    "and certify that I have the authority to do so."),
     )
     recording_release = models.BooleanField(
         default=True,
-        help_text=_("I authorize North Bay Python to release a recording of "
+        help_text=_("I authorize Software Freedom Conservancy to distribute a "
-                    "my talk under the Creative Commons "
+                    "recording of my talk under the same license I specify for "
-                    "Attribution-ShareAlike 3.0 United States licence."),
+                    "my slides."),
 
     )
 

pinaxcon/registrasion/migrations/0005_auto_20181005_1630.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-10-05 20:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pinaxcon_registrasion', '0004_attendeeprofile_agreement'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='attendeeprofile',
+            name='agreement',
+            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'),
+        ),
+    ]