registration form with survey

diff --git a/contact/templates/contact/form.html b/contact/templates/contact/form.html
index 29fdfa8..f1b06fb 100644 (file)
--- a/contact/templates/contact/form.html
+++ b/contact/templates/contact/form.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% load i18n chunks %}
 
 {% extends "base.html" %}
 {% load i18n chunks %}
 

-{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}
+{% block titleextra %}{{ form.form_title }} :: {% endblock %}

 
 

-{% block "body" %}
+{% block body %}

 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 

diff --git a/contact/templates/contact/thanks.html b/contact/templates/contact/thanks.html
index 6194e4e..fa4d8d5 100644 (file)
--- a/contact/templates/contact/thanks.html
+++ b/contact/templates/contact/thanks.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% extends "base.html" %}
 {% load i18n %}

-{% block "body" %}
+{% block body %}

 
     <h1>{% block contact_form_title %}{% trans "Thank you" %}{% endblock %}</h1>
 
 
     <h1>{% block contact_form_title %}{% trans "Thank you" %}{% endblock %}</h1>
 

diff --git a/events/templates/events/event_list.html b/events/templates/events/event_list.html
index b6dd773..ad2a92c 100755 (executable)
--- a/events/templates/events/event_list.html
+++ b/events/templates/events/event_list.html
@@ -3,7 +3,7 @@
 {% load i18n pagination_tags fnp_prevnext %}
 {% load events_tags %}
 
 {% load i18n pagination_tags fnp_prevnext %}
 {% load events_tags %}
 

-{% block "body" %}
+{% block body %}

 <h1>{% trans "Events" %}</h1>
 
 {% autopaginate object_list 10 %}
 <h1>{% trans "Events" %}</h1>
 
 {% autopaginate object_list 10 %}

diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py
index 8ce6aa6..60ef542 100644 (file)
--- a/prawokultury/contact_forms.py
+++ b/prawokultury/contact_forms.py
@@ -38,6 +38,82 @@ class RegistrationForm(ContactForm):
     #        ('only-7th', _('November 7th only')),
     #    ], widget=forms.RadioSelect())
 
     #        ('only-7th', _('November 7th only')),
     #    ], widget=forms.RadioSelect())
 

+    # ankieta
+    times_attended = forms.ChoiceField(
+        required=False,
+        label=_("1. How many times have you attended CopyCamp?"),
+        choices=[
+            ('0', _('not yet')),
+            ('1', _('once')),
+            ('2', _('twice')),
+            ('3', _('three times')),
+            ('4', _('four times')),
+        ], widget=forms.RadioSelect())
+    age = forms.ChoiceField(
+        required=False,
+        label=_("2. Please indicate your age bracket:"),
+        choices=[
+           ('0-19', _('19 or below')),
+           ('20-25', _('20-25')),
+           ('26-35', _('26-35')),
+           ('36-45', _('36-45')),
+           ('46-55', _('46-55')),
+           ('56-65', _('56-65')),
+           ('66+', _('66 or above')),
+        ], widget=forms.RadioSelect())
+    distance = forms.ChoiceField(
+        required=False,
+        label=_("3. How far will you travel to attend CopyCamp?"),
+        choices=[
+           ('0-50', _('0-50 km')),
+           ('51-100', _('51-100 km')),
+           ('101-200', _('101-200 km')),
+           ('200+', _('200 km or more')),
+        ], widget=forms.RadioSelect())
+    areas = forms.MultipleChoiceField(
+        required=False,
+        label=_("4. Please indicate up to 3 areas you feel most affiliated with"),
+        choices=[
+            ('sztuki plastyczne', _('visual art')),
+            ('literatura', _('literature')),
+            ('muzyka', _('music')),
+            ('teatr', _('theatre')),
+            ('film', _('film production')),
+            ('wydawanie', _('publishing')),
+            ('prawo', _('law')),
+            ('ekonomia', _('economy')),
+            ('socjologia', _('sociology')),
+            ('technika', _('technology')),
+            ('edukacja', _('education')),
+            ('studia', _('higher education')),
+            ('nauka', _('academic research')),
+            ('biblioteki', _('library science')),
+            ('administracja', _('public administration')),
+            ('ngo', _('nonprofit organisations')),
+            ('other', _('other (please specify below)')),
+        ], widget=forms.CheckboxSelectMultiple())
+    areas_other = forms.CharField(required=False, label=_('Fill if you selected “other” above'))
+    source = forms.ChoiceField(
+        required=False,
+        label=_("5. Please indicate how you received information about the conference:"),
+        choices=[
+           ('znajomi', _('through friends sharing on the web')),
+           ('fnp', _('directly through the Foundation\'s facebook or website')),
+           ('www', _('through other websites (please specify below)')),
+           ('other', _('other (please specify below)')),
+        ], widget=forms.RadioSelect())
+    source_other = forms.CharField(required=False, label=_('Fill if you selected “other” or “other website” above'))
+    motivation = forms.ChoiceField(
+        required=False,
+        label=_("6. Please indicate the most important factor for your willingness to participate:"),
+        choices=[
+           ('idea', _('the main idea of the conference')),
+           ('speaker', _('particular speaker(s)')),
+           ('networking', _('good networking occasion')),
+           ('other', _('other (please specify below)')),
+        ], widget=forms.RadioSelect())
+    motivation_other = forms.CharField(required=False, label=_('Fill if you selected “other” above'))
+

     agree_mailing = forms.BooleanField(
         label=_('I am interested in receiving information about the Modern Poland Foundation\'s activities by e-mail'),
         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


@@ -48,7 +124,7 @@ class RegistrationForm(ContactForm):
     )
     agree_license = forms.BooleanField(
         label=_('Permission for publication'),
     )
     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 and to publishing my image.'),
