data processing info in forms

diff --git a/src/funding/forms.py b/src/funding/forms.py
index 8f1c3be..1c85135 100644 (file)
--- a/src/funding/forms.py
+++ b/src/funding/forms.py
@@ -4,6 +4,7 @@
 #
 from django import forms
 from django.utils import formats
 #
 from django import forms
 from django.utils import formats

+from django.utils.safestring import mark_safe

 from django.utils.translation import ugettext_lazy as _, ugettext, get_language
 
 from newsletter.forms import NewsletterForm
 from django.utils.translation import ugettext_lazy as _, ugettext, get_language
 
 from newsletter.forms import NewsletterForm


@@ -20,10 +21,14 @@ class FundingForm(NewsletterForm):
         label=_("Name"), required=False, help_text=_("Optional name for public list of contributors"))
     email = forms.EmailField(
         label=_("Contact e-mail"),
         label=_("Name"), required=False, help_text=_("Optional name for public list of contributors"))
     email = forms.EmailField(
         label=_("Contact e-mail"),

-        help_text=_(
+        help_text=mark_safe(_(

             "We'll use it to contact you about the <strong>details needed for your perks</strong>,<br/>"
             "and to send you updates about your payment and the fundraiser status (which you can always turn off).<br/>"
             "We'll use it to contact you about the <strong>details needed for your perks</strong>,<br/>"
             "and to send you updates about your payment and the fundraiser status (which you can always turn off).<br/>"

-            "Your e-mail won't be publicised."), required=False)
+            "Your e-mail won't be publicised.")), required=False)
+
+    data_processing_part2 = u'''\
+W przypadku podania danych zostaną one wykorzystane w sposób podany powyżej, a w przypadku wyrażenia dodatkowej zgody 
+adres e-mail zostanie wykorzystany także w celu przesyłania newslettera Wolnych Lektur.'''

 
     def __init__(self, offer, *args, **kwargs):
         self.offer = offer
 
     def __init__(self, offer, *args, **kwargs):
         self.offer = offer

diff --git a/src/funding/templates/funding/offer_detail.html b/src/funding/templates/funding/offer_detail.html
index 2110f13..556ec13 100644 (file)
--- a/src/funding/templates/funding/offer_detail.html
+++ b/src/funding/templates/funding/offer_detail.html
@@ -59,7 +59,7 @@
               <td></td>
               <td>
                 <label>{{ form.agree_newsletter }} {{ form.agree_newsletter.label }}</label>
               <td></td>
               <td>
                 <label>{{ form.agree_newsletter }} {{ form.agree_newsletter.label }}</label>

-                <br/><span class="helptext">{{ form.agree_newsletter.help_text }}</span>
+                <br/><span class="helptext">{{ form.data_processing }}</span>

               </td>
             </tr>
             <tr>
               </td>
             </tr>
             <tr>

diff --git a/src/newsletter/forms.py b/src/newsletter/forms.py
index e8d99f7..323fe3f 100644 (file)
--- a/src/newsletter/forms.py
+++ b/src/newsletter/forms.py
@@ -4,6 +4,7 @@ from django.core.validators import validate_email
 from django.forms import Form, BooleanField
 from django.forms.fields import EmailField
 from django.template.loader import render_to_string
 from django.forms import Form, BooleanField
 from django.forms.fields import EmailField
 from django.template.loader import render_to_string

+from django.utils.safestring import mark_safe

 from django.utils.translation import ugettext_lazy as _, ugettext
 
 from contact import mailing
 from django.utils.translation import ugettext_lazy as _, ugettext
 
 from contact import mailing


