diff --git a/rowers/templates/.#list_workouts.html b/rowers/templates/.#list_workouts.html new file mode 100644 index 00000000..00ba3850 --- /dev/null +++ b/rowers/templates/.#list_workouts.html @@ -0,0 +1 @@ +E408191@CZ27LT9RCGN72.11332:1537209963 \ No newline at end of file diff --git a/rowers/templates/redesign.html b/rowers/templates/redesign.html new file mode 100644 index 00000000..8b39513b --- /dev/null +++ b/rowers/templates/redesign.html @@ -0,0 +1,8 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block main %} +

Main

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in.

+{% endblock %} diff --git a/rowers/urls.py b/rowers/urls.py index f89c1716..5af2a07f 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -282,7 +282,9 @@ urlpatterns = [ url(r'^workout/fusion/(?P\d+)/(?P\d+)$',views.workout_fusion_view), url(r'^workout/fusion/(?P\d+)/$',views.workout_fusion_list), url(r'^workout/fusion/(?P\d+)/(?P\d+-\d+-\d+)/(?P\w+.*)$',views.workout_fusion_list), - + url(r'^redesign$',TemplateView.as_view( + template_name='redesign.html'),name='redesign' + ), url(r'^physics$',TemplateView.as_view(template_name='physics.html'),name='physics'), url(r'^partners$',TemplateView.as_view(template_name='partners.html'),name='partners'), url(r'^workout/(?P\d+)/$',views.workout_view), diff --git a/static/css/resetnew.css b/static/css/resetnew.css new file mode 100644 index 00000000..e0dad523 --- /dev/null +++ b/static/css/resetnew.css @@ -0,0 +1,56 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} + +/* apply a natural box layout model to all elements, but allowing components to change */ +html { + box-sizing: border-box; +} +*, *:before, *:after { + box-sizing: inherit; +} diff --git a/static/css/styles.css b/static/css/styles.css new file mode 100644 index 00000000..8baf3fd4 --- /dev/null +++ b/static/css/styles.css @@ -0,0 +1,49 @@ +@media (min-width: 768px) { + .container { + display: grid; + grid-template-columns: 200px 1fr 200px; + grid-template-rows: auto 1fr auto; + + } +} + +header { + grid-column: span 3; + padding: 30px; + text-align: center; + font-size: 1.4em; + background-color: #369; + color: white; +} + +main { + flex: 1; + padding: 20px; +} + +nav { + background-color: #f90; + padding: 20px; + grid-template-columns: 2fr; + grid-template-rows: auto 1ft auto; +} + +aside { + padding: 20px; + background-color: #936; +} + +footer { + grid-column: span 3; + padding: 30px; + text-align: center; + font-size: 1.4em; + background-color: #690; + color: white; +} + +h1 { + margin-bottom: 1em; + font-size: 1.3em; + font-weight: bold; +} diff --git a/static/css/styles2.css b/static/css/styles2.css new file mode 100644 index 00000000..8baf3fd4 --- /dev/null +++ b/static/css/styles2.css @@ -0,0 +1,49 @@ +@media (min-width: 768px) { + .container { + display: grid; + grid-template-columns: 200px 1fr 200px; + grid-template-rows: auto 1fr auto; + + } +} + +header { + grid-column: span 3; + padding: 30px; + text-align: center; + font-size: 1.4em; + background-color: #369; + color: white; +} + +main { + flex: 1; + padding: 20px; +} + +nav { + background-color: #f90; + padding: 20px; + grid-template-columns: 2fr; + grid-template-rows: auto 1ft auto; +} + +aside { + padding: 20px; + background-color: #936; +} + +footer { + grid-column: span 3; + padding: 30px; + text-align: center; + font-size: 1.4em; + background-color: #690; + color: white; +} + +h1 { + margin-bottom: 1em; + font-size: 1.3em; + font-weight: bold; +} diff --git a/templates/newbase.html b/templates/newbase.html new file mode 100644 index 00000000..0c907d5d --- /dev/null +++ b/templates/newbase.html @@ -0,0 +1,109 @@ +{% load leaflet_tags %} +{% load cookielaw_tags %} +{% load rowerfilters %} +{% load tz_detect %} +{% tz_detect %} +{% load analytical %} +{% block filters %} +{% endblock %} + + + + {% block title %}Rowsandall Rowing Data Analytics{% endblock %} + {% block scripts %} {% endblock %} + + + + + + + + + + + + + + + + {% analytical_head_top %} + + + + + + + + + + + + + + + {% block og_image %} + + + {% endblock %} + + + + + + + + + + + {% block meta %} {% endblock %} + {% leaflet_js %} + {% leaflet_css %} +
+ + + + + {% analytical_head_bottom %} + + + +
Header
+ +
+ {% block main %} + {% endblock %} +
+ + + {% analytical_body_bottom %} + {% block body_bottom %}{% endblock %} + +