widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #14419
[Merge] lp:~widelands-dev/widelands-website/gdpr_1 into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/gdpr_1 into lp:widelands-website.
Commit message:
Removed google analytics and PayPal, make some fields optional in the contact form.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1780536 in Widelands Website: "Add a GDPR (german: DSVGO) to the website"
https://bugs.launchpad.net/widelands-website/+bug/1780536
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/gdpr_1/+merge/354355
After long time absence, i wanted to restart with an easy thing :-)
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/gdpr_1 into lp:widelands-website.
=== removed file 'mainpage/context_processors.py'
--- mainpage/context_processors.py 2018-02-11 14:48:26 +0000
+++ mainpage/context_processors.py 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-from django.conf import settings
-
-
-def settings_for_templates(request):
- context = {'USE_GOOGLE_ANALYTICS': settings.USE_GOOGLE_ANALYTICS,}
- return context
=== modified file 'mainpage/forms.py'
--- mainpage/forms.py 2016-12-13 18:28:51 +0000
+++ mainpage/forms.py 2018-09-05 19:48:01 +0000
@@ -14,7 +14,7 @@
class ContactForm(forms.Form):
- surname = forms.CharField(max_length=80)
- forename = forms.CharField(max_length=80)
+ surname = forms.CharField(max_length=80, required=False)
+ forename = forms.CharField(max_length=80, required=False)
email = forms.EmailField()
inquiry = forms.CharField(widget=forms.Textarea)
=== modified file 'settings.py'
--- settings.py 2018-05-12 14:01:09 +0000
+++ settings.py 2018-09-05 19:48:01 +0000
@@ -142,7 +142,6 @@
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django_messages.context_processors.inbox',
- 'mainpage.context_processors.settings_for_templates',
],
},
},
@@ -275,9 +274,6 @@
########
MAPS_PER_PAGE = 10
-
-USE_GOOGLE_ANALYTICS = False
-
##############################################
## Recipient(s) who get an email if someone ##
## uses the form on legal notice page ##
=== modified file 'templates/base.html'
--- templates/base.html 2018-02-11 14:48:26 +0000
+++ templates/base.html 2018-09-05 19:48:01 +0000
@@ -25,18 +25,6 @@
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/base_ielt9.css" />
<![endif]-->
- {% if USE_GOOGLE_ANALYTICS %}
- <!-- Google Analytics -->
- <script>
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
- ga('create', 'UA-42120570-2', 'widelands.org');
- ga('send', 'pageview');
- </script>
- {% endif %}
-
<!-- Javascript Bread & Butter Scripts -->
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-3.2.1.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ui.min.js"></script>
=== modified file 'templates/mainpage/legal_notice.html'
--- templates/mainpage/legal_notice.html 2016-02-29 23:14:56 +0000
+++ templates/mainpage/legal_notice.html 2018-09-05 19:48:01 +0000
@@ -12,7 +12,8 @@
<h2>Project lead</h2>
<ul>
- <li>Holger Rapp</li>
+ <li>GunChleoc (Since 2016)</li>
+ <li>Holger Rapp (SirVer) (2001 – 2016)</li>
</ul>
<h2>Contact</h2>
@@ -28,25 +29,30 @@
</ul>
<form action="/legal_notice/" method="post">{% csrf_token %}
- {% if form.errors %}
- <p class="errormessage" style="text-align: left;">Please fill out all fields!</p>
- {% endif %}
<table>
<tr>
- <td><label for="id_forename">First name: </label></td>
- <td><input id="id_forename" type="text" name="forename" maxlength="80" required></td>
+ <td><label for="id_forename">First name (optional): </label></td>
+ <td><input id="id_forename" type="text" name="forename" maxlength="80"></td>
</tr>
<tr>
- <td><label for="id_surname">Last name: </label></td>
- <td><input id="id_surname" type="text" name="surname" maxlength="80" required></td>
+ <td><label for="id_surname">Last name (optional): </label></td>
+ <td><input id="id_surname" type="text" name="surname" maxlength="80"></td>
</tr>
<tr>
<td><label for="id_email">Email:</label></td>
- <td><input type="text" name="email" id="id_email" required></td>
+ <td><input type="email" name="email" id="id_email" required>
+ {% for error in form.email.errors %}
+ <span class="errormessage">{{ error }}</span>
+ {% endfor %}
+ </td>
</tr>
<tr>
- <td><label for="id_inquiry">Inquiry: </label></td>
- <td><textarea id="id_inquiry" rows="10" cols="40" name="inquiry" required></textarea></td>
+ <td><label for="id_inquiry">Inquiry: </label>{{ form.inquiry.errors }}</td>
+ <td><textarea id="id_inquiry" rows="10" cols="40" name="inquiry" required></textarea>
+ {% for error in form.inquiry.errors %}
+ <span class="errormessage">{{ error }}</span>
+ {% endfor %}
+ </td>
</tr>
<tr>
<td></td>
=== modified file 'templates/right_boxes.html'
--- templates/right_boxes.html 2018-04-13 07:31:42 +0000
+++ templates/right_boxes.html 2018-09-05 19:48:01 +0000
@@ -11,27 +11,6 @@
{% load wlprofile_extras wlpoll_extras wlevents_extras %}
{% load pybb_extras %}
-<!-- Donation Box -->
-<div class="columnModule">
- <h3>Donation</h3>
- <div class="columnModuleBox center">
- <p>
- Help us to pay our server!
- <br />
- (: Consider a donation :)
- </p>
- <form action="https://www.paypal.com/cgi-bin/webscr"; method="post">
- <input type="hidden" name="cmd" value="_s-xclick" />
- <input type="hidden" name="lc" value="GB" />
- <input type="hidden" name="hosted_button_id" value="JH5R7YHSVRMRG" />
- <input type="image" class="donate" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif"; name="submit" alt="PayPal - The safer, easier way to pay online!" />
- <img alt="" src="https://www.paypal.com/de_DE/i/scr/pixel.gif"; width="1" height="1" />
- </form>
- <br /><br />
- </div>
-</div>
-
-
<!-- Social Media Box -->
<div class="columnModule">
<h3>Social Media</h3>
Follow ups
