Merge branch 'develop' into feature/freecoach
This commit is contained in:
Sander Roosendaal
@@ -1,14 +1,50 @@
|
||||
{% load leaflet_tags %}
|
||||
{% load cookielaw_tags %}
|
||||
{% load rowerfilters %}
|
||||
{% load tz_detect %}
|
||||
{% tz_detect %}
|
||||
{% load analytical %}
|
||||
{% block filters %}
|
||||
{% endblock %}
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>{% block title %}Rowsandall Rowing Data Analytics{% endblock %}</title>
|
||||
{% block og_image %}
|
||||
<meta property="og:image" content="https://rowsandall.com/static/img/logo_r.png" />
|
||||
<meta property="og:image:secure_url" content="https://rowsandall.com/static/img/logo_r.png" />
|
||||
{% endblock %}
|
||||
<meta property="og:url" content="https://rowsandall.com{{ request.get_full_path }}" />
|
||||
<meta property="fb:app_id" content="694685920739849" />
|
||||
<meta property="og:title" content="{% block og_title %}Rowsandall{% endblock %}" />
|
||||
<meta property="og:description" content="{% block og_description %}Rowsandall: Free Data and Analysis. For Rowers. By Rowers.{% endblock %}" />
|
||||
<link rel="stylesheet" href="/static/css/resetnew.css" />
|
||||
<link rel="stylesheet" href="/static/fontawesome/css/fontawesome.css">
|
||||
<link rel="stylesheet" href="/static/fontawesome/css/all.css">
|
||||
<link rel="stylesheet" href="/static/css/frontstyles.css">
|
||||
<link rel="stylesheet" href="/static/css/text2.css" />
|
||||
<meta charset="utf-8" />
|
||||
{% block image_src %}<link rel="image_src" href="static/img/logo7.png" />{% endblock %}
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<style>
|
||||
body, html {
|
||||
height: 100%;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
font: 400 15px/1.8 "Lato", sans-serif;
|
||||
color: #777;
|
||||
}
|
||||
|
||||
.sticky {
|
||||
position: fixed;
|
||||
right: 0;
|
||||
left: 0;
|
||||
top: 0;
|
||||
padding: 5px;
|
||||
z-index: 1;
|
||||
height:65px;
|
||||
width: 100%;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.bgimg-1, .bgimg-2, .bgimg-3 {
|
||||
position: relative;
|
||||
@@ -26,12 +62,12 @@
|
||||
|
||||
.bgimg-2 {
|
||||
background-image: url("/static/img/MerijnSoeters-hr-8192.jpg");
|
||||
min-height: 400px;
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
.bgimg-3 {
|
||||
background-image: url("/static/img/MerijnSoeters-hr-3282.jpg");
|
||||
min-height: 400px;
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
.caption {
|
||||
@@ -42,6 +78,36 @@
|
||||
text-align: center;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.register {
|
||||
position: absolute;
|
||||
opacity: 0.65;
|
||||
top: 40%;
|
||||
left: 0%;
|
||||
text-align: center;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
|
||||
.signin {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 5px;
|
||||
right: 5px;
|
||||
width: 100%;
|
||||
text-align: right;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.logo {
|
||||
position: absolute;
|
||||
top: 5px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.signin a {
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.caption span.border {
|
||||
background-color: #111;
|
||||
@@ -50,6 +116,13 @@
|
||||
font-size: 25px;
|
||||
letter-spacing: 10px;
|
||||
}
|
||||
|
||||
.register .border {
|
||||
background-color: #aaa;
|
||||
color: #000;
|
||||
padding: 18px;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
h3 {
|
||||
letter-spacing: 5px;
|
||||
@@ -65,13 +138,40 @@
|
||||
}
|
||||
}
|
||||
</style>
|
||||
{% analytical_head_bottom %}
|
||||
</head>
|
||||
<body>
|
||||
<div class="sticky">
|
||||
{% if not user.is_authenticated %}
|
||||
<div class="signin">
|
||||
<span><a href="/login/">Sign In </a></span>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="signin">
|
||||
<span><a href="/rowers/list-workouts/">Enter </a></span>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="logo">
|
||||
<a href="/" title="Home">
|
||||
<img src="/static/img/logo7.png"
|
||||
alt="Rowsandall logo" height="55px">
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="bgimg-1">
|
||||
<div class="caption">
|
||||
<span class="border">SCROLL DOWN</span>
|
||||
<span class="border">FREE DATA AND ANALYSIS. FOR ROWERS. BY ROWERS.</span>
|
||||
</div>
|
||||
{% if not user.is_authenticated %}
|
||||
<div class="register">
|
||||
<div class="border">
|
||||
<p><a href="/rowers/register/">SIGN UP</a></p>
|
||||
<p>Sign-up form goes here</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div style="color: #777;background-color:white;text-align:center;padding:50px 80px;text-align: justify;">
|
||||
@@ -96,33 +196,111 @@
|
||||
|
||||
<div class="bgimg-2">
|
||||
<div class="caption">
|
||||
<span class="border" style="background-color:transparent;font-size:25px;color: #f7f7f7;">LESS HEIGHT</span>
|
||||
<span class="border" style="background-color:transparent;font-size:25px;color:#000;">
|
||||
For on-the-water and indoor rowing
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="position:relative;">
|
||||
<div style="color:#ddd;background-color:#282E34;text-align:center;padding:50px 80px;text-align: justify;">
|
||||
<p>Some info goes here</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>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bgimg-3">
|
||||
<div class="caption">
|
||||
<span class="border" style="background-color:transparent;font-size:25px;color: #f7f7f7;">SCROLL UP</span>
|
||||
<span class="border">
|
||||
Plan, execute, measure, adjust
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="position:relative;">
|
||||
<div style="color:#ddd;background-color:#282E34;text-align:center;padding:50px 80px;text-align: justify;">
|
||||
<p>Where does the login go?</p>
|
||||
<h2>Potentially to be replaced with log/race/plan/analyze/sync from old landing page</h2>
|
||||
<ul>
|
||||
<li>Commit to a goal</li>
|
||||
<li>Plan your training</li>
|
||||
<li>Track your execution and progress</li>
|
||||
<li>Monitor key rowing technique metrics</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bgimg-1">
|
||||
<div class="caption">
|
||||
<span class="border">COOL!</span>
|
||||
<span class="border">Follow us on
|
||||
<a href="https://twitter.com/rowsandall">
|
||||
<i class="fab fa-twitter"></i>
|
||||
</a>
|
||||
<a href="https://www.instagram.com/roosendaalsander/">
|
||||
<i class="fab fa-instagram"></i>
|
||||
</a>
|
||||
<a href="https://analytics.rowsandall.com/">
|
||||
<i class="fab fa-wordpress-simple"></i>
|
||||
</a>
|
||||
<a href="https://www.facebook.com/rowsandall">
|
||||
<i class="fab fa-facebook"></i>
|
||||
</a>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer class="main-footer">
|
||||
<ul>
|
||||
<li>
|
||||
<h1>Help</h1>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="/rowers/help/">Help</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://analytics.rowsandall.com/">
|
||||
Rowing Analytics Blog
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://www.facebook.com/rowsandall">
|
||||
Rowing Data Facebook Group</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<h1>About</h1>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="/rowers/email/">Contact</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/rowers/partners/">Partnering?</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/rowers/developers/">Developers Info</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<h1>Paid Plans</h1>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="/rowers/paidplans/">Paid Plans</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<h1>Legal</h1>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="/rowers/legal/">Terms and Conditions</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/rowers/legal/">Privacy Policy</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</footer>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
font-weight: bold;
|
||||
text-align: left;
|
||||
font-size: 1.0em;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
header ul {
|
||||
|
||||
@@ -143,7 +143,38 @@
|
||||
<!-- Container element -->
|
||||
|
||||
<body data-root="https://webapiv2.navionics.com/dist/webapi/images">
|
||||
{% if user.is_authenticated %}
|
||||
<nav class="main-nav">
|
||||
<ul>
|
||||
<li id="nav-workouts">
|
||||
<a href="/rowers/list-workouts/">
|
||||
<i class="fas fa-clipboard-list"></i> Workouts
|
||||
</a>
|
||||
</li>
|
||||
<li id="nav-racing">
|
||||
<a href="/rowers/virtualevents/">
|
||||
<i class="fas fa-flag-checkered"></i> Racing
|
||||
</a>
|
||||
</li>
|
||||
<li id="nav-analysis">
|
||||
<a href="/rowers/analysis/">
|
||||
<i class="fas fa-analytics"></i> Analysis
|
||||
</a>
|
||||
</li>
|
||||
<li id="nav-plan">
|
||||
<a href="/rowers/sessions/">
|
||||
<i class="fas fa-calendar-alt"></i> Plan
|
||||
</a>
|
||||
</li>
|
||||
<li id="nav-teams">
|
||||
<a href="/rowers/me/teams/">
|
||||
<i class="fas fa-bullhorn"></i> Groups
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
{% endif %}
|
||||
<div class="parallax">
|
||||
<p>Aap</p>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user