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

Merge branch 'release/v9.96'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-28 20:35:27 +02:00
parent e444449811 59d8f4dc18
commit 96b2da32e8
8 changed files with 227 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
rowers/templates/freecoach_registration_form.html
View File

@@ -10,32 +10,6 @@
<li class="grid_4"> <li class="grid_4">
<h1>New Coach Registration (free Coach Plan)</h1> <h1>New Coach Registration (free Coach Plan)</h1>
</li> </li>
<li class="rounder grid_2">
<a href="/rowers/coachregister">
<h1>Register as a coach (free)</h1>
<p>Click here and fill out the form to start with a free Coach plan. This allows you
to manage up to 10 athletes (who have to be on the Pro plan). You cannot upload your own
workouts.
</p>
<p>
From this free plan, you can upgrade to any of the paid plans, including coach plans for larger
athlete groups or rower plans for managing your own training plan and workouts.
</p>
</a>
</li>
<li class="rounder grid_2">
<a href="/rowers/register">
<h1>Register as an athlete (free)</h1>
<p>Click here and fill out the form to start with a free Athlete plan. This allows you
to store and analyze your own workouts.
</p>
<p>
From this free plan, you can upgrade to any of the paid plans, including
coach plans for managing larger athlete groups or rower plans for expanded
analytics.
</p>
</a>
</li>
<li class="grid_2"> <li class="grid_2">
<div id="registrationform"> <div id="registrationform">
@@ -69,6 +43,32 @@
<p>Also, we are restricting access to the site to 16 years and older <p>Also, we are restricting access to the site to 16 years and older
because of EU data protection regulations.</p> because of EU data protection regulations.</p>
</li> </li>
<li class="rounder grid_2">
<a href="/rowers/coachregister">
<h1>Register as a coach (free)</h1>
<p>Click here and fill out the form to start with a free Coach plan. This allows you
to manage up to 10 athletes (who have to be on the Pro plan). You cannot upload your own
workouts.
</p>
<p>
From this free plan, you can upgrade to any of the paid plans, including coach plans for larger
athlete groups or rower plans for managing your own training plan and workouts.
</p>
</a>
</li>
<li class="rounder grid_2">
<a href="/rowers/register">
<h1>Register as an athlete (free)</h1>
<p>Click here and fill out the form to start with a free Athlete plan. This allows you
to store and analyze your own workouts.
</p>
<p>
From this free plan, you can upgrade to any of the paid plans, including
coach plans for managing larger athlete groups or rower plans for expanded
analytics.
</p>
</a>
</li>
</ul> </ul>

198
rowers/templates/landingpage.html
View File

