sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

updated layout

Browse Source
This commit is contained in:
Sander Roosendaal
2017-04-05 10:51:54 +02:00
parent f76e3efa32
commit 6366c89911
6 changed files with 65 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/templates/base.html
View File

@@ -26,6 +26,9 @@
<body> <body>
{% analytical_body_top %} {% analytical_body_top %}
<div class="container_12"> <div class="container_12">
<div class="grid_12">
&nbsp;
</div>
<div class="grid_12"> <div class="grid_12">
<div id="logo" class="grid_6 alpha"> <div id="logo" class="grid_6 alpha">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
@@ -59,7 +62,7 @@
</div> </div>
<div class="grid_3 prefix_2"> <div class="grid_3 prefix_2">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<h6>Pro Member</h6> <h6 class="graytext">Pro Member</h6>
{% else %} {% else %}
<div class="grid_2 prefix_1 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div> <div class="grid_2 prefix_1 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
{% endif %} {% endif %}

5
rowers/templates/basefront.html
View File

@@ -44,6 +44,9 @@
<div class="splash"> <div class="splash">
{% analytical_body_top %} {% analytical_body_top %}
<div class="container_12"> <div class="container_12">
<div clas="grid_12">
&nbsp;
</div>
<div class="grid_12"> <div class="grid_12">
<div id="logo" class="grid_6 alpha"> <div id="logo" class="grid_6 alpha">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
@@ -77,7 +80,7 @@
</div> </div>
<div class="grid_3 prefix_2"> <div class="grid_3 prefix_2">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<h6>Pro Member</h6> <h6 class="graytext">Pro Member</h6>
{% else %} {% else %}
<div class="grid_2 prefix_1 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div> <div class="grid_2 prefix_1 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
{% endif %} {% endif %}

24
rowers/templates/list_workouts.html
View File

@@ -27,7 +27,7 @@
</table> </table>
{% csrf_token %} {% csrf_token %}
</div> </div>
<div class="grid_2 suffix_6 omega"> <div class="grid_2 suffix_6 alpha">
<input name='daterange' class="button green" type="submit" value="Submit"> </form> <input name='daterange' class="button green" type="submit" value="Submit"> </form>
</div> </div>
@@ -42,10 +42,10 @@
{% endif %} {% endif %}
{% if workouts %} {% if workouts %}
<table width="100%" class="listtable"> <table width="100%" class="listtable shortpadded">
<thead> <thead>
<tr> <tr>
<th> Date</th> <th style="width:80px"> Date</th>
<th> Time</th> <th> Time</th>
<th> Name</th> <th> Name</th>
<th> Type</th> <th> Type</th>
@@ -54,8 +54,8 @@
<th> Avg HR </th> <th> Avg HR </th>
<th> Max HR </th> <th> Max HR </th>
{% if not team %} {% if not team %}
<th> Delete</th> <th> &nbsp;</th>
<th> Export</th> <th> &nbsp;</th>
{% else %} {% else %}
<th colspan="2"> <th colspan="2">
Owner Owner
@@ -89,17 +89,17 @@
<td> {{ workout.maxhr }} </td> <td> {{ workout.maxhr }} </td>
{% if not team %} {% if not team %}
<td> <td>
<a class="button red small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete <a class="small" href="/rowers/workout/{{ workout.id }}/export">Export</a>
</td>
<td>
<a class="button blue small" href="/rowers/workout/{{ workout.id }}/export">Export</a>
</td> </td>
{% else %} {% else %}
<td colspan="2"> <td colspan="2">
{{ workout.user.user.first_name }} {{ workout.user.user.last_name }} {{ workout.user.user.first_name }} {{ workout.user.user.last_name }}
</td> </td>
{% endif %} {% endif %}
<td> <a class="button blue small" href="/rowers/workout/{{ workout.id }}/flexchart">Flex</a> </td> <td> <a class="small" href="/rowers/workout/{{ workout.id }}/flexchart">Flex</a> </td>
<td>
<a class="small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete
</td>
</tr> </tr>
@@ -116,7 +116,9 @@
{% if team %} {% if team %}
<div class="grid_4" id="teambuttons"> <div class="grid_4" id="teambuttons">
<div class="grid_3 alpha"> <div class="grid_3 alpha">
<a class="button gray small" href="/rowers/team-compare-select/team/{{ team.id }}/">Multi Workout Compare</a> <p>
&nbsp;
</p>
</div> </div>
</div> </div>
{% endif %} {% endif %}