+        help_text=mark_safe_lazy(_(u'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\u00a0BY-SA</a> license and to publishing my image.')),

         required=False
     )
 
         required=False
     )
 


@@ -60,11 +136,28 @@ class RegistrationForm(ContactForm):
             url = Entry.objects.get(slug_pl='regulamin').get_absolute_url()
             self.fields['agree_toc'] = forms.BooleanField(
                 required=True,
             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)
+                label=mark_safe(_('I accept <a href="%s">Terms and Conditions of CopyCamp</a>') % url)

             )
         except Entry.DoesNotExist:
             pass
 
             )
         except Entry.DoesNotExist:
             pass
 

+    def clean_areas(self):
+        data = self.cleaned_data['areas']
+        if len(data) > 3:
+            raise forms.ValidationError(_('Select at most 3 areas'))
+        return data
+
+    def main_fields(self):
+        return [self[name] for name in ('first_name', 'last_name', 'contact', 'organization', 'country')]
+
+    def survey_fields(self):
+        return [self[name] for name in (
+            'times_attended', 'age', 'distance',
+            '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')]
+

 
 tracks = (
     _('Copyright and Art'),
 
 tracks = (
     _('Copyright and Art'),


@@ -216,7 +309,7 @@ class WorkshopForm(ContactForm):
     )
     agree_license = forms.BooleanField(
         label=_('Permission for publication'),
     )
     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 and to publishing my image.'),
+        help_text=mark_safe_lazy(_(u'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\u00a0BY-SA</a> license and to publishing my image.')),

         required=False
     )
 
         required=False
     )
 

diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo
index 3d80ad9..f317ff8 100644 (file)
Binary files a/prawokultury/locale/pl/LC_MESSAGES/django.mo and b/prawokultury/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po
index 5815e7e..c249920 100644 (file)
--- a/prawokultury/locale/pl/LC_MESSAGES/django.po
+++ b/prawokultury/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: prawokultury\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: prawokultury\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2016-07-06 12:26+0200\n"
+"POT-Creation-Date: 2016-09-19 14:33+0200\n"

 "PO-Revision-Date: 2014-09-30 16:25+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
 "PO-Revision-Date: 2014-09-30 16:25+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"


@@ -31,11 +31,11 @@ msgstr "Imię"
 msgid "Last name"
 msgstr "Nazwisko"
 
 msgid "Last name"
 msgstr "Nazwisko"
 

-#: contact_forms.py:28 contact_forms.py:174 contact_forms.py:186
+#: contact_forms.py:28 contact_forms.py:266 contact_forms.py:278

 msgid "E-mail"
 msgstr "E-mail"
 
 msgid "E-mail"
 msgstr "E-mail"
 

-#: contact_forms.py:29 contact_forms.py:175 contact_forms.py:187
+#: contact_forms.py:29 contact_forms.py:267 contact_forms.py:279

 msgid "Organization"
 msgstr "Organizacja"
 
 msgid "Organization"
 msgstr "Organizacja"
 


@@ -43,7 +43,200 @@ msgstr "Organizacja"
 msgid "Country"
 msgstr "Kraj"
 
 msgid "Country"
 msgstr "Kraj"
 

