diff --git a/rowers/templates/base.html b/rowers/templates/base.html index 42221f13..1783af5b 100644 --- a/rowers/templates/base.html +++ b/rowers/templates/base.html @@ -26,6 +26,9 @@ {% analytical_body_top %}
+
+   +
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} -
Pro Member
+
Pro Member
{% else %}
Upgrade to Pro
{% endif %} diff --git a/rowers/templates/basefront.html b/rowers/templates/basefront.html index 8fc56eec..ef643ee1 100644 --- a/rowers/templates/basefront.html +++ b/rowers/templates/basefront.html @@ -44,6 +44,9 @@
{% analytical_body_top %}
+
+   +
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} -
Pro Member
+
Pro Member
{% else %}
Upgrade to Pro
{% endif %} diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index b3b37262..9073b53a 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -27,7 +27,7 @@ {% csrf_token %}
-
+
@@ -42,10 +42,10 @@ {% endif %} {% if workouts %} - +
- + @@ -54,8 +54,8 @@ {% if not team %} - - + + {% else %} {% if not team %} - {% else %} {% endif %} - + + @@ -116,7 +116,9 @@ {% if team %} {% endif %} diff --git a/rowers/templates/team_compare_select.html b/rowers/templates/team_compare_select.html index c52bcb1f..162a36ee 100644 --- a/rowers/templates/team_compare_select.html +++ b/rowers/templates/team_compare_select.html @@ -7,8 +7,8 @@ {% block content %} -
-
+
+
{% include "teambuttons.html" with teamid=team.id %}
diff --git a/rowers/templates/teambuttons.html b/rowers/templates/teambuttons.html index b91e27c7..6fa2c663 100644 --- a/rowers/templates/teambuttons.html +++ b/rowers/templates/teambuttons.html @@ -1,9 +1,15 @@
- Team Workouts +

+ Team Workouts +

- Multi Compare +

+ Multi Compare +

-
+
+

Team Page +

diff --git a/static/css/rowsandall.css b/static/css/rowsandall.css index 69a13449..d4befeec 100644 --- a/static/css/rowsandall.css +++ b/static/css/rowsandall.css @@ -59,6 +59,9 @@ th { .listtable thead th { font-weight: bold; } + +.shortpadded td { padding: 3px 3px } + .paddedtable td { padding: 1px 20px } .cortable { @@ -156,6 +159,11 @@ th.rotate > div > span { text-align: center; } +.transparentbutton { + padding: 1px; + text-align: center; +} + .tooltip { position: relative; display: inline-block; @@ -212,10 +220,10 @@ th.rotate > div > span { /* border-radius: .5em; */ /* -moz-border-radius: .5em; */ /* -webkit-border-radius: .5em; */ - -box-shadow: 0 1px 3px rgba(0,0,0,0.5); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); - text-shadow: 0 -1px 1px rgba(0,0,0,0.25); +/* -box-shadow: 0 1px 3px rgba(0,0,0,0.5); */ +/* -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); */ +/* -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /* +/* text-shadow: 0 -1px 1px rgba(0,0,0,0.25); */ text-align: center; } @@ -230,10 +238,10 @@ th.rotate > div > span { border-radius: .5em; -moz-border-radius: .5em; -webkit-border-radius: .5em; - -box-shadow: 0 1px 3px rgba(0,0,0,0.5); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); - text-shadow: 0 -1px 1px rgba(0,0,0,0.25); +/* -box-shadow: 0 1px 3px rgba(0,0,0,0.5); */ +/* -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); */ +/* -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); */ +/* text-shadow: 0 -1px 1px rgba(0,0,0,0.25); */ text-align: center; } @@ -277,15 +285,15 @@ a.button { } /* gray */ -.gray { +.blue { color: #e9e9e9; border: solid 1px #555; background: #6e6e6e; } -.gray:hover { +.blue:hover { background: #616161; } -.gray:active { +.blue:active { color: #afafaf; } @@ -329,16 +337,21 @@ a.button { } /* blue */ -.blue { - color: #d9eef7; - border: solid 1px #0076a3; - background: #0095cd; +.graytext { + color: #27aae2; } -.blue:hover { - background: #007ead; + +.gray { + color: #fae7e9; + border: solid 1px #27aae2; + background: #27aae2; } -.blue:active { - color: #80bed6; +.gray:hover { + background: #1c74bb; + border: solid 1px #27aae2; +} +.gray:active { + color: #ffffff; } /* rosy */ @@ -426,7 +439,7 @@ a.button { display: none; position: absolute; min-width: 160px; - box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); +/* box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); */ z-index: 999; }
Date Date Time Name Type Avg HR Max HR Delete Export     Owner @@ -89,17 +89,17 @@ {{ workout.maxhr }} - Delete - - Export + Export {{ workout.user.user.first_name }} {{ workout.user.user.last_name }} Flex Flex + Delete +