4
rowers/templates/team_compare_select.html
View File

@@ -7,8 +7,8 @@
{% block content %} {% block content %}
<div class="grid_12"> <div class="grid_12 alpha">
<div class="grid_8 suffix_4"> <div class="grid_8 suffix_4 alpha">
{% include "teambuttons.html" with teamid=team.id %} {% include "teambuttons.html" with teamid=team.id %}
</div> </div>
</div> </div>

12
rowers/templates/teambuttons.html
View File

@@ -1,9 +1,15 @@
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<a class="button gray small" href="/rowers/list-workouts/team/{{ teamid }}/">Team Workouts</a> <p>
<a class="button gray small" href="/rowers/list-workouts/team/{{ teamid }}/">Team Workouts</a>
</p>
</div> </div>
<div class="grid_2"> <div class="grid_2">
<a class="button gray small" href="/rowers/team-compare-select/team/{{ teamid }}/">Multi Compare</a> <p>
<a class="button gray small" href="/rowers/team-compare-select/team/{{ teamid }}/">Multi Compare</a>
</p>
</div> </div>
<div class="grid_2 suffix_2 omega"> <div class="grid_2 suffix_2 omega">
<p>
<a class="button gray small" href="/rowers/team/{{ teamid }}/">Team Page</a> <a class="button gray small" href="/rowers/team/{{ teamid }}/">Team Page</a>
</p>
</div> </div>

53
static/css/rowsandall.css
View File

@@ -59,6 +59,9 @@ th {
.listtable thead th { .listtable thead th {
font-weight: bold; font-weight: bold;
} }
.shortpadded td { padding: 3px 3px }
.paddedtable td { padding: 1px 20px } .paddedtable td { padding: 1px 20px }
.cortable { .cortable {
@@ -156,6 +159,11 @@ th.rotate > div > span {
text-align: center; text-align: center;
} }
.transparentbutton {
padding: 1px;
text-align: center;
}
.tooltip { .tooltip {
position: relative; position: relative;
display: inline-block; display: inline-block;
@@ -212,10 +220,10 @@ th.rotate > div > span {
/* border-radius: .5em; */ /* border-radius: .5em; */
/* -moz-border-radius: .5em; */ /* -moz-border-radius: .5em; */
/* -webkit-border-radius: .5em; */ /* -webkit-border-radius: .5em; */
-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /* -box-shadow: 0 1px 3px rgba(0,0,0,0.5); */
-moz-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); /* -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /*
text-shadow: 0 -1px 1px rgba(0,0,0,0.25); /* text-shadow: 0 -1px 1px rgba(0,0,0,0.25); */
text-align: center; text-align: center;
} }
@@ -230,10 +238,10 @@ th.rotate > div > span {
border-radius: .5em; border-radius: .5em;
-moz-border-radius: .5em; -moz-border-radius: .5em;
-webkit-border-radius: .5em; -webkit-border-radius: .5em;
-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /* -box-shadow: 0 1px 3px rgba(0,0,0,0.5); */
-moz-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); /* -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); */
text-shadow: 0 -1px 1px rgba(0,0,0,0.25); /* text-shadow: 0 -1px 1px rgba(0,0,0,0.25); */
text-align: center; text-align: center;
} }
@@ -277,15 +285,15 @@ a.button {
} }
/* gray */ /* gray */
.gray { .blue {
color: #e9e9e9; color: #e9e9e9;
border: solid 1px #555; border: solid 1px #555;
background: #6e6e6e; background: #6e6e6e;
} }
.gray:hover { .blue:hover {
background: #616161; background: #616161;
} }
.gray:active { .blue:active {
color: #afafaf; color: #afafaf;
} }
@@ -329,16 +337,21 @@ a.button {
} }
/* blue */ /* blue */
.blue { .graytext {
color: #d9eef7; color: #27aae2;
border: solid 1px #0076a3;
background: #0095cd;
} }
.blue:hover {
background: #007ead; .gray {
color: #fae7e9;
border: solid 1px #27aae2;
background: #27aae2;
} }
.blue:active { .gray:hover {
color: #80bed6; background: #1c74bb;
border: solid 1px #27aae2;
}
.gray:active {
color: #ffffff;
} }
/* rosy */ /* rosy */
@@ -426,7 +439,7 @@ a.button {
display: none; display: none;
position: absolute; position: absolute;
min-width: 160px; 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; z-index: 999;
} }