-#: contact_forms.py:42
+#: contact_forms.py:44
+msgid "1. How many times have you attended CopyCamp?"
+msgstr "1. W CopyCamp brałam(em) udział:"
+
+#: contact_forms.py:46
+msgid "not yet"
+msgstr "nie brałam(em) jeszcze udziału w CopyCampie"
+
+#: contact_forms.py:47
+msgid "once"
+msgstr "1 raz"
+
+#: contact_forms.py:48
+msgid "twice"
+msgstr "2 razy"
+
+#: contact_forms.py:49
+msgid "three times"
+msgstr "3 razy"
+
+#: contact_forms.py:50
+msgid "four times"
+msgstr "4 razy"
+
+#: contact_forms.py:54
+msgid "2. Please indicate your age bracket:"
+msgstr "2. Mam lat:"
+
+#: contact_forms.py:56
+msgid "19 or below"
+msgstr "19 lub poniżej"
+
+#: contact_forms.py:57
+msgid "20-25"
+msgstr "20-25"
+
+#: contact_forms.py:58
+msgid "26-35"
+msgstr "26-35"
+
+#: contact_forms.py:59
+msgid "36-45"
+msgstr "36-45"
+
+#: contact_forms.py:60
+msgid "46-55"
+msgstr "46-55"
+
+#: contact_forms.py:61
+msgid "56-65"
+msgstr "56-65"
+
+#: contact_forms.py:62
+msgid "66 or above"
+msgstr "66 lub więcej"
+
+#: contact_forms.py:66
+msgid "3. How far will you travel to attend CopyCamp?"
+msgstr "3. Aby dołączyć na CopyCamp przejadę:"
+
+#: contact_forms.py:68
+msgid "0-50 km"
+msgstr "0-50 km"
+
+#: contact_forms.py:69
+msgid "51-100 km"
+msgstr "51-100 km"
+
+#: contact_forms.py:70
+msgid "101-200 km"
+msgstr "101-200 km"
+
+#: contact_forms.py:71
+msgid "200 km or more"
+msgstr "200 km lub więcej"
+
+#: contact_forms.py:75
+msgid "4. Please indicate up to 3 areas you feel most affiliated with"
+msgstr ""
+"4. Obszary, z którymi czuję się najbardziej związana(y), do trzech wyborów:"
+
+#: contact_forms.py:77
+msgid "visual art"
+msgstr "sztuki plastyczne"
+
+#: contact_forms.py:78
+msgid "literature"
+msgstr "literatura"
+
+#: contact_forms.py:79
+msgid "music"
+msgstr "muzyka"
+
+#: contact_forms.py:80
+msgid "theatre"
+msgstr "teatr"
+
+#: contact_forms.py:81
+msgid "film production"
+msgstr "produkcja filmowa"
+
+#: contact_forms.py:82
+msgid "publishing"
+msgstr "działalność wydawnicza"
+
+#: contact_forms.py:83
+msgid "law"
+msgstr "prawo"
+
+#: contact_forms.py:84
+msgid "economy"
+msgstr "ekonomia"
+
+#: contact_forms.py:85
+msgid "sociology"
+msgstr "socjologia"
+
+#: contact_forms.py:86
+msgid "technology"
+msgstr "technika"
+
+#: contact_forms.py:87
+msgid "education"
+msgstr "edukacja"
+
+#: contact_forms.py:88
+msgid "higher education"
+msgstr "studia wyższe"
+
+#: contact_forms.py:89
+msgid "academic research"
+msgstr "badania naukowe"
+
+#: contact_forms.py:90
+msgid "library science"
+msgstr "działalność biblioteczna"
+
+#: contact_forms.py:91
+msgid "public administration"
+msgstr "administracja publiczna"
+
+#: contact_forms.py:92
+msgid "nonprofit organisations"
+msgstr "organizacja pozarządowa"
+
+#: contact_forms.py:93 contact_forms.py:103 contact_forms.py:113
+msgid "other (please specify below)"
+msgstr "inne (wpisz poniżej)"
+
+#: contact_forms.py:95 contact_forms.py:115
+msgid "Fill if you selected “other” above"
+msgstr "Wypełnij, jeśli powyżej wybrałaś(eś) „inne”"
+
+#: contact_forms.py:98
+msgid "5. Please indicate how you received information about the conference:"
+msgstr "5. O konferencji CopyCamp dowiedziałam(em) się:"
+
+#: contact_forms.py:100
+msgid "through friends sharing on the web"
+msgstr "przez znajomych w sieciach społecznościowych"
+
+#: contact_forms.py:101
+msgid "directly through the Foundation's facebook or website"
+msgstr "informacja na stronie internetowej/facebooku Fundacji"
+
+#: contact_forms.py:102
+msgid "through other websites (please specify below)"
+msgstr "informacja na innej stronie internetowej (wpisz poniżej)"
+
+#: contact_forms.py:105
+msgid "Fill if you selected “other” or “other website” above"
+msgstr "Wypełnij, jeśli wybrałaś(eś) powyżej „inne” lub „inna strona”"
+
+#: contact_forms.py:108
+msgid ""
+"6. Please indicate the most important factor for your willingness to "
+"participate:"
+msgstr ""
+"6. Do rejestracji i chęci uczestniczenia w CopyCampie skłoniła mnie w "
+"największym stopniu:"
+
+#: contact_forms.py:110
+msgid "the main idea of the conference"
+msgstr "idea konferencji"
+
+#: contact_forms.py:111
+msgid "particular speaker(s)"
+msgstr "konkretna(y) prelegentka(ent)"
+
+#: contact_forms.py:112
+msgid "good networking occasion"
+msgstr "możliwość networkingu"
+
+#: contact_forms.py:118

 msgid ""
 "I am interested in receiving information about the Modern Poland "
 "Foundation's activities by e-mail"
 msgid ""
 "I am interested in receiving information about the Modern Poland "
 "Foundation's activities by e-mail"


@@ -51,11 +244,11 @@ msgstr ""
 "Jestem zainteresowana/y otrzymywaniem drogą mailową informacji dotyczących "
 "działalności Fundacji Nowoczesna Polska"
 
 "Jestem zainteresowana/y otrzymywaniem drogą mailową informacji dotyczących "
 "działalności Fundacji Nowoczesna Polska"
 

-#: contact_forms.py:46 contact_forms.py:215
+#: contact_forms.py:122 contact_forms.py:307

 msgid "Permission for data processing"
 msgstr "Zgoda na przetwarzanie danych"
 
 msgid "Permission for data processing"
 msgstr "Zgoda na przetwarzanie danych"
 

-#: contact_forms.py:47 contact_forms.py:216
+#: contact_forms.py:123 contact_forms.py:308

 msgid ""
 "I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. "
 "Marszałkowska 84/92, 00-514 Warszawa) permission to process my personal data "
 msgid ""
 "I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. "
 "Marszałkowska 84/92, 00-514 Warszawa) permission to process my personal data "


@@ -65,140 +258,139 @@ msgstr ""
 "poczty elektronicznej) przez Fundację Nowoczesna Polska (ul. Marszałkowska "
 "84/92, 00-514 Warszawa) w związku z rejestracją na konferencję CopyCamp."
 
 "poczty elektronicznej) przez Fundację Nowoczesna Polska (ul. Marszałkowska "
 "84/92, 00-514 Warszawa) w związku z rejestracją na konferencję CopyCamp."
 

