Merge branch 'develop' into feature/workoutslist

rowers/templates/gdpr_optin.html

@@ -11,18 +11,24 @@
   you can opt in or delete this user account.
 </p>
 
-<h2>GDPR Opt-In</h2>
+<h2>Data Consent</h2>
 <p>
   <b>
     To comply with the European Union General Data Protection Regulation,
     we need to record your consent to use personal data on this website.
     Please take some time to review our data policies. If you agree and
     opt in, click the "opt in" button at the bottom to be taken to the site.
-    If you do not agree, please use the red button to delete your
+    If you do not agree, please use the  button at the end fo the page to delete your
     account. This will irreversibly delete all your data on rowsandall.com
     and remove your account.
   </b>
 </p>
+
+<p>
+  <a class="button green" href="/rowers/me/gdpr-optin-confirm/?next={{ next }}"><b>OPT IN AND CONTINUE</b></a>
+</p>
+
+
 <hr>
 
 {% include "privacypolicy.html" %}
@@ -33,26 +39,27 @@
   To start or continue using the site, please give your consent by clicking on the green Opt In button below.
 </p>
 
-<p>
-  <a class="button gray small" href="/rowers/exportallworkouts/">Download your data</a>
-</p>
+
 
 <p>
-  <a class="button green small" href="/rowers/me/gdpr-optin-confirm/?next={{ next }}">Opt in and continue</a>
+  <a class="button green" href="/rowers/me/gdpr-optin-confirm/?next={{ next }}"><b>OPT IN AND CONTINUE</b></a>
 </p>
 
 <p>
   <form method="POST" action="/rowers/me/delete/" class="padding">
     {% csrf_token %}
     <input id="id_delete_user" type="hidden" name="delete_user" value="True">
-    <input class="button red small" type="submit" name="action" value="DELETE ACCOUNT">
-    
+    <input class="button" type="submit" name="action" value="DELETE ACCOUNT">
+
   </form>
 </p>
 
+<p>
+  <a href="/rowers/exportallworkouts/">Download your data</a>
+</p>
+
 {% endblock %}
 
 {% block sidebar %}
 {% include 'menu_profile.html' %}
 {% endblock %}
-

rowers/views/paymentviews.py

@@ -784,10 +784,11 @@ def useractivate(request, uidb64, token): # pragma: no cover
                   ['roosendaalsander@gmail.com'])
 
 
-        messages.info(request,'Thank you for your email confirmation. Now you can login to your account.')
-        url = '/login/'
-        if user.rower.rowerplan == 'freecoach':
-            url+='?next=/rowers/me/teams'
+        messages.info(request,'Thank you for your email confirmation. YOu are now signed in to your account.')
+        login(request, user, backend=settings.AUTHENTICATION_BACKENDS[0])
+        url = reverse('workouts_view')
+        #if user.rower.rowerplan == 'freecoach':
+        #    url+='?next=/rowers/me/teams'
         return HttpResponseRedirect(url)
     else:
         return render(request,