-
-
-
-
-
-
-
- {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
-
- 
-
-
-
-
-
-
- {% if user.is_authenticated %}
-
- Edit user account, e.g. heart rate zones, power zones, email, teams
-
- {% else %}
-
- {% endif %}
-
-
- {% if user.is_authenticated %}
-
- {% else %}
-
- - {% endif %} -
- {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
-
- Pro Member
- {% else %} - - {% endif %} -
-
-
- {% analytical_body_bottom %}
-
-
+{% block content %}
+
+{% endblock %}
diff --git a/rowers/templates/basebase.html b/rowers/templates/basebase.html
new file mode 100644
index 00000000..a97bbb60
--- /dev/null
+++ b/rowers/templates/basebase.html
@@ -0,0 +1,219 @@
+{% load cookielaw_tags %}
+{% load analytical %}
+{% block filters %}
+{% endblock %}
+
+
+
+
+ {% analytical_head_top %}
+ {% if GOOGLE_ANALYTICS_PROPERTY_ID %}
+ {% include "ga.html" %}
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+
- {% if user.is_authenticated %}
-
- Upload CSV, TCX, FIT data files to rowsandall.com
- {% else %}
-
- {% endif %}
-
-
- {% if user.is_authenticated %}
-
- - Import -
- Import workouts from Strava, SportTracks, and C2 logbook - {% else %} -- {% endif %} -
- {% if user.is_authenticated %}
-
- - Workouts -
- See your list of workouts - {% else %} -- {% endif %} -
- {% if user.is_authenticated %}
-
- - Graphs -
- See your most recent charts - {% else %} -- {% endif %} -
- {% if user.is_authenticated %}
-
- - Analysis -
- Analysis of workouts over a period of time - {% else %} -- {% endif %} -
+{% block teams %}
{% if user.is_authenticated and user|has_teams %}
-
+{% endblock %}
-
-
-
- {% block message %}
- {% if message %}
-
- {% endif %}
- {% if successmessage %}
-
- {% endif %}
- {% endblock %}
-
-
- {% load tz %}
-
- {% block content %}{% endblock %}
-
-
-
-
- {% block footer %}
-
-
- {% cookielaw_banner %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {% endblock %}
-
+
+
+ {% analytical_body_bottom %}
+ {% block body_bottom %}{% endblock %}
+
+
diff --git a/rowers/templates/basefront.html b/rowers/templates/basefront.html
index 15017318..9bf96b9c 100644
--- a/rowers/templates/basefront.html
+++ b/rowers/templates/basefront.html
@@ -1,34 +1,12 @@
-{% load cookielaw_tags %}
-{% load analytical %}
-{% load rowerfilters %}
-
-
-
-
- {% analytical_head_top %}
- {% if GOOGLE_ANALYTICS_PROPERTY_ID %}
- {% include "ga.html" %}
- {% endif %}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
+
+
+
+
+
+
+
+
+ {% if user.is_authenticated %}
+
+ Edit user account, e.g. heart rate zones, power zones, email, teams
+
+ {% else %}
+
+ {% endif %}
+
+
+ {% if user.is_authenticated %}
+
+ {% else %}
+
+ + {% endif %} +
+ {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
+
+ Pro Member
+ {% else %} + + {% endif %} +
+
+
+
+
+
+ {% if user.is_authenticated %}
+
+ Upload CSV, TCX, FIT data files to rowsandall.com
+ {% else %}
+
+ {% endif %}
+
+
+ {% if user.is_authenticated %}
+
+ + Import +
+ Import workouts from Strava, SportTracks, and C2 logbook + {% else %} ++ {% endif %} +
+ {% if user.is_authenticated %}
+
+ + Workouts +
+ See your list of workouts + {% else %} ++ {% endif %} +
+ {% if user.is_authenticated %}
+
+ + Graphs +
+ See your most recent charts + {% else %} ++ {% endif %} +
+ {% if user.is_authenticated %}
+
+ + Analysis +
+ Analysis of workouts over a period of time + {% else %} ++ {% endif %} +
+ {% block teams %}
+ {% endblock %}
+
+
+ {% block message %}
+ {% if message %}
+
+ {% endif %}
+ {% if successmessage %}
+
+ {% endif %}
+ {% endblock %}
+
+
+ {% load tz %}
+
+ {% block content %}{% endblock %}
+
+
+
+
+ {% block footer %}
+
+
+ {% cookielaw_banner %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% endblock %}
+
- {% analytical_body_top %}
-
-
-
-
-
-
-
-
-
-
- {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
-
-
-
-
-
-
-
- {% if user.is_authenticated %}
-
- Edit user account, e.g. heart rate zones, power zones, email, teams
-
- {% else %}
-
- {% endif %}
-
-
- {% if user.is_authenticated %}
-
- {% else %}
-
- - {% endif %} -
- {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
-
- Pro Member
- {% else %} - - {% endif %} -
-
- {% if user.is_authenticated %}
-
- Upload CSV, TCX, FIT data files to rowsandall.com
- {% else %}
-
- {% endif %}
-
-
- {% if user.is_authenticated %}
-
- - Import -
- Import workouts from Strava, SportTracks, and C2 logbook - {% else %} -- {% endif %} -
- {% if user.is_authenticated %}
-
- - Workouts -
- See your list of workouts - {% else %} -- {% endif %} -
- {% if user.is_authenticated %}
-
- - Graphs -
- See your most recent charts - {% else %} -- {% endif %} -
- {% if user.is_authenticated %}
-
- - Analysis -
- Analysis of workouts over a period of time - {% else %} -- {% endif %} -
- {% if user.is_authenticated and user|user_teams %}
+
+
+
-
- {% analytical_body_bottom %}
-
-
+{% endblock %}
+
diff --git a/rowers/templates/basenofilters.html b/rowers/templates/basenofilters.html
new file mode 100644
index 00000000..04fad305
--- /dev/null
+++ b/rowers/templates/basenofilters.html
@@ -0,0 +1,26 @@
+{% extends "basebase.html" %}
+{% block filters %}
+ {% load rowerfilters %}
+{% endblock %}
+
+{% block teams %}
+ {% if user.is_authenticated and user.rower.team.all %}
+
+{% endblock %}
+
+{% block teams %}
+ {% if user.is_authenticated and user|has_teams %}
+{% endblock %}
-
-
-
-
Manage Teams
@@ -194,73 +60,11 @@
{% else %}
- {% endif %} -
- {% block message %}
- {% if message %}
-
- {% endif %}
- {% if successmessage %}
-
- {% endif %}
- {% endblock %}
+
+{% block body_bottom %}
-
- {% load tz %}
-
- {% block content %}{% endblock %}
-
-
-
-
- {% block footer %}
-
-
- {% cookielaw_banner %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {% endblock %}
-
+
+
+ See recent workouts for your team
+ {% else %}
+
+ {% for t in user.rower.team.all %}
+ {{ t.name }}
+ {% endfor %}
+
+ + {% endif %} +{% endblock %} + +{% block content %} + +{% endblock %}