improvements for basic users

rowers/templates/advancededit.html

@@ -15,8 +15,7 @@
     
     <h1>{{ workout.name }} - Advanced</h1>
     {% if user.rower.rowerplan == 'basic' %}
-    <p>This is a preview of the page with advanced functionality for Pro users.
+    <p>Functionality marked with an asterisk (*) is limited to the paid plans. See
-      See
       <a href="/rowers/promembership">the page about Pro membership</a>
       for more information and to sign up for Pro Membership</a></p>
     {% endif %}
@@ -63,7 +62,7 @@
       {% if user|is_promember %}
       <a class="button blue small" href="/rowers/workout/compare/{{ workout.id }}">Compare Workouts</a>
       {% else %}
-      <a class="button blue small" href="/rowers/promembership/">Compare Workouts</a>
+      <a class="button blue small" href="/rowers/promembership/">Compare Workouts*</a>
       {% endif %}
       <p>
         Compare this workout to other workouts. Plot HR, SPM, or pace vs time or distance for the two workouts.
@@ -83,7 +82,7 @@
         {% if user|is_promember %}
         <a class="button blue small" href="/rowers/workout/{{ workout.id }}/editintervals">Edit Intervals</a>
         {% else %}
-        <a class="button blue small" href="/rowers/promembership">Edit Intervals</a>
+        <a class="button blue small" href="/rowers/promembership">Edit Intervals*</a>
         {% endif %}
       </p>
       <span class="tooltiptext">Enter or change the interval and summary data for your workout</span>
@@ -94,13 +93,12 @@
     </div>
   </div>
   <div class="grid_6 alpha">
-    
     <div class="grid_2 alpha">
       <p>
         {% if user|is_promember %}
         <a class="button blue small" href="/rowers/workout/{{ workout.id }}/adddistanceplot2">Dist Metrics Plot</a>
         {% else %}
-        <a class="button blue small" href="/rowers/promembership">Dist Metrics Plot</a>
+        <a class="button blue small" href="/rowers/promembership">Dist Metrics Plot*</a>
         {% endif %}
       </p>
       <p>
@@ -112,7 +110,7 @@
         {% if user|is_promember %}
         <a class="button blue small" href="/rowers/workout/{{ workout.id }}/addtimeplot2">Time Metrics Plot</a>
         {% else %}
-        <a class="button blue small" href="/rowers/promembership">Time Metrics Plot</a>
+        <a class="button blue small" href="/rowers/promembership">Time Metrics Plot*</a>
         {% endif %}
       </p>
       <p>
@@ -124,7 +122,7 @@
         {% if user|is_promember %}
         <a class="button blue small" href="/rowers/workout/{{ workout.id }}/histo">Power Histogram</a>
         {% else %}
-        <a class="button blue small" href="/rowers/promembership">Power Histogram</a>
+        <a class="button blue small" href="/rowers/promembership">Power Histogram*</a>
         {% endif %}
       </p>
       <p>
@@ -138,7 +136,7 @@
         {% if user|is_promember %}
         <a class="button blue small" href="/rowers/workouts-join-select">Glue</a>
         {% else %}
-        <a class="button blue small" href="/rowers/promembership">Glue</a>
+        <a class="button blue small" href="/rowers/promembership">Glue*</a>
         {% endif %}
       </p>
       <p>
@@ -151,7 +149,7 @@
         {% if user|is_promember %}
         <a class="button blue small" href="/rowers/workout/fusion/{{ workout.id }}/">Sensor Fusion</a>
         {% else %}
-        <a class="button blue small" href="/rowers/promembership">Sensor Fusion</a>
+        <a class="button blue small" href="/rowers/promembership">Sensor Fusion*</a>
         {% endif %}
       </p>
       <p>
@@ -163,7 +161,7 @@
         {% if user|is_promember %}
         <a class="button blue small" href="/rowers/workout/{{ workout.id }}/split">Split Workout</a>
         {% else %}
-        <a class="button blue small" href="/rowers/promembership">Split Workout</a>
+        <a class="button blue small" href="/rowers/promembership">Split Workout*</a>
         {% endif %}
       </p>
       <p>

rowers/templates/advancedotw.html

@@ -15,8 +15,9 @@
 
   <h1>{{ workout.name }} - Advanced OTW</h1>
   {% if user.rower.rowerplan == 'basic' %}
-  <p>This is a preview of the page with advanced functionality for Pro users.
+    <p>Functionality marked with an asterisk (*) is limited to the paid plans. See
-    See <a href="/rowers/promembership">the page about Pro membership</a> for more information and to sign up for Pro Membership</a>
+      <a href="/rowers/promembership">the page about Pro membership</a>
+      for more information and to sign up for Pro Membership</a></p>
 {% endif %}
 <div class="grid_2 alpha">
   <p>
@@ -59,7 +60,7 @@
       {% if user|is_promember %}
       <a class="button blue small" href="/rowers/workout/compare/{{ workout.id }}">Compare Workouts</a>
       {% else %}
-      <a class="button blue small" href="/rowers/promembership">Compare Workouts</a>
+      <a class="button blue small" href="/rowers/promembership">Compare Workouts*</a>
       {% endif %}
     </p>
     <p>
@@ -81,7 +82,7 @@
       {% if user|is_promember %}
       <a class="button blue small" href="/rowers/workout/{{ workout.id }}/editintervals">Edit Intervals</a>
       {% else %}