@@ -14,12 +15,19 @@ from wolnelektury.utils import send_noreply_mail
 class NewsletterForm(Form):
     email_field = 'email'
     agree_newsletter = BooleanField(
 class NewsletterForm(Form):
     email_field = 'email'
     agree_newsletter = BooleanField(

-        required=False, initial=False, label=_(u'I want to receive Wolne Lektury\'s newsletter.'), help_text='''\
-Oświadczam, że wyrażam zgodę na przetwarzanie moich danych osobowych zawartych \
-w niniejszym formularzu zgłoszeniowym przez Fundację Nowoczesna Polska (administratora danych) z siedzibą \
-w Warszawie (00-514) przy ul. Marszałkowskiej 84/92 lok. 125 w celu otrzymywania newslettera Wolnych Lektur. \
-Jednocześnie oświadczam, że zostałam/em poinformowana/y o tym, że mam prawo wglądu w treść swoich danych i \
-możliwość ich poprawiania oraz że ich podanie jest dobrowolne, ale niezbędne do dokonania zgłoszenia.''')
+        required=False, initial=False, label=_(u'I want to receive Wolne Lektury\'s newsletter.'))
+
+    data_processing_part1 = u'''\
+Administratorem danych osobowych jest Fundacja Nowoczesna Polska (ul. Marszałkowska 84/92 lok. 125, 00-514 Warszawa).
+Podanie danych osobowych jest dobrowolne.'''
+    data_processing_part2 = u'''Dane są przetwarzane w zakresie niezbędnym do wysyłania newslettera odbiorcom.'''
+    data_processing_part3 = u'''\
+Osobom, których dane są zbierane, przysługuje prawo dostępu do treści swoich danych oraz ich poprawiania.
+Więcej informacji w <a href="">polityce prywatności.</a>'''
+
+    @property
+    def data_processing(self):
+        return mark_safe('%s %s %s' % (self.data_processing_part1, self.data_processing_part2, self.data_processing_part3))

 
     def save(self):
         try:
 
     def save(self):
         try:

diff --git a/src/newsletter/templates/newsletter/subscribe_form.html b/src/newsletter/templates/newsletter/subscribe_form.html
index 67a39ce..203e54c 100644 (file)
--- a/src/newsletter/templates/newsletter/subscribe_form.html
+++ b/src/newsletter/templates/newsletter/subscribe_form.html
@@ -12,6 +12,7 @@
     <ol>
       <li>{{ form.email|pretty_field }}</li>
       <li>{{ form.agree_newsletter|pretty_checkbox }}</li>
     <ol>
       <li>{{ form.email|pretty_field }}</li>
       <li>{{ form.agree_newsletter|pretty_checkbox }}</li>

+      <li><span class="helptext">{{ form.data_processing }}</span></li>

       <li><input type="submit" value="{% trans "Subscribe" %}"/></li>
     </ol>
   </form>
       <li><input type="submit" value="{% trans "Subscribe" %}"/></li>
     </ol>
   </form>

diff --git a/src/suggest/forms.py b/src/suggest/forms.py
index 15f5f2c..cfcaab5 100644 (file)
--- a/src/suggest/forms.py
+++ b/src/suggest/forms.py
@@ -21,6 +21,10 @@ class SuggestForm(NewsletterForm):
     contact = forms.CharField(label=_('Contact'), max_length=120, required=False)
     description = forms.CharField(label=_('Description'), widget=forms.Textarea, required=True)
 
     contact = forms.CharField(label=_('Contact'), max_length=120, required=False)
     description = forms.CharField(label=_('Description'), widget=forms.Textarea, required=True)
 

+    data_processing_part2 = u'''\
+Dane są przetwarzane w zakresie niezbędnym do obsługi zgłoszenia. W przypadku wyrażenia dodatkowej zgody \
+adres e-mail zostanie wykorzystany także w celu przesyłania newslettera Wolnych Lektur.'''
+

     def save(self, request):
         super(SuggestForm, self).save()
         contact = self.cleaned_data['contact']
     def save(self, request):
         super(SuggestForm, self).save()
         contact = self.cleaned_data['contact']


@@ -66,6 +70,8 @@ class PublishingSuggestForm(NewsletterForm):
     ebook = forms.BooleanField(label=_('ebook'), required=False, initial=True)
     audiobook = forms.BooleanField(label=_('audiobook'), required=False)
 
     ebook = forms.BooleanField(label=_('ebook'), required=False, initial=True)
     audiobook = forms.BooleanField(label=_('audiobook'), required=False)
 

