Merge branch 'feature/emailbounce' into develop

rowers/models.py

@@ -571,6 +571,8 @@ class Rower(models.Model):
 
     getemailnotifications = models.BooleanField(default=False,
                                                 verbose_name='Receive email notifications')
+    emailbounced = models.BooleanField(default=False,
+                                       verbose_name='Email Address Bounced')
 
     rowerplan = models.CharField(default='basic',max_length=30,
 				 choices=plans)

rowers/templates/privacypolicy.html

@@ -92,7 +92,28 @@
 <p>
   The data protection officer for rowsandall.com is Sander Roosendaal and he may be contacted
   at support@rowsandall.com.
-  </p>
+</p>
+
+<h2>Notifications and Email Policy</h2>
+
+<p>
+  Some actions on the site result in an individual email sent to you.
+</p>
+
+<p>
+  We will rarely use mass email to communicate to all our users. These cases
+  are limited to substantial changes in terms and conditions and other
+  announcements impacting the terms on which you use the site. We will
+  it is important to get these messages to you. If you do not with
+  to receive such emails, you can indicate so in the user settings.
+</p>
+
+<p>
+  Other site related communication (new features, outages, bugs,
+  price changes) are communicated through announcements on the
+  website, throught Twitter, Facebook and our blog
+  posts. 
+</p>
   
   <h2>Data Deletion</h2>
 

rowers/views.py

@@ -11231,11 +11231,16 @@ def rower_edit_view(request,rowerid=0,message=""):
             getemailnotifications = cd['getemailnotifications']
             defaulttimezone=cd['defaulttimezone']
             u = r.user
+            if u.email != email and len(email):
+                resetbounce = True
+            else:
+                resetbounce = False
             if len(first_name):
                 u.first_name = first_name
             u.last_name = last_name
             if len(email): ## and check_email_freeforuse(u,email):
                 u.email = email
+                resetbounce = True
 
 
             u.save()
@@ -11246,6 +11251,9 @@ def rower_edit_view(request,rowerid=0,message=""):
             r.showfavoritechartnotes = showfavoritechartnotes
             r.sex = sex
             r.birthdate = birthdate
+            if resetbounce and r.emailbounced:
+                print "aap"
+                r.emailbounced = False
             r.save()
             form = RowerForm(instance=r)
 	    powerform = RowerPowerForm(instance=r)

templates/basebase.html

@@ -247,6 +247,11 @@
           {{ user.rower.protrialexpires|date_dif|ddays }} days left in Pro trial
         </p>
         {% endif %}
+        {% if user.rower.emailbounced %}
+        <p class="message">
+          Your email bounced. Please update your email address in the <a href="/rowers/me/edit/">user settings</a>
+        </p>
+        {% endif %}
         {% if messages %}
         {% for message in messages %}
         {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}