-      <a class="button blue small" href="/rowers/promembership">Edit Intervals</a>
+      <a class="button blue small" href="/rowers/promembership">Edit Intervals*</a>
       {% endif %}
     </p>
     <span class="tooltiptext">Enter or change the interval and summary data for your workout</span>
@@ -98,7 +99,7 @@
       {% if user|is_promember %}
       <a class="button blue small"href="/rowers/workout/{{ workout.id }}/crewnerdsummary">CrewNerd Summary</a>
       {% else %}
-      <a class="button blue small" href="/rowers/promembership">CrewNerd Summary</a>
+      <a class="button blue small" href="/rowers/promembership">CrewNerd Summary*</a>
       {% endif %}
       
     </p>
@@ -112,7 +113,7 @@
       {% if user|is_promember %}
       <a class="button blue small" href="/rowers/workout/{{ workout.id }}/forcecurve">Stroke Profile (Empower)</a>
       {% else %}
-      <a class="button blue small" href="/rowers/promembership">Stroke Profile (Empower)</a>
+      <a class="button blue small" href="/rowers/promembership">Stroke Profile (Empower)*</a>
       {% endif %}
     </p>
     <span class="tooltiptext">Analyze your stroke force profile (need Empower Oarlock data)</span>    <p>
@@ -125,7 +126,7 @@
       {% if user|is_promember %}
       <a class="button blue small" href="/rowers/workout/{{ workout.id }}/addotwpowerplot">OTW Power Plot</a>
       {% else %}
-      <a class="button blue small" href="/rowers/promembership">OTW Power Plot</a>
+      <a class="button blue small" href="/rowers/promembership">OTW Power Plot*</a>
       {% endif %}
     </p>
     <span class="tooltiptext">Note: You must run the OTW calculations under Geeky Stuff first. Otherwise the plot will be empty</span>
@@ -145,7 +146,7 @@
       {% if user|is_promember %}
       <a class="button blue small" href="/rowers/workout/{{ workout.id }}/geeky">Geeky Stuff</a>
       {% else %}
-      <a class="button blue small" href="/rowers/promembership">Geeky Stuff</a>
+      <a class="button blue small" href="/rowers/promembership">Geeky Stuff*</a>
       {% endif %}
       
     </p>
@@ -160,7 +161,7 @@
       {% if user|is_promember %}
       <a class="button blue small"href="/rowers/workout/{{ workout.id }}/smoothenpace">Smooth out Pace Data</a>
       {% else %}
-      <a class="button blue small" href="/rowers/promembership">Smooth out Pace Data</a>
+      <a class="button blue small" href="/rowers/promembership">Smooth out Pace Data*</a>
       {% endif %}
       
     </p>
@@ -177,7 +178,7 @@
       {% if user|is_promember %}
       <a class="button blue small"href="/rowers/workout/{{ workout.id }}/undosmoothenpace">Raw Data</a>
       {% else %}
-      <a class="button blue small" href="/rowers/promembership">Reset Smoothing</a>
+      <a class="button blue small" href="/rowers/promembership">Reset Smoothing*</a>
       {% endif %}
     </p>
     <p>
@@ -192,7 +193,7 @@
         {% if user|is_promember %}
         <a class="button blue small" href="/rowers/workouts-join-select">Glue</a>
         {% else %}
-        <a class="button blue small" href="/rowers/promembership">Glue</a>
+        <a class="button blue small" href="/rowers/promembership">Glue*</a>
         {% endif %}
       </p>
       <p>
@@ -204,7 +205,7 @@
     {% if user|is_promember %}
     <a class="button blue small" href="/rowers/workout/fusion/{{ workout.id }}/">Sensor Fusion</a>
     {% else %}
-      <a class="button blue small" href="/rowers/promembership">Sensor Fusion</a>
+      <a class="button blue small" href="/rowers/promembership">Sensor Fusion*</a>
       {% endif %}
     </p>
     <p>
@@ -216,7 +217,7 @@
     {% if user|is_promember %}
     <a class="button blue small" href="/rowers/workout/{{ workout.id }}/split">Split Workout</a>
     {% else %}
-      <a class="button blue small" href="/rowers/promembership">Split Workout</a>
+      <a class="button blue small" href="/rowers/promembership">Split Workout*</a>
       {% endif %}
     </p>
     <p>

rowers/templates/compatibility.html

@@ -39,7 +39,10 @@
 <li> Concept2 Logbook: Exports stroke by stroke data for erg and OTW rowing</li>
 <li> Strava </li>
 <li> SportTracks</li>
-<li> email (TCX or CSV format)</li></ul></p>
+<li> Runkeeper</li>
+<li> MapMyFitness</li>
+<li> TrainingPeaks</li>
+<li> email (TCX, GPX or CSV format)</li></ul></p>
 </div>
 
     {% endblock content %}

rowers/templates/document_form.html

@@ -141,7 +141,7 @@
     var istcx = false;
   var isgzip = false;
   var size1 = 10485760;
-  var size2 = 1048576;
+  var size2 = 2097152;
   if ((/\.(tcx|TCX)/i).test(f.name)) {
   istcx = true;
   console.log('tcx');

rowers/templates/list_workouts.html

@@ -275,7 +275,11 @@
   </div>    
   {% endif %}
   <div class="grid_2 suffix_1 omega">
+    {% if user|is_promember %}
     <a class="button small gray" href="/rowers/workouts-join-select">Glue Workouts</a>
+    {% else %}
+    <a class="button blue small" href="/rowers/promembership">Glue</a>
+    {% endif %}
   </div>
   <p>&nbsp;</p>
   {% if team %}