From e0ec5d62ddab444bd649d237e72540b6f02cc49c Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 2 Nov 2018 18:48:43 +0100
Subject: [PATCH 1/2] trial bug fixed

---
 rowers/templates/menu_analytics.html | 2 +-
 rowers/templates/menu_help.html      | 2 +-
 rowers/templates/menu_plan.html      | 2 +-
 rowers/templates/menu_profile.html   | 2 +-
 rowers/templates/menu_racing.html    | 2 +-
 rowers/templates/menu_teams.html     | 2 +-
 rowers/templates/menu_workout.html   | 2 +-
 rowers/templates/menu_workouts.html  | 2 +-
 rowers/utils.py                      | 4 +++-
 static/css/styles2.css               | 8 ++++++++
 10 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html
index f9c50cda..1d018b69 100644
--- a/rowers/templates/menu_analytics.html
+++ b/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>
diff --git a/rowers/templates/menu_help.html b/rowers/templates/menu_help.html
index 490175d7..8e33ced9 100644
--- a/rowers/templates/menu_help.html
+++ b/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">
diff --git a/rowers/templates/menu_plan.html b/rowers/templates/menu_plan.html
index 008567cf..e0451c41 100644
--- a/rowers/templates/menu_plan.html
+++ b/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">
diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html
index 8fda9f4a..d3dd90b0 100644
--- a/rowers/templates/menu_profile.html
+++ b/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/">
diff --git a/rowers/templates/menu_racing.html b/rowers/templates/menu_racing.html
index 9eb8e11f..6aabdaff 100644
--- a/rowers/templates/menu_racing.html
+++ b/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">
diff --git a/rowers/templates/menu_teams.html b/rowers/templates/menu_teams.html
index d7006e7d..dda6ce6d 100644
--- a/rowers/templates/menu_teams.html
+++ b/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">
diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html
index 937218e7..4d8a5b6f 100644
--- a/rowers/templates/menu_workout.html
+++ b/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>
diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html
index b4af3e51..16f5345f 100644
--- a/rowers/templates/menu_workouts.html
+++ b/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>
diff --git a/rowers/utils.py b/rowers/utils.py
index c7f02eb1..5a0abf2c 100644
--- a/rowers/utils.py
+++ b/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
                                                                                      
diff --git a/static/css/styles2.css b/static/css/styles2.css
index 13cbbc5f..96d7bb23 100644
--- a/static/css/styles2.css
+++ b/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;

From 5c7543bf5eff704a0d67371d57931c79cdddfe4a Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 2 Nov 2018 19:01:59 +0100
Subject: [PATCH 2/2] small change in confirmation email

---
 rowers/templates/registeremail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rowers/templates/registeremail.html b/rowers/templates/registeremail.html
index b9ac171c..d427b5a7 100644
--- a/rowers/templates/registeremail.html
+++ b/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.