@@ -25,13 +25,26 @@
<link rel="stylesheet" href="/static/css/text2.css" /> <link rel="stylesheet" href="/static/css/text2.css" />
<meta charset="utf-8" /> <meta charset="utf-8" />
{% block image_src %}<link rel="image_src" href="static/img/logo7.png" />{% endblock %} {% block image_src %}<link rel="image_src" href="static/img/logo7.png" />{% endblock %}
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width">
<style> <style>
body, html { body, html {
height: 100%; height: 100%;
margin: 0; margin: 0;
font: 400 15px/1.8 "Lato", sans-serif; font: 400 15px/1.8 "Lato", sans-serif;
color: #777; color: #777;
}
.column {
float: left;
width: 33%;
padding: 10px;
}
.row:after {
content: "";
display: table;
clear: both;
} }
.sticky { .sticky {
@@ -57,7 +70,7 @@
} }
.bgimg-1 { .bgimg-1 {
background-image: url("/static/img/MerijnSoeters-hr-9841.jpg"); background-image: url("/static/img/MerijnSoeters-hr-9841.jpg");
min-height: 100%; min-height: 100%;
} }
.bgimg-2 { .bgimg-2 {
@@ -80,12 +93,14 @@
} }
.register { .register {
position: absolute; position: fixed;
opacity: 0.65;
top: 40%; top: 40%;
left: 0%; right: 0px;
text-align: center; text-align: center;
color: #000; color: #fff;
z-index: 1;
padding: 10px;
background: #1c75bc;
} }
@@ -109,7 +124,7 @@
color: #000; color: #000;
} }
.caption span.border { .caption div.border {
background-color: #1c75bc; background-color: #1c75bc;
color: #fff; color: #fff;
padding: 18px; padding: 18px;
@@ -117,13 +132,6 @@
letter-spacing: 10px; letter-spacing: 10px;
} }
.register .border {
background-color: #aaa;
color: #000;
padding: 18px;
font-size: 18px;
}
h3 { h3 {
letter-spacing: 5px; letter-spacing: 5px;
text-transform: uppercase; text-transform: uppercase;
@@ -133,10 +141,33 @@
/* Turn off parallax scrolling for tablets and phones */ /* Turn off parallax scrolling for tablets and phones */
@media only screen and (max-device-width: 1024px) { @media only screen and (max-device-width: 1024px) {
.bgimg-1, .bgimg-2, .bgimg-3 { .bgimg-1, .bgimg-2, .bgimg-3 .sticky {
background-attachment: scroll; background-attachment: scroll;
} max-width: 100%;
} }
.column {
width: 100%;
}
.register {
position: fixed;
top: auto;
bottom: 0;
left: 0;
right: 0;
width: 100%;
z-index: 1;
font: 400 14px/1.2 "Lato", sans-serif;
}
body, html {
font: 400 14px/1.2 "Lato", sans-serif;
}
}
</style> </style>
{% analytical_head_bottom %} {% analytical_head_bottom %}
</head> </head>
@@ -144,11 +175,11 @@
<div class="sticky"> <div class="sticky">
{% if not user.is_authenticated %} {% if not user.is_authenticated %}
<div class="signin"> <div class="signin">
<span><a href="/login/">Sign In&nbsp;</a></span> <span style="padding:10px"><a href="/login/">Sign In&nbsp;</a></span>
</div> </div>
{% else %} {% else %}
<div class="signin"> <div class="signin">
<span><a href="/rowers/list-workouts/">Enter&nbsp;</a></span> <span style="padding:10px"><a href="/rowers/list-workouts/">Enter&nbsp;</a></span>
</div> </div>
{% endif %} {% endif %}
<div class="logo"> <div class="logo">
@@ -158,30 +189,27 @@
</a> </a>
</div> </div>
</div> </div>
{% if not user.is_authenticated %}
<div class="register">
<h1>SIGN UP</h1>
<p><a href="/rowers/register/">I am a rower</a></p>
<p><a href="/rowers/coachregister/">I am a rowing coach</a></p>
</div>
{% endif %}
<div class="bgimg-1"> <div class="bgimg-1">
<div class="caption"> <div class="caption">
<span class="border">FREE DATA AND ANALYSIS. FOR ROWERS. BY ROWERS.</span>
</div>
{% if not user.is_authenticated %}
<div class="register">
<div class="border"> <div class="border">
<p><a href="/rowers/register/">SIGN UP</a></p> FREE DATA AND ANALYSIS. FOR ROWERS. BY ROWERS.
<p>Sign-up form goes here</p>
</div> </div>
</div> </div>
{% endif %}
</div> </div>
<div style="color: #777;background-color:white;text-align:center;padding:50px 80px;text-align: justify;">
<h3 style="text-align:center;">Free Data and Analysis. For Rowers. By Rowers.</h3> <div style="color: #000;background-color:white;text-align:center;padding:50px 80px;text-align: justify;">
<p style="text-align: center;"> <h3 style="text-align:center; max-width:100%;">Free Data and Analysis. For Rowers. By Rowers.</h3>
There is no shortage of training advice for rowers.
</p>
<p style="text-align: center;">
The best research has found that works best for one rower might not work for another. So, what can you do?
</p>
<p style="text-align: center;"> <p style="text-align: center;">
The best way to improve racing performance is to assess where you are, The best way to improve racing performance is to assess where you are,
set objectives, make a plan, track progress, and adjust based on the results you are getting. set objectives, make a plan, track progress, and adjust based on the results you are getting.
@@ -189,57 +217,76 @@
<p style="text-align: center;"> <p style="text-align: center;">
This site is more than a rowing log book. It enables you and your coach to This site is more than a rowing log book. It enables you and your coach to
plan and track all your rowing, indoor and on the water, with a large number plan and track all your rowing, indoor and on the water, with a large number
of devices and apps. On top of htat, it offers the best in rowing of devices and apps. On top of that, it offers the best in rowing
data analytics. Train smart. data analytics. Train smart.
</p> </p>
</div> </div>
<div class="bgimg-2"> <div class="bgimg-2">
<div class="caption"> <div class="caption">
<span class="border" style="background-color:transparent;font-size:25px;color:#000;"> <div class="border">
For on-the-water and indoor rowing For on-the-water and indoor rowing
</span> </div>
</div> </div>
</div> </div>
<div style="position:relative;"> <div style="position: relative;">
<div style="color:#ddd;background-color:#282E34;text-align:center;padding:50px 80px;text-align: justify;"> <div style="color:#ddd;background-color:#282E34;text-align:center;padding:50px 80px;text-align: justify;">
<h1>What we offer</h1> <h1>What we offer</h1>
<div class="row">
<h2>Plan.</h2> <div class="column">
<p>We offer a fully integrated way for you or your coach to set up the goal you commit to, plan to <h2>Plan.</h2>
achieve it, and monitor plan versus execution based on time, distance, heart rate or power.</p> <p>We offer a fully integrated way for you
or your coach to set up the goal you commit to, plan to
<h2>Sync</h2> achieve it, and monitor plan versus execution based on time,
<p>Maintain a consistent log for all your rowing (indoor and on the water) and sync your workouts distance, heart rate or power.</p>
to popular tools as the Concept2 logbook, Strava, TrainingPeaks, SportTracks and others.</p> </div>
<div class="column">
<h2>Analyze</h2> <h2>Sync</h2>
<p>Analyze your workouts with a consistent set of tools, developed by rowers for rowers.</p> <p>Maintain a consistent log for all your rowing (indoor and on the water)
and sync your workouts
<h2>Compare</h2> to popular tools as the Concept2 logbook, Strava, TrainingPeaks,
<p>Compare youre results between workouts and with other rowers in your team.</p> SportTracks and others.
</p>
<h2>Race</h2> </div>
<p>Virtual regattas are an informal way to add a competitive element to your training <div class="column">
and can be used as a quick way to set up small regattas</p> <h2>Analyze</h2>
<p>Analyze your workouts with a consistent set of tools, developed
<h2>Coaching</h2> by rowers for rowers.</p>
<p>Rowsandall.com is the ideal platform for remote rowing coaching. As a coach, you can
easily manage your athletes, set up plans and monitor execution and technique</p> </div>
</div>
<div class="row">
<div class="column">
<h2>Compare</h2>
<p>Compare youre results between workouts and with other rowers in your team.</p>
</div>
<div class="column">
<h2>Race</h2>
<p>Virtual regattas are an informal way to add a competitive element to your training
and can be used as a quick way to set up small regattas</p>
</div>
<div class="column">
<h2>Coaching</h2>
<p>Rowsandall.com is the ideal platform for remote rowing coaching. As a coach, you can
easily manage your athletes, set up plans and monitor execution and technique</p>
</div>
</div>
</div> </div>
</div> </div>
<div class="bgimg-3"> <div class="bgimg-3">
<div class="caption"> <div class="caption">
<span class="border"> <div class="border">
Plan, execute, measure, adjust Plan, execute, measure, adjust
</span> </div>
</div> </div>
</div> </div>
<div style="position:relative;"> <div style="position:relative;">
<div style="color:#ddd;background-color:#282E34;text-align:center;padding:50px 80px;text-align: justify;"> <div style="color:#ddd;background-color:#282E34;text-align:center;padding:50px 80px;text-align: justify;">
<h2>Testimonials</h2> <h2>Testimonials</h2>
<p>"Check out @rowsandall as well - his site is really useful for dissecting rowing data, especially if you eventually get power/angles on the water - check out the articles in the blog - if you’re logging your ergs on C2logbook you can have a play dissecting the data" - Tom Carter</p> <p>"Check out @rowsandall as well - his site is really useful for dissecting rowing data, especially if you eventually get power/angles on the water - check out the articles in the blog - if you’re logging your ergs on C2logbook you can have a play dissecting the data" - Tom Carter</p>
@@ -254,24 +301,25 @@ using my NK empower oarlock for about a month now, and I‘m really
<div class="bgimg-1"> <div class="bgimg-1">
<div class="caption"> <div class="caption">
<span class="border">Follow us on <span class="border" style="background-color:transparent;font-size:25px;color:#000;">
Follow us on
<a href="https://twitter.com/rowsandall"> <a href="https://twitter.com/rowsandall">
<i class="fab fa-twitter"></i> <i class="fab fa-twitter" style="color:#000;"></i>
</a>&nbsp; </a>&nbsp;
<a href="https://www.instagram.com/roosendaalsander/"> <a href="https://www.instagram.com/roosendaalsander/">
<i class="fab fa-instagram"></i> <i class="fab fa-instagram" style="color:#000;"></i>
</a>&nbsp; </a>&nbsp;
<a href="https://analytics.rowsandall.com/"> <a href="https://analytics.rowsandall.com/">
<i class="fab fa-wordpress-simple"></i> <i class="fab fa-wordpress-simple" style="color:#000;"></i>
</a>&nbsp; </a>&nbsp;
<a href="https://www.facebook.com/rowsandall"> <a href="https://www.facebook.com/rowsandall">
<i class="fab fa-facebook"></i> <i class="fab fa-facebook" style="color:#000;"></i>
</a>&nbsp; </a>&nbsp;
</span> </span>
</div> </div>
</div> </div>
<footer class="main-footer"> <footer class="main-footer">
<ul> <ul>
<li> <li>
<a href="https://analytics.rowsandall.com/"> <a href="https://analytics.rowsandall.com/">
@@ -293,6 +341,6 @@ using my NK empower oarlock for about a month now, and I‘m really
</li> </li>
</ul> </ul>
</footer> </footer>
</body> </body>
</html> </html>

17
rowers/templates/menublogs.html Normal file
View File

@@ -0,0 +1,17 @@
{% load staticfiles %}
{% load rowerfilters %}
{% for blog in blogposts %}
<li class="frontitem">
<h3 class="midden">{{ blog.title|safe }}</h3>
<p class="midden">
<img src={{ blog.image }} height=150px;>
</p>
{{ blog.excerpt|safe }}
<p class="midden">
<a href={{ blog.link }}>
read more
</a>
</p>
</li>
{% endfor %}

52
rowers/templates/registration_form.html
View File

@@ -10,32 +10,6 @@
<li class="grid_4"> <li class="grid_4">
<h1>New User Registration</h1> <h1>New User Registration</h1>
</li> </li>
<li class="rounder grid_2">
<a href="/rowers/coachregister">
<h1>Register as a coach (free)</h1>
<p>Click here and fill out the form to start with a free Coach plan. This allows you
to manage up to 10 athletes (who have to be on the Pro plan). You cannot upload your own
workouts.
</p>
<p>
From this free plan, you can upgrade to any of the paid plans, including coach plans for larger
athlete groups or rower plans for managing your own training plan and workouts.
</p>
</a>
</li>
<li class="rounder grid_2">
<a href="/rowers/register">
<h1>Register as an athlete (free)</h1>
<p>Click here and fill out the form to start with a free Athlete plan. This allows you
to store and analyze your own workouts.
</p>
<p>
From this free plan, you can upgrade to any of the paid plans, including
coach plans for managing larger athlete groups or rower plans for expanded
analytics.
</p>
</a>
</li>
<li class="grid_2"> <li class="grid_2">
<div id="registrationform"> <div id="registrationform">
@@ -69,6 +43,32 @@
<p>Also, we are restricting access to the site to 16 years and older <p>Also, we are restricting access to the site to 16 years and older
because of EU data protection regulations.</p> because of EU data protection regulations.</p>
</li> </li>
<li class="rounder grid_2">
<a href="/rowers/coachregister">
<h1>Register as a coach (free)</h1>
<p>Click here and fill out the form to start with a free Coach plan. This allows you
to manage up to 10 athletes (who have to be on the Pro plan). You cannot upload your own
workouts.
</p>
<p>
From this free plan, you can upgrade to any of the paid plans, including coach plans for larger
athlete groups or rower plans for managing your own training plan and workouts.
</p>
</a>
</li>
<li class="rounder grid_2">
<a href="/rowers/register">
<h1>Register as an athlete (free)</h1>
<p>Click here and fill out the form to start with a free Athlete plan. This allows you
to store and analyze your own workouts.
</p>
<p>
From this free plan, you can upgrade to any of the paid plans, including
coach plans for managing larger athlete groups or rower plans for expanded
analytics.
</p>
</a>
</li>
</ul> </ul>

1
rowers/tests/test_analysis.py
View File

@@ -702,6 +702,7 @@ class WorkoutCompareTestNew(TestCase):
'palette':'monochrome_blue', 'palette':'monochrome_blue',
'xaxis':'time', 'xaxis':'time',
'yaxis1':'power', 'yaxis1':'power',
'yaxis2':'hr',
'startdate':startdate, 'startdate':startdate,
'enddate':enddate, 'enddate':enddate,
'plottype':'scatter', 'plottype':'scatter',

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

6
static/css/rowsandall2.css
View File

@@ -242,6 +242,12 @@ th.rotate > div > span {
max-width: 200px; max-width: 200px;
} }
@media only screen and (max-width: 450px) {
.site-announcement-box {
max-width: 100%;
}
}
.site-announcement { .site-announcement {
font: 1.0em/1.2em sans-serif; font: 1.0em/1.2em sans-serif;

32
templates/newbase.html
View File

@@ -330,10 +330,12 @@
</p> </p>
{% endif %} {% endif %}
{% block ad %} {% block ad %}
<a href="https://pryglrowing.com"> <div id="id_blogs">
<img src="/static/img/prygl.jpg"> </div>
<p style="text-align: center">Prygl Rowing Camps</p> <a href="https://pryglrowing.com">
</a> <img src="/static/img/prygl.jpg">
<p style="text-align: center">Prygl Rowing Camps</p>
</a>
{% endblock %} {% endblock %}
</ad> </ad>
@@ -432,3 +434,25 @@
}); });
}); });
</script> </script>
<script type='text/javascript'
src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
</script>
<script>
$( document ).ready(function() {
console.log('loading script');
$.getJSON(window.location.protocol + '//'+window.location.host + '/getblogs/', function(data) {
var html = '';
$.each(data, function(key, blog) {
console.log(blog.title);
html += '<div class="site-announcement-box"><div class="site-announcement-white">';
html += '<a style="text-decoration: none; color: white;" href="'+blog.link+'">';
html += blog.title;
html += '</a>';
html += '</div></div>';
});
$("#id_blogs").html(html);
});
});
</script>