-#: contact_forms.py:50 contact_forms.py:219
+#: contact_forms.py:126 contact_forms.py:311

 msgid "Permission for publication"
 msgstr "Zgoda na publikację"
 
 msgid "Permission for publication"
 msgstr "Zgoda na publikację"
 

-#: contact_forms.py:51 contact_forms.py:220
+#: contact_forms.py:127 contact_forms.py:312

 msgid ""
 "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"
 msgid ""
 "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."
+"\">CC BY-SA</a> license and to publishing my image."

 msgstr ""
 "Wyrażam zgodę na publikację materiałów zarejestrowanych na konferencji na "
 "licencji <a href=\"http://creativecommons.org/licenses/by-sa/3.0/deed.pl"
 msgstr ""
 "Wyrażam zgodę na publikację materiałów zarejestrowanych na konferencji na "
 "licencji <a href=\"http://creativecommons.org/licenses/by-sa/3.0/deed.pl"

-"\">CC BY-SA</a> oraz rozpowszechnianie wizerunku."
+"\">CC BY-SA</a> oraz rozpowszechnianie wizerunku."

 
 

-#: contact_forms.py:63
+#: contact_forms.py:139

 #, python-format
 msgid "I accept <a href=\"%s\">Terms and Conditions of CopyCamp</a>"
 msgstr "Akceptuję <a href=\"%s\">Regulamin CopyCampu</a>"
 
 #, python-format
 msgid "I accept <a href=\"%s\">Terms and Conditions of CopyCamp</a>"
 msgstr "Akceptuję <a href=\"%s\">Regulamin CopyCampu</a>"
 

-#: contact_forms.py:70
+#: contact_forms.py:147
+msgid "Select at most 3 areas"
+msgstr "Wybierz najwyżej 3 obszary"
+
+#: contact_forms.py:163

 msgid "Copyright and Art"
 msgstr "Prawo autorskie i sztuka"
 
 msgid "Copyright and Art"
 msgstr "Prawo autorskie i sztuka"
 

-#: contact_forms.py:71
+#: contact_forms.py:164

 msgid "Remuneration Models"
 msgstr "Modele wynagradzania"
 
 msgid "Remuneration Models"
 msgstr "Modele wynagradzania"
 

-#: contact_forms.py:72
+#: contact_forms.py:165

 msgid "Copyright, Education and Science"
 msgstr "Prawo autorskie, edukacja i nauka"
 
 msgid "Copyright, Education and Science"
 msgstr "Prawo autorskie, edukacja i nauka"
 

-#: contact_forms.py:73
+#: contact_forms.py:166

 msgid "Technology, Innovation and Copyright"
 msgstr "Technologie, innowacje i prawo autorskie"
 
 msgid "Technology, Innovation and Copyright"
 msgstr "Technologie, innowacje i prawo autorskie"
 

-#: contact_forms.py:74
+#: contact_forms.py:167

 msgid "Copyright and Human Rights"
 msgstr "Prawo autorskie i prawa człowieka"
 
 msgid "Copyright and Human Rights"
 msgstr "Prawo autorskie i prawa człowieka"
 

-#: contact_forms.py:75
+#: contact_forms.py:168

 msgid "Copyright Enforcement"
 msgstr "Egzekwowanie prawa autorskiego"
 
 msgid "Copyright Enforcement"
 msgstr "Egzekwowanie prawa autorskiego"
 

-#: contact_forms.py:76
+#: contact_forms.py:169

 msgid "Copyright Debate"
 msgstr "Język debaty prawnoautorskiej"
 
 msgid "Copyright Debate"
 msgstr "Język debaty prawnoautorskiej"
 

-#: contact_forms.py:77
+#: contact_forms.py:170

 msgid "Copyright Lawmaking"
 msgstr "Tworzenie prawa autorskiego"
 
 msgid "Copyright Lawmaking"
 msgstr "Tworzenie prawa autorskiego"
 

-#: contact_forms.py:84
+#: contact_forms.py:177

 msgid "Open call for presentations"
 msgstr "Otwarty nabór prezentacji"
 
 msgid "Open call for presentations"
 msgstr "Otwarty nabór prezentacji"
 

-#: contact_forms.py:87
+#: contact_forms.py:180

 msgid "Please select one thematic track"
 msgstr "Wybierz jedną ścieżkę tematyczną"
 
 msgid "Please select one thematic track"
 msgstr "Wybierz jedną ścieżkę tematyczną"
 

-#: contact_forms.py:91
+#: contact_forms.py:184

 msgid ""
 "Short biographical note in Polish (max. 500 characters, fill <strong>at "
 "least</strong> one bio)"
 msgstr "Krótka notka biograficzna po polsku (maks. 500 znaków)"
 
 msgid ""
 "Short biographical note in Polish (max. 500 characters, fill <strong>at "
 "least</strong> one bio)"
 msgstr "Krótka notka biograficzna po polsku (maks. 500 znaków)"
 

-#: contact_forms.py:93
+#: contact_forms.py:186

 msgid "Short biographical note in English (max. 500 characters)"
 msgstr ""
 "Krótka notka biograficzna po angielsku (maks. 500 znaków; wypełnij "
 "przynajmniej jedną wersję językową, najlepiej obie)"
 
 msgid "Short biographical note in English (max. 500 characters)"
 msgstr ""
 "Krótka notka biograficzna po angielsku (maks. 500 znaków; wypełnij "
 "przynajmniej jedną wersję językową, najlepiej obie)"
 

