From 7d5f073ecdc3ad7b6387abcea82cc3ef7bd20fb2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 22 May 2019 17:08:34 +0200 Subject: [PATCH 1/7] added test --- rowers/tests/test_analysis.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rowers/tests/test_analysis.py b/rowers/tests/test_analysis.py index c18eb097..562ffcf7 100644 --- a/rowers/tests/test_analysis.py +++ b/rowers/tests/test_analysis.py @@ -697,9 +697,10 @@ class WorkoutCompareTestNew(TestCase): 'plotfield':'spm', 'yparam':'pace', 'groupby':'spm', - 'palette':'monochrome_blue' + 'palette':'monochrome_blue', 'xaxis':'time', 'yaxis1':'power', + 'yaxis2':'hr', 'startdate':startdate, 'enddate':enddate, 'plottype':'scatter', From 1209f38e73d858e57e5c12632c7a5b69af5df463 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 28 May 2019 08:55:18 +0200 Subject: [PATCH 2/7] landing page sign up sign fixed --- rowers/templates/landingpage.html | 47 ++++++++++++++----------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/rowers/templates/landingpage.html b/rowers/templates/landingpage.html index 2331f76b..e7db5446 100644 --- a/rowers/templates/landingpage.html +++ b/rowers/templates/landingpage.html @@ -80,12 +80,14 @@ } .register { - position: absolute; - opacity: 0.65; - top: 40%; - left: 0%; + position: fixed; + top: 65px; + right: 0px; text-align: center; - color: #000; + color: #fff; + z-index: 1; + padding: 10px; + background: #1c75bc; } @@ -117,13 +119,6 @@ letter-spacing: 10px; } - .register .border { - background-color: #aaa; - color: #000; - padding: 18px; - font-size: 18px; - } - h3 { letter-spacing: 5px; text-transform: uppercase; @@ -159,19 +154,18 @@ + {% if not user.is_authenticated %} +
+

SIGN UP

+

I am a rower

+

I am a rowing coach

+
+ {% endif %}
FREE DATA AND ANALYSIS. FOR ROWERS. BY ROWERS.
- {% if not user.is_authenticated %} -
-
-

SIGN UP

-

Sign-up form goes here

-
-
- {% endif %}
@@ -196,7 +190,7 @@
- + For on-the-water and indoor rowing
@@ -254,18 +248,19 @@ using my NK empower oarlock for about a month now, and I‘m really
- Follow us on + + Follow us on - +   - +   - +   - +  
From 36e522c0fe8ff0ffe92c61896599e62704ad44d4 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 28 May 2019 13:06:57 +0200 Subject: [PATCH 3/7] landingpage tests --- rowers/templates/landingpage.html | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/rowers/templates/landingpage.html b/rowers/templates/landingpage.html index e7db5446..fc85edb5 100644 --- a/rowers/templates/landingpage.html +++ b/rowers/templates/landingpage.html @@ -25,13 +25,13 @@ {% block image_src %}{% endblock %} - + {% analytical_head_bottom %} @@ -139,11 +143,11 @@
{% if not user.is_authenticated %} {% else %} {% endif %}
- + + {% if not user.is_authenticated %}

SIGN UP

@@ -168,14 +173,9 @@
-
-

Free Data and Analysis. For Rowers. By Rowers.

-

- There is no shortage of training advice for rowers. -

-

- The best research has found that works best for one rower might not work for another. So, what can you do? -

+ +
+

Free Data and Analysis. For Rowers. By Rowers.

The best way to improve racing performance is to assess where you are, set objectives, make a plan, track progress, and adjust based on the results you are getting. @@ -183,7 +183,7 @@

This site is more than a rowing log book. It enables you and your coach to plan and track all your rowing, indoor and on the water, with a large number - of devices and apps. On top of htat, it offers the best in rowing + of devices and apps. On top of that, it offers the best in rowing data analytics. Train smart.

@@ -195,7 +195,7 @@
- +

What we offer

@@ -232,8 +232,8 @@
- -
+ +

Testimonials

"Check out @rowsandall as well - his site is really useful for dissecting rowing data, especially if you eventually get power/angles on the water - check out the articles in the blog - if you’re logging your ergs on C2logbook you can have a play dissecting the data" - Tom Carter

@@ -266,7 +266,7 @@ using my NK empower oarlock for about a month now, and I‘m really
-