From 149fbb4ac614e91769fdb0de5c7e432c131abfab Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sat, 18 Jun 2016 13:33:06 +1000 Subject: [PATCH 1/4] Adds .DS_Store to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2b2e626e..f0594b31 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ _build *.pyc dev.db site_media -*.egg-info \ No newline at end of file +*.egg-info +.DS_Store From 217f2f32c169ca30aacef92e98b85d3284558830 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sat, 18 Jun 2016 13:53:02 +1000 Subject: [PATCH 2/4] Adds extra fields to the speaker profile model --- symposion/speakers/forms.py | 4 ++++ symposion/speakers/models.py | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/symposion/speakers/forms.py b/symposion/speakers/forms.py index c0acfe38..bab153a5 100644 --- a/symposion/speakers/forms.py +++ b/symposion/speakers/forms.py @@ -13,6 +13,10 @@ class SpeakerForm(forms.ModelForm): "biography", "photo", "twitter_username", + "experience", + "accessibility", + "travel_assistance", + "accommodation_assistance", ] def clean_twitter_username(self): diff --git a/symposion/speakers/models.py b/symposion/speakers/models.py index 6e6de9d4..77d48d9b 100644 --- a/symposion/speakers/models.py +++ b/symposion/speakers/models.py @@ -35,6 +35,27 @@ class Speaker(models.Model): blank=True, help_text=_(u"Your Twitter account") ) + experience = models.TextField( + blank=True, + help_text=_("Please describe your past speaking experience, or expertise on your given topic."), + verbose_name=_("Experience")) + accessibility = models.TextField( + blank=True, + help_text=_("Please describe any special accessibility requirements that you may have."), + verbose_name=_("Accessibility requirements")) + travel_assistance = models.BooleanField( + blank=True, + help_text=_("Check this box if you require assistance to travel to Hobart to " + "present your proposed sessions."), + verbose_name=_("Travel assistance required"), + ) + accommodation_assistance = models.BooleanField( + blank=True, + help_text=_("Check this box if you require us to provide you with student-style " + "accommodation in order to present your proposed sessions."), + verbose_name=_("Accommodation assistance required"), + ) + annotation = models.TextField(verbose_name=_("Annotation")) # staff only invite_email = models.CharField(max_length=200, unique=True, null=True, db_index=True, verbose_name=_("Invite_email")) invite_token = models.CharField(max_length=40, db_index=True, verbose_name=_("Invite token")) From f64a7573d3e798c87c7ec3601e7335cc2b33a3b4 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sat, 18 Jun 2016 16:50:11 +1000 Subject: [PATCH 3/4] =?UTF-8?q?-=20Adds=20defaults=20to=20the=20speaker=20?= =?UTF-8?q?profile=20-=20Removes=20=E2=80=9Cexperience=E2=80=9D,=20as=20th?= =?UTF-8?q?is=20is=20listed=20in=20=E2=80=9Cother=20notes=E2=80=9D=20on=20?= =?UTF-8?q?a=20per-proposal=20basis.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- symposion/speakers/models.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/symposion/speakers/models.py b/symposion/speakers/models.py index 77d48d9b..a3542e8a 100644 --- a/symposion/speakers/models.py +++ b/symposion/speakers/models.py @@ -35,22 +35,20 @@ class Speaker(models.Model): blank=True, help_text=_(u"Your Twitter account") ) - experience = models.TextField( - blank=True, - help_text=_("Please describe your past speaking experience, or expertise on your given topic."), - verbose_name=_("Experience")) accessibility = models.TextField( blank=True, help_text=_("Please describe any special accessibility requirements that you may have."), verbose_name=_("Accessibility requirements")) travel_assistance = models.BooleanField( blank=True, + default=False, help_text=_("Check this box if you require assistance to travel to Hobart to " "present your proposed sessions."), verbose_name=_("Travel assistance required"), ) accommodation_assistance = models.BooleanField( blank=True, + default=False, help_text=_("Check this box if you require us to provide you with student-style " "accommodation in order to present your proposed sessions."), verbose_name=_("Accommodation assistance required"), From b2af1d0c06f7c5785fb05dd254cac07286f4ac98 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sat, 18 Jun 2016 16:51:28 +1000 Subject: [PATCH 4/4] oops --- symposion/speakers/forms.py | 1 - 1 file changed, 1 deletion(-) diff --git a/symposion/speakers/forms.py b/symposion/speakers/forms.py index bab153a5..122b064c 100644 --- a/symposion/speakers/forms.py +++ b/symposion/speakers/forms.py @@ -13,7 +13,6 @@ class SpeakerForm(forms.ModelForm): "biography", "photo", "twitter_username", - "experience", "accessibility", "travel_assistance", "accommodation_assistance",