-#: contact_forms.py:95
+#: contact_forms.py:188

 msgid "Photo"
 msgstr "Zdjęcie"
 
 msgid "Photo"
 msgstr "Zdjęcie"
 

-#: contact_forms.py:96
+#: contact_forms.py:189

 msgid "Phone number"
 msgstr "Numer telefonu"
 
 msgid "Phone number"
 msgstr "Numer telefonu"
 

-#: contact_forms.py:98
+#: contact_forms.py:191

 msgid "Used only for organizational purposes."
 msgstr "Używany wyłącznie do celów organizacyjnych."
 
 msgid "Used only for organizational purposes."
 msgstr "Używany wyłącznie do celów organizacyjnych."
 

-#: contact_forms.py:102
+#: contact_forms.py:195

 msgid ""
 "Title of the presentation in Polish (fill <strong>at least</strong> one "
 "title)"
 msgstr "Polski tytuł prezentacji"
 
 msgid ""
 "Title of the presentation in Polish (fill <strong>at least</strong> one "
 "title)"
 msgstr "Polski tytuł prezentacji"
 

-#: contact_forms.py:104
+#: contact_forms.py:197

 msgid "Title of the presentation in English"
 msgstr ""
 "Angielski tytuł prezentacji (wypełnij przynajmniej jeden tytuł, najlepiej "
 "oba)"
 
 msgid "Title of the presentation in English"
 msgstr ""
 "Angielski tytuł prezentacji (wypełnij przynajmniej jeden tytuł, najlepiej "
 "oba)"
 

-#: contact_forms.py:107
+#: contact_forms.py:200

 msgid "Summary of presentation (max. 1800 characters)"
 msgstr "Krótki opis prezentacji (maks. 1800 znaków)"
 
 msgid "Summary of presentation (max. 1800 characters)"
 msgstr "Krótki opis prezentacji (maks. 1800 znaków)"
 

-#: contact_forms.py:111
+#: contact_forms.py:204

 msgid ""
 "I am interested in including my paper in the post-conference publication"
 msgstr ""
 "Jestem zainteresowana/y umieszczeniem pisemnej wersji mojego wystąpienia w "
 "publikacji pokonferencyjnej"
 
 msgid ""
 "I am interested in including my paper in the post-conference publication"
 msgstr ""
 "Jestem zainteresowana/y umieszczeniem pisemnej wersji mojego wystąpienia w "
 "publikacji pokonferencyjnej"
 

-#: contact_forms.py:118
-msgid "Terms and Conditions"
-msgstr "Regulamin"
-
-#: contact_forms.py:119
+#: contact_forms.py:211

 msgid ""
 msgid ""

-"I accept <a href=\"/en/info/terms-and-conditions/"
-"\">CopyCamp Terms and Conditions</a>."
-msgstr ""
-"Akceptuję <a href=\"/info/regulamin/\">regulamin CopyCampu</a>"
+"I accept <a href=\"/en/info/terms-and-conditions/\">CopyCamp Terms and "
+"Conditions</a>."
+msgstr "Akceptuję <a href=\"/info/regulamin/\">regulamin CopyCampu</a>"

 
 

-#: contact_forms.py:161
+#: contact_forms.py:253

 msgid "Fill at least one bio!"
 msgstr "Wpisz przynajmniej jedną notkę biograficzną (po polsku lub angielsku)!"
 
 msgid "Fill at least one bio!"
 msgstr "Wpisz przynajmniej jedną notkę biograficzną (po polsku lub angielsku)!"
 

-#: contact_forms.py:163
+#: contact_forms.py:255

 msgid "Fill at least one title!"
 msgstr "Wpisz przynajmniej jeden tytuł prezentacji (po polsku lub angielsku)!"
 
 msgid "Fill at least one title!"
 msgstr "Wpisz przynajmniej jeden tytuł prezentacji (po polsku lub angielsku)!"
 

-#: contact_forms.py:171
+#: contact_forms.py:263

 msgid "Next CopyCamp"
 msgstr "Kolejny CopyCamp"
 
 msgid "Next CopyCamp"
 msgstr "Kolejny CopyCamp"
 

-#: contact_forms.py:173 contact_forms.py:185
+#: contact_forms.py:265 contact_forms.py:277

 msgid "Name"
 msgstr "Imię i nazwisko"
 
 msgid "Name"
 msgstr "Imię i nazwisko"
 

-#: contact_forms.py:183
+#: contact_forms.py:275

 msgid "Workshop"
 msgstr "Warsztat"
 
 msgid "Workshop"
 msgstr "Warsztat"
 


@@ -240,6 +432,14 @@ msgstr ""
 "href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative "
 "Commons Uznanie autorstwa – Na tych samych warunkach</a>."
 
 "href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative "
 "Commons Uznanie autorstwa – Na tych samych warunkach</a>."
 

+#: templates/contact/register/form.html:34
+msgid ""
+"We would be grateful if you could answer our questions below. This will "
+"allow us to better adapt to your expectations in the future."
+msgstr ""
+"Będziemy wdzięczni jeżeli odpowiesz nam na poniższe pytania. Pozwoli nam to "
+"lepiej dopasować się do Waszych oczekiwań."
+

 #: templates/contact/register/mail_body.txt:2
 #, python-format
 msgid ""
 #: templates/contact/register/mail_body.txt:2
 #, python-format
 msgid ""


