Merge branch 'hotfix/v1.85'

rowers/templates/partners.html

@@ -6,32 +6,61 @@
 <div class="grid_6 alpha">
   <h2>Are you  interested in partnering with Rowsandall.com?</h2>
 
+  <p>The founding principle for rowsandall.com was, and still is, free data
+    and analysis for rowers. Fulfilling that mission means that we try to test
+    and support as many widely used rowing related hardware and software
+    products as possible. Since these products typically have rapid update
+    cycles for bug fixes and new features, having ready access to the
+    products enables us to keep rowsandall.com working well.</p>
+
+  <p>At the same time, one of the most powerful marketing and publicity
+    for niche products like rowing gear is word of mouth reviews and
+    endorsements from "real" users.</p>
+
+  <p>To try to keep rowsandall.com non-commercial and brand neutral, we have
+    the following principles for collaboration.<p>
+  
   <p>We are open to working together with partners serving the rowing
     community. To maintain maximum transparency to our users, we have
     the following principles for collaboration:</p>
 
-  <ol>
+  <p>On blog.rowsandall.com, analytics.rowsandall.com and through
-    <li>On blog.rowsandall.com, analytics.rowsandall.com and in through
       our Twitter account, we write about hardware, software, and other
-      rowing related kit that we have used, tested, and are enthusiastic about. </li>
+    rowing related kit that we have used, tested, and are enthusiastic about. </p>
-    <li>If you send us a unit, or a piece of software to test, we will not
-      write a public review about it. If we like the unit (software, etc) and
-      keep using it, you may see it appear in our blog posts. If there are
-      reasons why we are not satisfied with the unit, but we feel that
-      an improved version would serve the rowing community, we will contact
-      you with constructive criticism. We will do our best not to mention
-      your product in
-      a negative way on our public blogs or twitter. However, we retain the
-      freedom to engage in online discussions about your product, but will
-      try to keep our communication factual.</li>
-    <li>We encourage vendors to send us their products for testing. We are
-      especially interested in software and hardware used for indoor and
-      on-the-water rowing. We want to avoid the hassle of sending back
-      your products, so we will not send back any item that has a value of
-      less than 1000 EURO. If you want us to test an item of higher value,
-      please mention this when you contact us.</li>
-  </ol>
 
+  <p>
+    <ol>
+      <li>We welcome evaluation hardware and software products to try
+        out.</li>
+      <li>We make no specific commitment in exchange for these products.</li>
+      <li>We do not formally publish product reviews, however, we may or
+        may not
+        mention your product
+        on <a href="blog.rowsandall.com">blog.rowsandall.com</a>
+        or
+        <a href="analytics.rowsandall.com">analytics.rowsandall.com</a>.</li>
+      <li>If there are reasons why we are not satisfied with the unit, but
+        we feel that an improved version would serve the rowing community,
+        we may contact you with constructive criticism. We try to not mention
+        your product in a negative way on our public blogs or twitter.
+        However, we retain the freedom to engage in online discussions
+        about your product, but will try to keep our communication
+        factual.</li>
+      <li>We encourage vendors to send us their products for testing.
+        We are especially interested in software and hardware used
+        for indoor and
+        on-the-water rowing.</li>
+      <li>We do not accept equipment on loan. This is our policy because
+        this is an informal collaboration, we do not have the ability
+        to accept financial responsibility for loss, breakage or return
+        shipping.</li>
+    </ol>
+  </p>
+
+  <p>For evaluation consideration, please contact us
+    at info@rowsandall.com with
+    information about your product/service including any important
+    links or images prior to sending the product.</p>
 </div>
 
 
@@ -56,8 +85,11 @@
         a reduced rate) a "block" of Pro membership coupons.</li>
       <li>Advertising. If you decide to support rowsandall.com through
         advertising, we will create a top banner where you as a sponsor
-        have space to put up a clickable picture. Price and content open
+        have space to put up a clickable static picture. Contact us for
-        for negotiation.</li>
+        rates and details on the size of the advertisement and possible
+        duration of the campaign. We reserve the right to decline
+        advertisement that don't add value to the rowing community or aren't
+        a good fit for the audience and content of the site.</li>
       <li>Collaboration on prototypes or beta versions of your new products
         (or product upgrades). You send us a product ahead of release (under
         a confidentiality agreement) and we use it and provide feedback.

rowers/views.py

@@ -3,6 +3,7 @@ import timestring
 import zipfile
 import operator
 import warnings
+from numbers import Number
 from django.views.generic.base import TemplateView
 from django.db.models import Q
 from django.db import IntegrityError, transaction
@@ -3377,7 +3378,7 @@ def cumstats(request,theuser=0,
     elif request.method == 'POST' and "datedelta" in request.POST:
 	deltaform = DeltaDaysForm(request.POST)
 	if deltaform.is_valid():
-	    deltadays = deltaform.cleaned_data['deltadays']
+	    deltadays = deltaform.cleaned_data['deltadays']
 	    if deltadays != 0 and isinstance(deltadays, Number):
 		enddate = timezone.now()
 		startdate = enddate-datetime.timedelta(days=deltadays)