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

Merge branch 'feature/redesign2' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2017-04-06 23:14:54 +02:00
parent 6e1268fd31 06aa14d38f
commit b90b5960bd
9 changed files with 111 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
rowers/templates/base.html
View File

@@ -32,53 +32,65 @@
<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' %}
<p><a href="/"><img src="/static/img/logo3.jpg" <p><a href="/"><img src="/static/img/logo7.png"
alt="Rowsandall logo" height="80"></a></p> alt="Rowsandall logo" height="80"></a></p>
{% else %} {% else %}
<p><a href="/"><img src="/static/img/logo3.jpg" <p><a href="/"><img src="/static/img/logo7.png"
alt="Rowsandall logo" height="80"></a></p> alt="Rowsandall logo" height="80"></a></p>
{% endif %} {% endif %}
</div> </div>
<div class="grid_6 omega"> <div class="grid_6 omega">
<div class="grid_1 prefix_2 alpha"> <div class="grid_4 alpha">
<p id="header"> <div class="grid_1 alpha">
<a class="button gray small" href="/rowers/videos">Videos</a></p> <p id="header">
</div> <a class="button gray small" href="/rowers/videos">Videos</a></p>
<div class="grid_2"> </div>
<p id="header"> <div class="grid_2">
<a class="button gray small" href="http://analytics.rowsandall.com/">Rowing Analytics BLOG</a></p> <p id="header">
<a class="button gray small" href="http://analytics.rowsandall.com/">Rowing Analytics BLOG</a></p>
</div>
<div class="grid_1 omega">
<p id="header">
<a class="button gray small" href="/rowers/email">Contact</a>
</p>
</div>
<div class="grid_4 alpha">
<p>Free Data and Analysis. For Rowers. By Rowers.</p>
</div>
</div>
<div class="grid_1">
<div class="grid_1 tooltip">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>
</p>
<span class="tooltiptext">Edit user account, e.g. heart rate zones, power zones, email, teams</span>
{% else %}
<p><a class="button gray small" href="{% url 'login' %}">login</a> </p>
{% endif %}
</div>
<div class="grid_1">
{% if user.is_authenticated %}
<p><a class="button gray small" href="{% url 'logout' %}">logout</a></p>
{% else %}
<p>&nbsp</p>
{% endif %}
</div>
</div> </div>
<div class="grid_1 omega"> <div class="grid_1 omega">
<p id="header"> {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<a class="button gray small" href="/rowers/email">Contact</a> <h6 class="graytext">Pro Member</h6>
</p> {% else %}
</div> <div class="grid_1"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
{% endif %}
</div>
</div> </div>
</div> </div>
<div class="grid_12">
<div class="grid_4 suffix_2 alpha">
<p>Free Data and Analysis. For Rowers. By Rowers.</p>
</div>
<div class="grid_3 prefix_2">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<h6 class="graytext">Pro Member</h6>
{% else %}
<div class="grid_2 prefix_1 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
{% endif %}
</div>
<div class="grid_1 omega">
{% if user.is_authenticated %}
<p><a class="button gray small" href="{% url 'logout' %}">logout</a></p>
{% else %}
<p>&nbsp</p>
{% endif %}
</div>
</div>
<div class="grid_12" omega> <div class="grid_12">
<div class="grid_1 alpha tooltip"> <div class="grid_1 alpha tooltip">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<p><a class="button gray small" href="/rowers/workout/upload/">Upload</a></p> <p><a class="button gray small" href="/rowers/workout/upload/">Upload</a></p>
@@ -107,7 +119,7 @@
<p>&nbsp;</p> <p>&nbsp;</p>
{% endif %} {% endif %}
</div> </div>
<div class="grid_2 tooltip"> <div class="grid_1 tooltip">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<p> <p>
<a class="button gray small" href="/rowers/list-graphs/">Graphs</a> <a class="button gray small" href="/rowers/list-graphs/">Graphs</a>
@@ -156,17 +168,6 @@
<p>&nbsp;</p> <p>&nbsp;</p>
{% endif %} {% endif %}
</div> </div>
<div class="grid_1 prefix_2 omega tooltip">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>
</p>
<span class="tooltiptext">Edit user account, e.g. heart rate zones, power zones, email, teams</span>
{% else %}
<p><a class="button gray small" href="{% url 'login' %}">login</a> </p>
{% endif %}
</div>
</div> </div>

114
rowers/templates/basefront.html
View File

@@ -28,7 +28,7 @@
<style> <style>
.splash { .splash {
background-color: transparent; background-color: transparent;
background-image: url("/static/img/henley.jpg"); background-image: url("/static/img/testpic.png");
-webkit-background-size: cover; -webkit-background-size: cover;
-moz-background-size: cover; -moz-background-size: cover;
-o-background-size: cover; -o-background-size: cover;
@@ -44,59 +44,71 @@
<div class="splash"> <div class="splash">
{% analytical_body_top %} {% analytical_body_top %}
<div class="container_12"> <div class="container_12">
<div clas="grid_12"> <div class="grid_12">
&nbsp; &nbsp;
</div> </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' %}
<p><a href="/"><img src="/static/img/logo3.jpg" <p><a href="/"><img src="/static/img/logo7.png"
alt="Rowsandall logo" height="80"></a></p> alt="Rowsandall logo" height="80"></a></p>
{% else %} {% else %}
<p><a href="/"><img src="/static/img/logo3.jpg" <p><a href="/"><img src="/static/img/logo7.png"
alt="Rowsandall logo" height="80"></a></p> alt="Rowsandall logo" height="80"></a></p>
{% endif %} {% endif %}
</div> </div>
<div class="grid_6 omega"> <div class="grid_6 omega">
<div class="grid_1 prefix_2 alpha"> <div class="grid_4 alpha">
<p id="header"> <div class="grid_1 alpha">
<a class="button gray small" href="/rowers/videos">Videos</a></p> <p id="header">
</div> <a class="button gray small" href="/rowers/videos">Videos</a></p>
<div class="grid_2"> </div>
<p id="header"> <div class="grid_2">
<a class="button gray small" href="http://analytics.rowsandall.com/">Rowing Analytics BLOG</a></p> <p id="header">
<a class="button gray small" href="http://analytics.rowsandall.com/">Rowing Analytics BLOG</a></p>
</div>
<div class="grid_1 omega">
<p id="header">
<a class="button gray small" href="/rowers/email">Contact</a>
</p>
</div>
<div class="grid_4 alpha">
<p>Free Data and Analysis. For Rowers. By Rowers.</p>
</div>
</div>
<div class="grid_1">
<div class="grid_1 tooltip">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>
</p>
<span class="tooltiptext">Edit user account, e.g. heart rate zones, power zones, email, teams</span>
{% else %}
<p><a class="button gray small" href="{% url 'login' %}">login</a> </p>
{% endif %}
</div>
<div class="grid_1">
{% if user.is_authenticated %}
<p><a class="button gray small" href="{% url 'logout' %}">logout</a></p>
{% else %}
<p>&nbsp</p>
{% endif %}
</div>
</div> </div>
<div class="grid_1 omega"> <div class="grid_1 omega">
<p id="header"> {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<a class="button gray small" href="/rowers/email">Contact</a> <h6 class="graytext">Pro Member</h6>
</p> {% else %}
</div> <div class="grid_1"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
{% endif %}
</div>
</div> </div>
</div> </div>
<div class="grid_12">
<div class="grid_4 suffix_2 alpha">
<p>Free Data and Analysis. For Rowers. By Rowers.</p>
</div>
<div class="grid_3 prefix_2">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<h6 class="graytext">Pro Member</h6>
{% else %}
<div class="grid_2 prefix_1 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
{% endif %}
</div>
<div class="grid_1 omega">
{% if user.is_authenticated %}
<p><a class="button gray small" href="{% url 'logout' %}">logout</a></p>
{% else %}
<p>&nbsp</p>
{% endif %}
</div>
</div>
<div class="grid_12" omega> <div class="grid_12">
<div class="grid_1 alpha tooltip"> <div class="grid_1 alpha tooltip">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<p><a class="button gray small" href="/rowers/workout/upload/">Upload</a></p> <p><a class="button gray small" href="/rowers/workout/upload/">Upload</a></p>
@@ -125,7 +137,7 @@
<p>&nbsp;</p> <p>&nbsp;</p>
{% endif %} {% endif %}
</div> </div>
<div class="grid_2 tooltip"> <div class="grid_1 tooltip">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<p> <p>
<a class="button gray small" href="/rowers/list-graphs/">Graphs</a> <a class="button gray small" href="/rowers/list-graphs/">Graphs</a>
@@ -146,7 +158,19 @@
{% endif %} {% endif %}
</div> </div>
<div class="grid_1 tooltip"> <div class="grid_1 tooltip">
{% if user.is_authenticated and user.rower.team.all %} {% if user.is_authenticated and teams %}
<div class="grid_1 alpha dropdown">
<button class="grid_1 alpha button gray small dropbtn">
Teams
</button>
<div class="dropdown-content">
{% for t in teams %}
<a class="button gray small" href="/rowers/list-workouts/team/{{ t.id }}/">{{ t.name }}</a>
{% endfor %}
</div>
</div>
<span class="tooltiptext">See recent workouts for your team</span>
{% elif user.is_authenticated and user.rower.team.all %}
<div class="grid_1 alpha dropdown"> <div class="grid_1 alpha dropdown">
<button class="grid_1 alpha button gray small dropbtn"> <button class="grid_1 alpha button gray small dropbtn">
Teams Teams
@@ -162,17 +186,6 @@
<p>&nbsp;</p> <p>&nbsp;</p>
{% endif %} {% endif %}
</div> </div>
<div class="grid_1 prefix_2 omega tooltip">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>
</p>
<span class="tooltiptext">Edit user account, e.g. heart rate zones, power zones, email, teams</span>
{% else %}
<p><a class="button gray small" href="{% url 'login' %}">login</a> </p>
{% endif %}
</div>
</div> </div>
@@ -238,6 +251,5 @@
</div> </div>
<!-- end container --> <!-- end container -->
{% analytical_body_bottom %} {% analytical_body_bottom %}
</div>
</body> </body>
</html> </html>

BIN
static/img/logo4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 459 KiB

BIN
static/img/logo5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 535 KiB

BIN
static/img/logo6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 616 KiB

BIN
static/img/logo7.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 885 KiB

BIN
static/img/logo7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 KiB

BIN
static/img/logo701.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 754 KiB

BIN
static/img/testpic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 525 KiB