X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/ef84b5322c5206cfc3474e8d3a283ef8f13cfee2..522b9cc723548746eed1aea99905618e693f96e0:/prawokultury/contact_forms.py diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py index bf6949a..287f82b 100644 --- a/prawokultury/contact_forms.py +++ b/prawokultury/contact_forms.py @@ -36,7 +36,8 @@ class RegistrationForm(ContactForm): last_name = forms.CharField(label=_('Last name'), max_length=128) contact = forms.EmailField(label=_('E-mail'), max_length=128) organization = forms.CharField(label=_('Organization'), max_length=256, required=False) - country = forms.ChoiceField(label=_('Country of residence'), choices=zip(COUNTRIES, COUNTRIES)) + country = forms.ChoiceField( + label=_('Country of residence'), choices=[('', '--------')] + zip(COUNTRIES, COUNTRIES), required=False) travel_grant = forms.BooleanField( label=_('I require financial assistance to attend CopyCamp 2018.'), required=False) travel_grant_motivation = forms.CharField( @@ -51,8 +52,8 @@ class RegistrationForm(ContactForm): label=_("I'm planning to show up on"), choices=[ ('both', _('Both days of the conference')), - ('only-28th', _('September 28th only')), - ('only-29th', _('September 29th only')), + ('only-28th', _('October 5th only')), + ('only-29th', _('October 6th only')), ], widget=forms.RadioSelect()) # ankieta @@ -130,13 +131,6 @@ class RegistrationForm(ContactForm): 'and similar activities of the Modern Poland Foundation'), required=False ) - agree_data = forms.BooleanField( - label=_('Permission for data processing'), - help_text=_( - u'I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. MarszaÅkowska 84/92, ' - u'00-514 Warszawa) permission to process my personal data (name, e-mail address) for purposes ' - u'of registration for CopyCamp conference.') - ) agree_license = forms.BooleanField( label=_('Permission for publication'), help_text=mark_safe_lazy(_( @@ -191,45 +185,31 @@ class RegistrationForm(ContactForm): 'areas', 'areas_other', 'source', 'source_other', 'motivation', 'motivation_other')] def agreement_fields(self): - return [self[name] for name in ('agree_mailing', 'agree_data', 'agree_license', 'agree_toc')] - - -tracks = ( - _('social security in the creative sector'), - _('100 years of the evolution of modern copyright law and industrial property law in Poland ' - 'and of cultural activities regulated by this law'), - _('EU copyright reform'), - _('blockchain use prospects'), - _('reuse of archives and cultural heritage'), -) + return [self[name] for name in ('agree_mailing', 'agree_license', 'agree_toc')] class RegisterSpeaker(RegistrationForm): form_tag = 'register-speaker' - save_as_tag = '2018-speaker' + save_as_tag = '2019-speaker' form_title = _('Open call for presentations') notify_on_register = False mailing_field = 'agree_mailing' - presentation_thematic_track = forms.ChoiceField( - label=_('Thematic track'), - choices=[(t, t) for t in tracks], widget=forms.RadioSelect()) - bio = forms.CharField(label=mark_safe_lazy( - _('Short biographical note in Polish (max. 500 characters, not required)')), - widget=forms.Textarea, max_length=500, required=False) - bio_en = forms.CharField(label=_('Short biographical note in English (max. 500 characters)'), widget=forms.Textarea, - max_length=500) + _('Short biographical note in Polish (max. 500 characters)')), + widget=forms.Textarea, max_length=500, required=True) + bio_en = forms.CharField(label=_('Short biographical note in English (max. 500 characters, not required)'), widget=forms.Textarea, + max_length=500, required=False) photo = forms.FileField(label=_('Photo'), required=False) phone = forms.CharField(label=_('Phone number'), max_length=64, required=False, help_text=_('(used only for organizational purposes)')) presentation_title = forms.CharField( - label=mark_safe_lazy(_('Presentation title in Polish (not required)')), - max_length=256, required=False) + label=mark_safe_lazy(_('Presentation title in Polish')), + max_length=256) presentation_title_en = forms.CharField( - label=_('Presentation title in English'), max_length=256) + label=_('Presentation title in English (not required)'), max_length=256, required=False) presentation_summary = forms.CharField(label=_('Presentation summary (max. 1800 characters)'), widget=forms.Textarea, max_length=1800) @@ -261,7 +241,6 @@ class RegisterSpeaker(RegistrationForm): 'presentation_title', 'presentation_title_en', 'presentation_summary', - 'presentation_thematic_track', # 'presentation_post_conference_publication', 'agree_mailing', @@ -273,8 +252,8 @@ class RegisterSpeaker(RegistrationForm): class RemindForm(ContactForm): form_tag = 'remind-me' - save_as_tag = 'remind-me-2018' - form_title = u'CopyCamp 2018' + save_as_tag = 'remind-me-2019' + form_title = u'CopyCamp 2019' notify_on_register = False notify_user = False @@ -289,8 +268,8 @@ class NextForm(ContactForm): max_length=256, required=False) -def workshop_field(label): - return forms.BooleanField(label=_(label), required=False) +def workshop_field(label, help=None): + return forms.BooleanField(label=_(label), required=False, help_text=help) class WorkshopForm(ContactForm): @@ -305,76 +284,66 @@ class WorkshopForm(ContactForm): last_name = forms.CharField(label=_('Last name'), max_length=128) contact = forms.EmailField(label=_('E-mail'), max_length=128) organization = forms.CharField(label=_('Organization'), max_length=256, required=False) - country = forms.CharField(label=_('Country'), max_length=128) + country = forms.ChoiceField( + label=_('Country of residence'), choices=[('', '--------')] + zip(COUNTRIES, COUNTRIES), required=False) _header = HeaderField( label=mark_safe_lazy(_("