From f7795eaf1db1ae0256c4b583eb1adb6c9ebdc5a5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 6 Apr 2017 23:00:01 +0200 Subject: [PATCH] redesign part I base.html --- rowers/templates/base.html | 95 ++++++++++++++++---------------- rowers/templates/basefront.html | 18 +++++- static/img/logo7.jpg | Bin 0 -> 906075 bytes static/img/logo7.png | Bin 0 -> 194528 bytes static/img/logo701.jpg | Bin 0 -> 772350 bytes 5 files changed, 63 insertions(+), 50 deletions(-) create mode 100644 static/img/logo7.jpg create mode 100644 static/img/logo7.png create mode 100644 static/img/logo701.jpg diff --git a/rowers/templates/base.html b/rowers/templates/base.html index 1ae12339..1cc6815c 100644 --- a/rowers/templates/base.html +++ b/rowers/templates/base.html @@ -32,53 +32,65 @@
-
- -
-
- +
+
+ +
+
+ +
+
+ +
+
+

Free Data and Analysis. For Rowers. By Rowers.

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

+ {{ user.first_name }} +

+ Edit user account, e.g. heart rate zones, power zones, email, teams + + {% else %} +

login

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

logout

+ {% else %} +

 

+ {% endif %} +
- -
+ {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} +
Pro Member
+ {% else %} +
Upgrade to Pro
+ {% endif %} +
-
-
-

Free Data and Analysis. For Rowers. By Rowers.

-
-
- {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} -
Pro Member
- {% else %} -
Upgrade to Pro
- {% endif %} -
-
- {% if user.is_authenticated %} -

logout

- - {% else %} -

 

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

Upload

@@ -107,7 +119,7 @@

 

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

Graphs @@ -156,17 +168,6 @@

 

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

- {{ user.first_name }} -

- Edit user account, e.g. heart rate zones, power zones, email, teams - - {% else %} -

login

- {% endif %} -
diff --git a/rowers/templates/basefront.html b/rowers/templates/basefront.html index b6fe98fa..8a73c255 100644 --- a/rowers/templates/basefront.html +++ b/rowers/templates/basefront.html @@ -50,10 +50,10 @@
@@ -146,7 +146,19 @@ {% endif %}
- {% if user.is_authenticated and user.rower.team.all %} + {% if user.is_authenticated and teams %} +
+ +
+ {% for t in teams %} + {{ t.name }} + {% endfor %} +
+
+ See recent workouts for your team + {% elif user.is_authenticated and user.rower.team.all %}