Merge branch 'release/v9.80'
This commit is contained in:
Sander Roosendaal
128
rowers/templates/landingpage.html
Normal file
128
rowers/templates/landingpage.html
Normal file
@@ -0,0 +1,128 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<style>
|
||||||
|
body, html {
|
||||||
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
font: 400 15px/1.8 "Lato", sans-serif;
|
||||||
|
color: #777;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bgimg-1, .bgimg-2, .bgimg-3 {
|
||||||
|
position: relative;
|
||||||
|
opacity: 0.65;
|
||||||
|
background-attachment: fixed;
|
||||||
|
background-position: center;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-size: cover;
|
||||||
|
|
||||||
|
}
|
||||||
|
.bgimg-1 {
|
||||||
|
background-image: url("/static/img/MerijnSoeters-hr-9841.jpg");
|
||||||
|
min-height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bgimg-2 {
|
||||||
|
background-image: url("/static/img/MerijnSoeters-hr-8192.jpg");
|
||||||
|
min-height: 400px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bgimg-3 {
|
||||||
|
background-image: url("/static/img/MerijnSoeters-hr-3282.jpg");
|
||||||
|
min-height: 400px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.caption {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 20%;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
color: #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.caption span.border {
|
||||||
|
background-color: #111;
|
||||||
|
color: #fff;
|
||||||
|
padding: 18px;
|
||||||
|
font-size: 25px;
|
||||||
|
letter-spacing: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
letter-spacing: 5px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
font: 20px "Lato", sans-serif;
|
||||||
|
color: #111;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Turn off parallax scrolling for tablets and phones */
|
||||||
|
@media only screen and (max-device-width: 1024px) {
|
||||||
|
.bgimg-1, .bgimg-2, .bgimg-3 {
|
||||||
|
background-attachment: scroll;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<div class="bgimg-1">
|
||||||
|
<div class="caption">
|
||||||
|
<span class="border">SCROLL DOWN</span>
|
||||||
|
</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>
|
||||||
|
<p style="text-align: center;">
|
||||||
|
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;">
|
||||||
|
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.
|
||||||
|
</p>
|
||||||
|
<p style="text-align: center;">
|
||||||
|
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
|
||||||
|
of devices and apps. On top of htat, it offers the best in rowing
|
||||||
|
data analytics. Train smart.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="bgimg-2">
|
||||||
|
<div class="caption">
|
||||||
|
<span class="border" style="background-color:transparent;font-size:25px;color: #f7f7f7;">LESS HEIGHT</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>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="bgimg-3">
|
||||||
|
<div class="caption">
|
||||||
|
<span class="border" style="background-color:transparent;font-size:25px;color: #f7f7f7;">SCROLL UP</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>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="bgimg-1">
|
||||||
|
<div class="caption">
|
||||||
|
<span class="border">COOL!</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
BIN
rowers/tests/testdata/testdata.csv.gz
vendored
BIN
rowers/tests/testdata/testdata.csv.gz
vendored
Binary file not shown.
@@ -19,7 +19,7 @@ from django.conf import settings
|
|||||||
from django.conf.urls.static import static
|
from django.conf.urls.static import static
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.views.generic import TemplateView
|
from django.views.generic import TemplateView
|
||||||
from rowsandall_app.views import rootview
|
from rowsandall_app.views import rootview, landingview
|
||||||
from django.contrib.auth import views as auth_views
|
from django.contrib.auth import views as auth_views
|
||||||
from rowers import views as rowersviews
|
from rowers import views as rowersviews
|
||||||
|
|
||||||
@@ -54,6 +54,7 @@ urlpatterns += [
|
|||||||
re_path(r'^admin/', admin.site.urls),
|
re_path(r'^admin/', admin.site.urls),
|
||||||
re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')),
|
re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')),
|
||||||
re_path(r'^$',rootview),
|
re_path(r'^$',rootview),
|
||||||
|
re_path(r'^landing$',landingview),
|
||||||
re_path(r'^getblogs/$',rowersviews.get_blog_posts),
|
re_path(r'^getblogs/$',rowersviews.get_blog_posts),
|
||||||
re_path(r'^login/',
|
re_path(r'^login/',
|
||||||
# auth_views.LoginView,
|
# auth_views.LoginView,
|
||||||
|
|||||||
@@ -8,6 +8,13 @@ from rowingdata import main as rmain
|
|||||||
|
|
||||||
|
|
||||||
import random
|
import random
|
||||||
|
|
||||||
|
def landingview(request):
|
||||||
|
loginform = LoginForm()
|
||||||
|
|
||||||
|
return render(request,
|
||||||
|
'landingpage.html',
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def rootview(request):
|
def rootview(request):
|
||||||
|
|||||||
BIN
static/img/MerijnSoeters-hr-3282.jpg
Normal file
BIN
static/img/MerijnSoeters-hr-3282.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 MiB |
BIN
static/img/MerijnSoeters-hr-8192.jpg
Normal file
BIN
static/img/MerijnSoeters-hr-8192.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 MiB |
BIN
static/img/MerijnSoeters-hr-9841.jpg
Normal file
BIN
static/img/MerijnSoeters-hr-9841.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 MiB |
152
templates/landing.html
Normal file
152
templates/landing.html
Normal file
@@ -0,0 +1,152 @@
|
|||||||
|
{% 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 scripts %} {% endblock %}
|
||||||
|
|
||||||
|
<script type="text/javascript" src="/admin/jsi18n/"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/core.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/jquery.min.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/jquery.init.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/admin/RelatedObjectLookups.js">
|
||||||
|
</script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/calendar.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/urlify.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/prepopulate.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/vendor/xregexp/xregexp.min.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/SelectBox.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/SelectFilter2.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/admin/DateTimeShortcuts.js"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/inlines.js"></script>
|
||||||
|
<script src="/static/cookielaw/js/cookielaw.js"></script>
|
||||||
|
{% analytical_head_top %}
|
||||||
|
|
||||||
|
<link rel="stylesheet" href="/static/css/bokeh-0.12.3.min.css" type="text/css" />
|
||||||
|
<link rel="stylesheet" href="/static/css/bokeh-widgets-0.12.3.min.css" type="text/css" />
|
||||||
|
|
||||||
|
<link rel="shortcut icon" href="/static/img/favicon.ico" type="image/x-icon" />
|
||||||
|
<link rel="icon" sizes="32x32" href="/static/img/favicon-32x32.png" type="image/png"/>
|
||||||
|
<link rel="icon" sizes="64x64" href="/static/img/favicon-64x64.png" type="image/png"/>
|
||||||
|
<link rel="icon" sizes="192x192" href="/static/img/favicon-192x192.png" type="image/png"/>
|
||||||
|
<link rel="icon" sizes="16x16" href="/static/img/favicon-16x16.png" type="image/png"/>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
{% block image_src %}<link rel="image_src" href="static/img/logo7.png" />{% endblock %}
|
||||||
|
<meta property="og:type" content="website">
|
||||||
|
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width">
|
||||||
|
|
||||||
|
{% 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" type="text/css" href="/static/admin/css/forms.css"/>
|
||||||
|
<link rel="stylesheet" type="text/css" href="/static/admin/css/widgets.css"/>
|
||||||
|
|
||||||
|
<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" />
|
||||||
|
<link rel="stylesheet" href="/static/css/rowsandall2.css" />
|
||||||
|
{% block meta %} {% endblock %}
|
||||||
|
{% leaflet_js %}
|
||||||
|
{% leaflet_css %}
|
||||||
|
<div id="fb-root"></div>
|
||||||
|
<script>(function(d, s, id) {
|
||||||
|
var js, fjs = d.getElementsByTagName(s)[0];
|
||||||
|
if (d.getElementById(id)) return;
|
||||||
|
js = d.createElement(s); js.id = id;
|
||||||
|
js.async=true;
|
||||||
|
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.10&appId=694685920739849";
|
||||||
|
fjs.parentNode.insertBefore(js, fjs);
|
||||||
|
}(document, 'script', 'facebook-jssdk'));</script>
|
||||||
|
<link rel="stylesheet" href="https://webapiv2.navionics.com/dist/webapi/webapi.min.css" >
|
||||||
|
<script type="text/javascript" src="https://webapiv2.navionics.com/dist/webapi/webapi.min.no-dep.js"></script>
|
||||||
|
<script>window.twttr = (function(d, s, id) {
|
||||||
|
var js, fjs = d.getElementsByTagName(s)[0],
|
||||||
|
t = window.twttr || {};
|
||||||
|
if (d.getElementById(id)) return t;
|
||||||
|
js = d.createElement(s);
|
||||||
|
js.id = id;
|
||||||
|
js.async=true;
|
||||||
|
js.src = "https://platform.twitter.com/widgets.js";
|
||||||
|
fjs.parentNode.insertBefore(js, fjs);
|
||||||
|
|
||||||
|
t._e = [];
|
||||||
|
t.ready = function(f) {
|
||||||
|
t._e.push(f);
|
||||||
|
};
|
||||||
|
|
||||||
|
return t;
|
||||||
|
}(document, "script", "twitter-wjs"));</script>
|
||||||
|
|
||||||
|
<script type='text/javascript'
|
||||||
|
src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
|
||||||
|
</script>
|
||||||
|
<script>
|
||||||
|
$(document).ready(function(){
|
||||||
|
var accordionsMenu = $('.cd-accordion-menu');
|
||||||
|
|
||||||
|
if( accordionsMenu.length > 0 ) {
|
||||||
|
|
||||||
|
accordionsMenu.each(function(){
|
||||||
|
var accordion = $(this);
|
||||||
|
//detect change in the input[type="checkbox"] value
|
||||||
|
accordion.on('change', 'input[type="checkbox"]', function(){
|
||||||
|
var checkbox = $(this);
|
||||||
|
console.log(checkbox.prop('checked'));
|
||||||
|
( checkbox.prop('checked') ) ? checkbox.siblings('ul').attr('style', 'display:none;').slideDown(300) : checkbox.siblings('ul').attr('style', 'display:block;').slideUp(300);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
|
<script>
|
||||||
|
$(document).ready(function(){
|
||||||
|
var active = "#{{ active }}";
|
||||||
|
$(active).addClass("nav-active");
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% analytical_head_bottom %}
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.parallax {
|
||||||
|
/* The image used */
|
||||||
|
background-image: url("MerijnSoeters-hr-9841.jpg");
|
||||||
|
|
||||||
|
/* Set a specific height */
|
||||||
|
height: 100%;
|
||||||
|
|
||||||
|
/* Create the parallax scrolling effect */
|
||||||
|
background-attachment: fixed;
|
||||||
|
background-position: center;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-size: cover;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<!-- Container element -->
|
||||||
|
|
||||||
|
<body data-root="https://webapiv2.navionics.com/dist/webapi/images">
|
||||||
|
|
||||||
|
<div class="parallax">
|
||||||
|
<p>Aap</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Reference in New Issue
Block a user