Merge tag 'v8.53' into develop

bug fix

rowers/templates/rower_preferences.html

@@ -25,7 +25,7 @@
         {{ form.as_table }}
       </table>
       {% csrf_token %}
-      <input class="button green" type="submit" value="Save">
+      <input type="submit" value="Update Heart Rate Zones">
     </form>
   </li>
   <li class="grid_2">
@@ -75,11 +75,12 @@
       </table>
       {% csrf_token %}
       <div class="grid_2 prefix_2 suffix_2">
-        <input class="button green" type="submit" value="Save">
+        <input type="submit" value="Update Power Zones">
       </div>
     </form>
   </li>
-  <li class="grid_2">    
+  <li class="grid_2">
+  <form enctype="multipart/form-data" action="" method="post">
     <h2>Functional Threshold Power and OTW Slack</h2>
     <p>Use this form to quickly change your zones based on the power of a
       recent
@@ -89,13 +90,12 @@
       rowing power
       vs the erg power. Typical values are around 15%. This will lower
       the power zones for your OTW workouts.</p> 
-    <form enctype="multipart/form-data" action="" method="post">
-      <table>
+        <table>
 	{{ powerform.as_table }}
       </table>
       {% csrf_token %}
-      <input class="button green" type="submit" value="Save">
-    </form>
+      <input type="submit" value="Update">
+  </form>
   </li>
 </ul>
 

rowers/views.py

@@ -12725,6 +12725,7 @@ def rower_edit_view(request,rowerid=0,userid=0,message=""):
 
 	return response
     elif request.method == 'POST' and "ftp" in request.POST:
+        print request.POST
 	powerform = RowerPowerForm(request.POST)
 	if powerform.is_valid():
 	    cd = powerform.cleaned_data