From a21a81204ddf6d0ff2659d3c9541ffc615ef2945 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 17 Sep 2018 15:57:32 +0200 Subject: [PATCH] new analysis menu --- rowers/templates/analysis.html | 42 +++++++++++++++++----------------- templates/analysismenu.html | 36 +++++++++++++++++++++++++++++ templates/basebase.html | 7 ++---- 3 files changed, 59 insertions(+), 26 deletions(-) create mode 100644 templates/analysismenu.html diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html index 56eb39e2..f91d3a64 100644 --- a/rowers/templates/analysis.html +++ b/rowers/templates/analysis.html @@ -13,27 +13,27 @@

Basic

-
-

- Ranking Pieces

-

Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.

-
-
-

- Stroke Analysis -

-

- Plot all strokes in a date range and analyze several parameters (Power, Pace, SPM, Heart Rate). -

-
-
-

- Analysis Feature 3 -

-

- Reserved for future functionality. -

-
+
+

+ Ranking Pieces

+

Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.

+
+
+

+ Stroke Analysis +

+

+ Plot all strokes in a date range and analyze several parameters (Power, Pace, SPM, Heart Rate). +

+
+
+

+ Analysis Feature 3 +

+

+ Reserved for future functionality. +

+
diff --git a/templates/analysismenu.html b/templates/analysismenu.html new file mode 100644 index 00000000..becf84f7 --- /dev/null +++ b/templates/analysismenu.html @@ -0,0 +1,36 @@ +{% load staticfiles %} +{% load rowerfilters %} +Analysis of workouts over a period of time + +
+ Analysis + Ranking Pieces + Ranking Pieces 2.0 + Stroke Analysis + {% if user|is_promember %} + Power Histogram + Statistics + Box Chart + OTW Critical Power + OTE Critical Power + Multi Compare + Trend Flex + Power Progress + {% else %} + Power Histogram + Statistics + Box Chart + OTW Critical Power + OTE Critical Power + Multi Compare + Trend Flex + Power Progress + {% endif %} + {% if user|is_planmember %} + The Labs + {% else %} + The Labs + {% endif %} +
+ + diff --git a/templates/basebase.html b/templates/basebase.html index e3a1b755..b8d24da6 100644 --- a/templates/basebase.html +++ b/templates/basebase.html @@ -216,12 +216,9 @@

 

{% endif %}
-
+
{% if user.is_authenticated %} -

- Analysis -

- Analysis of workouts over a period of time + {% include "analysismenu.html" %} {% else %}

 

{% endif %}