+    data_processing_part2 = SuggestForm.data_processing_part2
+

     def clean(self):
         if not self.cleaned_data['ebook'] and not self.cleaned_data['audiobook']:
             msg = ugettext(u"One of these options is required.")
     def clean(self):
         if not self.cleaned_data['ebook'] and not self.cleaned_data['audiobook']:
             msg = ugettext(u"One of these options is required.")

diff --git a/src/suggest/templates/publishing_suggest.html b/src/suggest/templates/publishing_suggest.html
index 66792c7..43ad403 100755 (executable)
--- a/src/suggest/templates/publishing_suggest.html
+++ b/src/suggest/templates/publishing_suggest.html
@@ -9,10 +9,9 @@
   {{ form.ebook|pretty_checkbox }}
   {{ form.audiobook|pretty_checkbox }}
   {{ form.agree_newsletter|pretty_checkbox }}
   {{ form.ebook|pretty_checkbox }}
   {{ form.audiobook|pretty_checkbox }}
   {{ form.agree_newsletter|pretty_checkbox }}

+  <li><span class="helptext">{{ form.data_processing }}</span></li>

 {% endblock %}
 
 {% endblock %}
 

-
-    <li><input type="submit" value="{% trans "Send report" %}"/></li>
-    <li>{% trans "Remember that we can only publish books in public domain, ie. 70 years after the death of the author!" %}</li>
-  </ol>
-</form>
+{% block extra %}
+  <p>{% trans "Remember that we can only publish books in public domain, ie. 70 years after the death of the author!" %}</p>
+{% endblock %}
\ No newline at end of file

diff --git a/src/suggest/templates/suggest.html b/src/suggest/templates/suggest.html
index 1166706..ddf0bf8 100644 (file)
--- a/src/suggest/templates/suggest.html
+++ b/src/suggest/templates/suggest.html
@@ -5,4 +5,5 @@
   {{ form.contact|pretty_field }}
   {{ form.description|pretty_field }}
   {{ form.agree_newsletter|pretty_checkbox }}
   {{ form.contact|pretty_field }}
   {{ form.description|pretty_field }}
   {{ form.agree_newsletter|pretty_checkbox }}

+  <li><span class="helptext">{{ form.data_processing }}</span></li>

 {% endblock %}
\ No newline at end of file
 {% endblock %}
\ No newline at end of file

diff --git a/src/wolnelektury/forms.py b/src/wolnelektury/forms.py
index 0973e7d..053178a 100644 (file)
--- a/src/wolnelektury/forms.py
+++ b/src/wolnelektury/forms.py
@@ -7,6 +7,11 @@ from newsletter.forms import NewsletterForm
 
 # has to be this order, because otherwise the form is lacking fields
 class RegistrationForm(UserCreationForm, NewsletterForm):
 
 # has to be this order, because otherwise the form is lacking fields
 class RegistrationForm(UserCreationForm, NewsletterForm):

+    data_processing_part2 = u'''\
+Dane są przetwarzane w zakresie niezbędnym do prowadzenia serwisu, a także w celach prowadzenia statystyk, \
+ewaluacji i sprawozdawczości. W przypadku wyrażenia dodatkowej zgody adres e-mail zostanie wykorzystany \
+także w celu przesyłania newslettera Wolnych Lektur.'''
+

     class Meta:
         model = User
         fields = ('username', 'email')
     class Meta:
         model = User
         fields = ('username', 'email')

diff --git a/src/wolnelektury/templates/auth/register_form.html b/src/wolnelektury/templates/auth/register_form.html
index d9fb6a1..9f72af7 100644 (file)
--- a/src/wolnelektury/templates/auth/register_form.html
+++ b/src/wolnelektury/templates/auth/register_form.html
@@ -8,4 +8,5 @@
   {{ form.password1|pretty_field }}
   {{ form.password2|pretty_field }}
   {{ form.agree_newsletter|pretty_checkbox }}
   {{ form.password1|pretty_field }}
   {{ form.password2|pretty_field }}
   {{ form.agree_newsletter|pretty_checkbox }}

+  <li><span class="helptext">{{ form.data_processing }}</span></li>

 {% endblock %}
\ No newline at end of file
 {% endblock %}
\ No newline at end of file