Simple fixes.

[prawokultury.git] / prawokultury / contact_forms.py

diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py
index 45dedb1..c5dea10 100644 (file)
--- a/prawokultury/contact_forms.py
+++ b/prawokultury/contact_forms.py
@@ -4,6 +4,8 @@ from django import forms
 from contact.forms import ContactForm
 from contact.models import Contact
 from django.utils.translation import ugettext_lazy as _
+from django.utils.safestring import mark_safe
+from migdal.models import Entry
 
 
 class RegistrationForm(ContactForm):
@@ -19,34 +21,48 @@ class RegistrationForm(ContactForm):
     contact = forms.EmailField(label=_('E-mail'), max_length=128)
     organization = forms.CharField(label=_('Organization'), 
             max_length=256, required=False)
+    
+    agree_mailing = forms.BooleanField(
+        label=_('I am interested in receiving information about the Modern Poland Foundation\'s activities by e-mail'),
+        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, 00-514 Warszawa) permission to process my personal data (name, e-mail address) for purposes of registration for CopyCamp conference.')
     )
     agree_license = forms.BooleanField(
         label=_('Permission for publication'),
-        help_text=_('I agree to having materials recorded during the conference released under the terms of <a href="http://creativecommons.org/licenses/by-sa/3.0/deed">CC BY-SA</a> license.')
+        help_text=_('I agree to having materials, recorded during the conference, released under the terms of <a href="http://creativecommons.org/licenses/by-sa/3.0/deed">CC BY-SA</a> license and to publishing my image.'),
+        required=False
     )
 
     def __init__(self, *args, **kwargs):
         super(RegistrationForm, self).__init__(*args, **kwargs)
         self.started = getattr(settings, 'REGISTRATION_STARTED', False)
         self.limit_reached = Contact.objects.filter(form_tag=self.save_as_tag).count() >= settings.REGISTRATION_LIMIT
+        try:
+            url = Entry.objects.get(slug_pl='regulamin').get_absolute_url()
+            self.fields['agree_toc'] = forms.BooleanField(
+                required = True,
+                label = mark_safe(_('I accept <a href="%s">Terms and Conditions of CopyCamp</a>') % url)
+            )
+        except Entry.DoesNotExist:
+            pass
 
 
 tracks = (
-    'CopyArt',
-    'Creative Middle Class',
-    'How to Pay?',
-    'How to Be Paid?',
-    'Copyright and Education',
-    'Technology and Innovation',
-    'Copyright and Human Rights',
-    'Self-Publishing',
-    'Future of the Book',
-    'Copyright Enforcement',
-    'Future of Copyright',
-    'Copyright Debate',
+    _('CopyArt'),
+    _('Creative Middle Class'),
+    _('How to Pay?'),
+    _('How to Be Paid?'),
+    _('Copyright and Education'),
+    _('Technology and Innovation'),
+    _('Copyright and Human Rights'),
+    _('Self-Publishing'),
+    _('Future of the Book'),
+    _('Copyright Enforcement'),
+    _('Future of Copyright'),
+    _('Copyright Debate')
 )
 
 class RegisterSpeaker(RegistrationForm):
@@ -63,7 +79,7 @@ class RegisterSpeaker(RegistrationForm):
     title = forms.CharField(label=_('Title of presentation'),
             max_length=256, required=True)
     presentation = forms.FileField(label=_('Presentation'),
-            required=True)
+            required=False)
     summary = forms.CharField(label=_('Summary of presentation (max. 1800 characters)'),
             widget=forms.Textarea, max_length=1800, required=True)
 
@@ -85,6 +101,7 @@ class RegisterSpeaker(RegistrationForm):
             'presentation',
             'summary',
             'post_conference_publication',
+            'agree_mailing',
             'agree_data',
             'agree_license'
         ]