diff --git a/rowers/templates/base.html b/rowers/templates/base.html index bcd01b81..42221f13 100644 --- a/rowers/templates/base.html +++ b/rowers/templates/base.html @@ -26,18 +26,18 @@ {% analytical_body_top %}
- -
-
-
+
+ +
+
@@ -47,29 +47,21 @@
+ Contact +

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

Password Change

- {% else %} -

Forgot Password?

- {% 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
+
Upgrade to Pro
{% endif %}
@@ -83,7 +75,7 @@
-
+
{% if user.is_authenticated %}

Upload

@@ -149,7 +141,7 @@

 

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

{{ user.first_name }} diff --git a/rowers/templates/basefront.html b/rowers/templates/basefront.html new file mode 100644 index 00000000..8fc56eec --- /dev/null +++ b/rowers/templates/basefront.html @@ -0,0 +1,240 @@ +{% load cookielaw_tags %} +{% load analytical %} + + + + + {% analytical_head_top %} + {% if GOOGLE_ANALYTICS_PROPERTY_ID %} + {% include "ga.html" %} + {% endif %} + + + + + + + + Rowsandall + + + + + {% block meta %} {% endblock %} + {% analytical_head_bottom %} + + + + + +

+ {% analytical_body_top %} +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+

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

+ Upload CSV, TCX, FIT data files to rowsandall.com + {% else %} +

Register (free)

+ {% 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.rower.team.all %} +
+ +
+ {% for t in user.rower.team.all %} + {{ t.name }} + {% endfor %} +
+
+ See recent workouts for your team + {% else %} +

 

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

+ {{ user.first_name }} +

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

login

+ {% endif %} +
+
+ + +
+
+ {% block message %} + {% if message %} +

+ {{ message }} +

+ {% endif %} + {% if successmessage %} +

+ {{ successmessage }} +

+ {% endif %} + {% endblock %} +
+
+ {% load tz %} + + {% block content %}{% endblock %} +
+
+ +
+ {% block footer %} + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ {% endblock %} +
+ {% cookielaw_banner %} +
+ + {% analytical_body_bottom %} +
+ + diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html index 1532f44d..2e297706 100644 --- a/rowers/templates/frontpage.html +++ b/rowers/templates/frontpage.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "basefront.html" %} {% load staticfiles %} {% load rowerfilters %} @@ -6,11 +6,6 @@ {% block content %} -
-

-Henley Regatta, Henley-on-Thames, England, 1890s

-
-

Compatible with: @@ -27,4 +22,5 @@

+ {% endblock %} diff --git a/rowers/templates/registration/login.html b/rowers/templates/registration/login.html index 41550cc7..a98484cb 100644 --- a/rowers/templates/registration/login.html +++ b/rowers/templates/registration/login.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "basefront.html" %} {% block content %} diff --git a/rowers/templates/rower_form.html b/rowers/templates/rower_form.html index c17124ec..c495cb23 100644 --- a/rowers/templates/rower_form.html +++ b/rowers/templates/rower_form.html @@ -80,6 +80,14 @@

Account Information

+
+
+

+ Password Change +

+
+
+

{% if userform.errors %}

Please correct the error{{ form.errors|pluralize }} below. @@ -113,6 +121,8 @@

+ +

diff --git a/static/css/960.css b/static/css/960.css index 260fa152..b69fd3b3 100644 --- a/static/css/960.css +++ b/static/css/960.css @@ -650,4 +650,4 @@ body { .container_12, .container_16 { zoom: 1; -} \ No newline at end of file +} diff --git a/static/css/960_12_col.css b/static/css/960_12_col.css index 48e86ee8..4166289c 100644 --- a/static/css/960_12_col.css +++ b/static/css/960_12_col.css @@ -14,7 +14,7 @@ */ body { - min-width: 960px; + min-width: 960px; } /* `Container @@ -354,4 +354,4 @@ body { .clearfix, .container_12 { zoom: 1; -} \ No newline at end of file +} diff --git a/static/css/demo.css b/static/css/demo.css index d689be41..b95cd13d 100644 --- a/static/css/demo.css +++ b/static/css/demo.css @@ -52,4 +52,4 @@ p { .container_24 { background-image: url(../img/24_col.gif); -} \ No newline at end of file +} diff --git a/static/css/rowsandall.css b/static/css/rowsandall.css index f5f9af70..69a13449 100644 --- a/static/css/rowsandall.css +++ b/static/css/rowsandall.css @@ -5,13 +5,14 @@ html { } body { - background: #edc; +/* background: #edc; */ color: #333; font-size: 1.2em; height: auto; padding-bottom: 20px; } + a { /* color: #fff; */ text-decoration: none; diff --git a/static/img/henley.jpg b/static/img/henley.jpg new file mode 100644 index 00000000..f0d42dc6 Binary files /dev/null and b/static/img/henley.jpg differ