@@ -289,8 +489,8 @@ msgstr "Dziękujemy za zgłoszenie."
 
 #: templates/contact/register-speaker/thanks.html:8
 msgid ""
 
 #: templates/contact/register-speaker/thanks.html:8
 msgid ""

-"Your submission can be modified until August 10 using the unique link sent to "
-"you by e-mail."
+"Your submission can be modified until August 10 using the unique link sent "
+"to you by e-mail."

 msgstr ""
 "Zgłoszenie można modyfikować do 10 sierpnia używając unikalnego adresu "
 "przesłanego e-mailem."
 msgstr ""
 "Zgłoszenie można modyfikować do 10 sierpnia używając unikalnego adresu "
 "przesłanego e-mailem."


@@ -311,6 +511,9 @@ msgstr ""
 "Dziękujemy za wypełnienie formularza rejestracji na warsztaty na stronie "
 "%(site_name)s."
 
 "Dziękujemy za wypełnienie formularza rejestracji na warsztaty na stronie "
 "%(site_name)s."
 

+#~ msgid "Terms and Conditions"
+#~ msgstr "Regulamin"
+

 #~ msgid "Take part! / Workshops"
 #~ msgstr "Weź udział! / Warsztaty"
 
 #~ msgid "Take part! / Workshops"
 #~ msgstr "Weź udział! / Warsztaty"
 


@@ -345,9 +548,6 @@ msgstr ""
 #~ msgid "How to Be Paid?"
 #~ msgstr "Jak zarabiać na twórczości?"
 
 #~ msgid "How to Be Paid?"
 #~ msgstr "Jak zarabiać na twórczości?"
 

-#~ msgid "Self-Publishing"
-#~ msgstr "Self-publishing"
-

 #~ msgid "Future of the Book"
 #~ msgstr "Przyszłość książki"
 
 #~ msgid "Future of the Book"
 #~ msgstr "Przyszłość książki"
 


@@ -357,9 +557,6 @@ msgstr ""
 #~ msgid "I'm planning to show up on"
 #~ msgstr "Planuję pojawić się"
 
 #~ msgid "I'm planning to show up on"
 #~ msgstr "Planuję pojawić się"
 

-#~ msgid "Both days of the conference"
-#~ msgstr "w oba dni konferencji"
-

 #~ msgid "November 6th only"
 #~ msgstr "tylko 6-go listopada"
 
 #~ msgid "November 6th only"
 #~ msgstr "tylko 6-go listopada"
 


@@ -431,9 +628,6 @@ msgstr ""
 #~ msgid "About us"
 #~ msgstr "O nas"
 
 #~ msgid "About us"
 #~ msgstr "O nas"
 

-#~ msgid "Publications"
-#~ msgstr "Publikacje"
-

 #~ msgid "Events"
 #~ msgstr "Wydarzenia"
 
 #~ msgid "Events"
 #~ msgstr "Wydarzenia"
 

diff --git a/prawokultury/static/css/forms.css b/prawokultury/static/css/forms.css
index 2822113..5b016bf 100644 (file)
--- a/prawokultury/static/css/forms.css
+++ b/prawokultury/static/css/forms.css
@@ -20,12 +20,12 @@
     list-style: url("/static/img/read-more.png"); }
   .submit-form input, .submit-form textarea, .submit-form select {
     font-size: 1.2em;
     list-style: url("/static/img/read-more.png"); }
   .submit-form input, .submit-form textarea, .submit-form select {
     font-size: 1.2em;

-    border: 0;

     background-color: white;
     color: #363A3B;
     background-color: white;
     color: #363A3B;

-    width: 100%;

     margin-bottom: .5em;
     margin-bottom: .5em;

-    border: 1px solid #EDECE7; }
+    border: 1px solid #aeada8; }
+  .submit-form textarea, .submit-form select {
+    width: 100%; }

   .submit-form th, .submit-form td {
     text-align: left;
     font-weight: normal;
   .submit-form th, .submit-form td {
     text-align: left;
     font-weight: normal;


@@ -36,21 +36,21 @@
     font-size: 1.1em; }
     .submit-form .helptext a {
       color: #363A3B; }
     font-size: 1.1em; }
     .submit-form .helptext a {
       color: #363A3B; }

-  .submit-form .required label {
-    font-weight: bold; }
-    .submit-form .required label:before {
-      content: '* '; }
-  .submit-form .required ul {
+  .submit-form tr ul {

     list-style: none;
     margin: 0;
     padding: 0; }
     list-style: none;
     margin: 0;
     padding: 0; }

-    .submit-form .required ul label {
-      font-weight: normal; }
-      .submit-form .required ul label:before {
-        content: none; }
-    .submit-form .required ul.errorlist {
+    .submit-form tr ul.errorlist {

       list-style: url("/static/img/read-more.png");
       padding: 0 0 0 1.3em;
       margin: 0 0 .5em 0; }
       list-style: url("/static/img/read-more.png");
       padding: 0 0 0 1.3em;
       margin: 0 0 .5em 0; }

+  .submit-form .required label {
+    font-weight: bold; }
+    .submit-form .required label:before {
+      content: '* '; }
+  .submit-form .required ul label {
+    font-weight: normal; }
+    .submit-form .required ul label:before {
+      content: none; }

   .submit-form input[type="radio"] {
     width: auto; }
   .submit-form input[type="radio"] {
     width: auto; }

diff --git a/prawokultury/static/css/forms.scss b/prawokultury/static/css/forms.scss
index 298f90a..107cdf9 100644 (file)
--- a/prawokultury/static/css/forms.scss
+++ b/prawokultury/static/css/forms.scss
@@ -31,14 +31,15 @@
 
     input, textarea, select {
         font-size: 1.2em;
 
     input, textarea, select {
         font-size: 1.2em;

-        border: 0;

         background-color: white;
         color: #363A3B;
         background-color: white;
         color: #363A3B;

-        width: 100%;

         margin-bottom: .5em;
         margin-bottom: .5em;

-        border: 1px solid #EDECE7;
+        border: 1px solid #aeada8;
+    }
+
+    textarea, select {
+        width: 100%;

     }
     }

-    

 
     th, td {
         text-align: left;
 
     th, td {
         text-align: left;


@@ -55,6 +56,17 @@
         }
     }
 
         }
     }
 

+    tr ul {
+        list-style: none;
+        margin: 0;
+        padding: 0;
+        &.errorlist {
+            list-style: url("/static/img/read-more.png");
+            padding: 0 0 0 1.3em;
+            margin: 0 0 .5em 0;
+        }
+    }
+

     .required {
         label {
             font-weight: bold;
     .required {
         label {
             font-weight: bold;


@@ -65,10 +77,6 @@
         }
 
         ul {
         }
 
         ul {

-            list-style: none;
-            margin: 0;
-            padding: 0;
-

             label {
                 font-weight: normal;
 
             label {
                 font-weight: normal;
 


@@ -76,11 +84,6 @@
                     content: none;
                 }
             }
                     content: none;
                 }
             }

-            &.errorlist {
-                list-style: url("/static/img/read-more.png");
-                padding: 0 0 0 1.3em;
-                margin: 0 0 .5em 0;
-            }

         }
     }
 
         }
     }
 

