Merge branch 'release/v8.39'

rowers/templates/menu_analytics.html

@@ -1,6 +1,6 @@
 {% load staticfiles %}
 {% load rowerfilters %}
-<h1>Analysis</h1>
+<h1><a href="/rowers/analysis">Analysis</a></h1>
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="fitness">
     <input type="checkbox" name="group-fitness" id="group-fitness" checked>

rowers/templates/menu_help.html

@@ -1,4 +1,4 @@
-<h1>Help</h1>
+<h1><a href="/rowers/help">Help</a></h1>
 <ul class="cd-accordion-menu animated">
   <li id="gettingstarted">
     <a href="/rowers/help">

rowers/templates/menu_plan.html

@@ -1,6 +1,6 @@
 {% load staticfiles %}
 {% load rowerfilters %}
-<h1>Plan</h1>
+<h1><a href="/rowers/sessions">Plan</a></h1>
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="plans">
     <input type="checkbox" name="group-plans" id="group-plans">

rowers/templates/menu_profile.html

@@ -1,6 +1,6 @@
 {% load staticfiles %}
 {% load rowerfilters %}
-<h1>Profile</h1>
+<h1><a href="/rowers/me/edit">Profile</a></h1>
 <ul class="cd-accordion-menu animated">
   <li id="manage-prefs">
     <a href="/rowers/me/preferences/">

rowers/templates/menu_racing.html

@@ -1,4 +1,4 @@
-<h1>Racing</h1>
+<h1><a href="/rowers/virtualevents">Racing</a></h1>
 <ul class="cd-accordion-menu animated">
   <li id="races-list">
     <a href="/rowers/virtualevents">

rowers/templates/menu_teams.html

@@ -1,6 +1,6 @@
 {% load staticfiles %}
 {% load rowerfilters %}
-<h1>Teams</h1>
+<h1><a href="/rowers/me/teams">Teams</a></h1>
 
 <ul class="cd-accordion-menu animated">
   <li id="manage">

rowers/templates/menu_workout.html

@@ -1,5 +1,5 @@
 {% load rowerfilters %}
-<h1>Workout</h1>
+<h1><a href="/rowers/workout/{{ workout.id }}/">Workout</a></h1>
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="workout">
     <input type="checkbox" name="group-workout" id="group-workout" checked>

rowers/templates/menu_workouts.html

@@ -1,6 +1,6 @@
 {% load staticfiles %}
 {% load rowerfilters %}
-<h1>Workouts</h1>
+<h1><a href="/rowers/list-workouts">Workouts</a></h1>
 <ul class="cd-accordion-menu animated">
   <li id="workouts-list">
     <a href="/rowers/list-workouts"><i class="fas fa-clipboard-list fa-fw"></i>&nbsp;Workouts List</a>

rowers/templates/registeremail.html

@@ -43,7 +43,7 @@
     </p>
 
     <p>
-      Oh, one more thing. The site is currently in beta and is
+      Oh, one more thing. The site is
       developing fast. Bear with us. Don't hesitate to
       contact me at info@rowsandall.com if anything is broken
       or doesn't seem to work as advertised.

rowers/utils.py

@@ -385,7 +385,9 @@ def isprorower(r):
     result = False
     result = r.rowerplan in ['pro','coach','plan']
     if not result and r.protrialexpires:
-        result = r.rowerplan is 'basic' and r.protrialexpires >= datetime.date.today()
+        result = r.rowerplan == 'basic' and r.protrialexpires >= datetime.date.today()
+        print r.rowerplan,r.protrialexpires,datetime.date.today(),result
+        print r.protrialexpires >= datetime.date.today()
 
     return result
                                                                                      

static/css/styles2.css

@@ -79,6 +79,14 @@
         padding: 15px;
     }
 
+    aside h1 a {
+        font-weight: bold;
+        text-align: left;
+        font-size: 1.0em;
+        color: #dddddd;
+    }
+
+
     aside ul label,
     aside ul a {
         padding-left: 15px;