From c05dac188b8412cb1d826369030d6fca3e7ce71a Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 10 Apr 2018 08:41:20 +0200
Subject: [PATCH] fine tuning trial messages and planmembership page

---
 rowers/templates/planmembership.html | 15 ++++++++-------
 templates/basebase.html              | 12 +++++++++---
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/rowers/templates/planmembership.html b/rowers/templates/planmembership.html
index 5a9415d3..5d9c9c3a 100644
--- a/rowers/templates/planmembership.html
+++ b/rowers/templates/planmembership.html
@@ -6,11 +6,8 @@
 <div class="grid_6 alpha">
   <h2>Coach and Self-Coach Membership</h2>
 
-  <p>You have arrived at this page, because you tried to create a
-    training plan for yourself.</p>
-
-  <p>This option is restricted to rowers on our "Self-Coach" plan or
-    coaches on our "Coach" plan.</p>
+  <p>Rowsandall.com's Training Planning functionality
+    is part of the paid "Self-Coach" and "Coach" plans.</p>
 
   <p>On the "Self-Coach" plan, you can plan your own sessions.</p>
   
@@ -32,7 +29,8 @@
 <div class="grid_6 omega">
   <h2>What training planning functionality do we offer?</h2>
 
-  <p>Over the spring of 2018, we will gradually expand this functionality.
+  <p>Over the spring of 2018, we are rolling out the first phases
+    of Training Planning functionality.
     Our current roadmap is to deploy the following and more:</li>
   
   <p>
@@ -45,12 +43,15 @@
       <li><b>Implemented:</b>Track your teams performance against plan. See how well each
         of your team members adhere to their (team or personalized) plan.</li>
       <li><b>Implemented:</b>See test outcomes ranked by performance.</li>
-      <li><b>Implemented:</b>Attach courses to your OTW tests. This advanced functionality
+      <li><b>Implemented:</b>Attach courses to your OTW tests.
+        This advanced functionality
         allows you, for example, to assign "Row the 6km from bridge A to
         bridge B on Saturday" to your team members. The resulting workout
         tracks will be evaluated against the course, and you will receive
         a results table for the net time spent between the start and finish
         points on the course. It's like a mini head race.
+      <li>Define your own macro, meso and microcycle start and end dates</li>
+      <li>More to come ... </li>
     </ul>
   </p>
   
diff --git a/templates/basebase.html b/templates/basebase.html
index 4a7c44a2..47d5bf19 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -158,12 +158,12 @@
             {% elif user.rower.rowerplan == 'plan' %}
 	    <h6 class="graytext">Self-Coach</h6>
 	    {% else %}
-	    <div class="grid_1"><p><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></p></div>
+	    <div class="grid_1"><p><a class="button green small" href="/rowers/promembership"><b>Upgrade</b></a></p></div>
 	    {% endif %}
             {% if user.rower.rowerplan == 'basic' and user.rower.protrialexpires|date_dif == 1 %}
             <div class="grid_1"><p><a class="button green small" href="/rowers/promembership">Start Free Pro trial</a></p></div>
             {% elif user.rower.rowerplan == 'basic' and user.rower.plantrialexpires|date_dif == 1 %}
-            <div class="grid_1"><p><a class="button green small" href="/rowers/promembership">Start Free Pro trial</a></p></div>
+            <div class="grid_1"><p><a class="button green small" href="/rowers/promembership">Start Free Plan trial</a></p></div>
             {% endif %}
           </div>
         </div>
@@ -245,8 +245,14 @@
         </p>
         {% endif %}
         {% if user.rower.protrialexpires and user.rower.protrialexpires|is_future_date %}
+        {% if user.rower.plantrialexpires %}
         <p class="successmessage">
-          {{ user.rower.protrialexpires|date_dif|ddays }} days left of your trial
+          {{ user.rower.protrialexpires|date_dif|ddays }} days left of your Self-Coach trial           - Would you like to <a href="/rowers/planmembership">upgrade now?</a>
+
+          {% else %}
+        <p class="successmessage">
+          {{ user.rower.protrialexpires|date_dif|ddays }} days left of your Pro trial           - Would you like to <a href="/rowers/promembership">upgrade now?</a>
+          {% endif %}
         </p>
         {% endif %}
         {% if user.rower.emailbounced %}