diff --git a/prawokultury/templates/404.html b/prawokultury/templates/404.html
index 62bbbe8..1ef6711 100755 (executable)
--- a/prawokultury/templates/404.html
+++ b/prawokultury/templates/404.html
@@ -2,10 +2,10 @@
 {% load i18n %}
 
 
 {% load i18n %}
 
 

-{% block "titleextra" %}{% trans "Page not found" %} :: {% endblock %}
+{% block titleextra %}{% trans "Page not found" %} :: {% endblock %}

 
 
 
 

-{% block "body" %}
+{% block body %}

 
 <h1>{% trans "Page not found" %}</h1>
 
 
 <h1>{% trans "Page not found" %}</h1>
 

diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 48293a8..fbb3d76 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -7,17 +7,17 @@
 {% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
 {% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>

-       <title>{% block "titleextra" %}{% endblock %}CopyCamp</title>
+       <title>{% block titleextra %}{% endblock %}CopyCamp</title>

        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
 
         <meta charset="UTF-8" />
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
 
         <meta charset="UTF-8" />

-        <meta property='og:url' content='{% block "ogurl" %}{{ request.get_full_path|build_absolute_uri:request }}{% endblock %}' />
-        <meta property='og:title' content='{% block "ogtitle" %}CopyCamp{% endblock %}' />
+        <meta property='og:url' content='{% block ogurl %}{{ request.get_full_path|build_absolute_uri:request }}{% endblock %}' />
+        <meta property='og:title' content='{% block ogtitle %}CopyCamp{% endblock %}' />

         <meta property='og:site_name' content='CopyCamp' />
         <meta property='og:site_name' content='CopyCamp' />

-        <meta property='og:description' content='{% block "ogdescription" %}{% trans "CopyCamp Conference is the first large-scale meeting in Poland devoted to the issues of copyright in both ideological and practical terms." %}{% endblock %}' />
-        <meta property='og:type' content='{% block "ogtype" %}website{% endblock %}' />
-        <meta property='og:image' content='{% block "ogimage" %}https://copycamp.pl{% static "img/copycamp_2016_"|add:request.LANGUAGE_CODE|add:"_big.png" %}{% endblock %}' />
+        <meta property='og:description' content='{% block ogdescription %}{% trans "CopyCamp Conference is the first large-scale meeting in Poland devoted to the issues of copyright in both ideological and practical terms." %}{% endblock %}' />
+        <meta property='og:type' content='{% block ogtype %}website{% endblock %}' />
+        <meta property='og:image' content='{% block ogimage %}https://copycamp.pl{% static "img/copycamp_2016_"|add:request.LANGUAGE_CODE|add:"_big.png" %}{% endblock %}' />

         <meta property='og:locale' content='{% if LANGUAGE_CODE == 'en'%}en_US{% else %}pl_PL{% endif %}' />
     </head>
     <body>
         <meta property='og:locale' content='{% if LANGUAGE_CODE == 'en'%}en_US{% else %}pl_PL{% endif %}' />
     </head>
     <body>


@@ -51,7 +51,7 @@
             </button></form-->
         </div>
         <ul id="menu" class="bar-left">
             </button></form-->
         </div>
         <ul id="menu" class="bar-left">

-            {% block "main_menu" %}
+            {% block main_menu %}

                 {% main_menu %}
             {% endblock %}
             <li id="item-lang">{% lang_switcher %}</li>
                 {% main_menu %}
             {% endblock %}
             <li id="item-lang">{% lang_switcher %}</li>


@@ -62,7 +62,7 @@
 
         <div id="main-bar">
         <div id="sidebar" class="bar-right">
 
         <div id="main-bar">
         <div id="sidebar" class="bar-right">

-            {% block "sidebar" %}
+            {% block sidebar %}

 <div class="sidebar-box" style="text-align:center; font-size: 1.3em;">
 <strong><a target="_blank" style="display: block" href="https://prawokultury.pl/publikacje/cory-doctorow-kontekst/">
 <img style="margin-bottom: .5em;" src="//prawokultury.pl/media/entry/image/cory_cvr_fb_2_maly.jpg" alt="Cory Doctorow &ndash; Kontekst"><br>
 <div class="sidebar-box" style="text-align:center; font-size: 1.3em;">
 <strong><a target="_blank" style="display: block" href="https://prawokultury.pl/publikacje/cory-doctorow-kontekst/">
 <img style="margin-bottom: .5em;" src="//prawokultury.pl/media/entry/image/cory_cvr_fb_2_maly.jpg" alt="Cory Doctorow &ndash; Kontekst"><br>


@@ -77,7 +77,7 @@
             {% endblock %}
         </div>
         <div id="content" class="bar-left">
             {% endblock %}
         </div>
         <div id="content" class="bar-left">

-            {% block "body" %}{% endblock %}
+            {% block body %}{% endblock %}

         </div>
         <div style="clear: both;"></div>
         </div>
         </div>
         <div style="clear: both;"></div>
         </div>

diff --git a/prawokultury/templates/contact/register-speaker/form.html b/prawokultury/templates/contact/register-speaker/form.html
index 740c9e6..87b799d 100644 (file)
--- a/prawokultury/templates/contact/register-speaker/form.html
+++ b/prawokultury/templates/contact/register-speaker/form.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% load i18n chunks %}
 
 {% extends "base.html" %}
 {% load i18n chunks %}
 

-{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}
+{% block titleextra %}{{ form.form_title }} :: {% endblock %}

 
 

-{% block "body" %}
+{% block body %}

     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
     {% if not form.started %}
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
     {% if not form.started %}

diff --git a/prawokultury/templates/contact/register/form.html b/prawokultury/templates/contact/register/form.html
index bd70ef1..dff155b 100644 (file)
--- a/prawokultury/templates/contact/register/form.html
+++ b/prawokultury/templates/contact/register/form.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% load i18n chunks %}
 
 {% extends "base.html" %}
 {% load i18n chunks %}
 

-{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}
+{% block titleextra %}{{ form.form_title }} :: {% endblock %}

 
 

-{% block "body" %}
+{% block body %}

     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
 


@@ -27,7 +27,18 @@
     <form method="POST" action="." enctype="multipart/form-data" class="submit-form">
       {% csrf_token %}
       <table>
     <form method="POST" action="." enctype="multipart/form-data" class="submit-form">
       {% csrf_token %}
       <table>

-        {{ form.as_table }}
+        {% if form.non_field_errors %}<tr><td colspan="2">{{ form.non_field_errors }}</td></tr>{% endif %}
+        {% for field in form.main_fields %}
+          {% include "snippets/field_as_table_row.html" %}
+        {% endfor %}
+        <tr><td colspan="2"><h3>{% trans "We would be grateful if you could answer our questions below. This will allow us to better adapt to your expectations in the future." %}</h3></td></tr>
+        {% for field in form.survey_fields %}
+          {% include "snippets/field_as_table_row.html" %}
+        {% endfor %}
+        <tr><td colspan="2"></td></tr>
+        {% for field in form.agreement_fields %}
+          {% include "snippets/field_as_table_row.html" %}
+        {% endfor %}

         <tr><td></td><td><button>{% block contact_form_submit %}{{ form.submit_label }}{% endblock %}</button></td></tr>
       </table>
     </form>
         <tr><td></td><td><button>{% block contact_form_submit %}{{ form.submit_label }}{% endblock %}</button></td></tr>
       </table>
     </form>

diff --git a/prawokultury/templates/contact/workshop/form.html b/prawokultury/templates/contact/workshop/form.html
index de5c6c8..a65d3af 100644 (file)
--- a/prawokultury/templates/contact/workshop/form.html
+++ b/prawokultury/templates/contact/workshop/form.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% load i18n chunks %}
 
 {% extends "base.html" %}
 {% load i18n chunks %}
 

-{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}
+{% block titleextra %}{{ form.form_title }} :: {% endblock %}

 
 

-{% block "body" %}
+{% block body %}

 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 

diff --git a/prawokultury/templates/snippets/field_as_table_row.html b/prawokultury/templates/snippets/field_as_table_row.html
new file mode 100644 (file)
index 0000000..5dcc98e
--- /dev/null
+++ b/prawokultury/templates/snippets/field_as_table_row.html
@@ -0,0 +1,4 @@
+<tr{% if field.css_classes %} class="{{ field.css_classes }}"{% endif %}>
+  <th>{{ field.label_tag }}</th>
+  <td>{{ field.errors }}{{ field }}{% if field.help_text %}<br /><span class="helptext">{{ field.help_text }}</span>{% endif %}</td>
+</tr>
\ No newline at end of file