From f67bcdd95bedfb8df779226ae214cc1b4c522e10 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 1 Oct 2018 09:41:24 +0200 Subject: [PATCH] add boat done --- rowers/interactiveplots.py | 2 +- rowers/templates/virtualevent.html | 13 +++++-------- rowers/templates/virtualeventregister.html | 17 ++++++++--------- rowers/views.py | 2 +- static/css/rowsandall2.css | 9 +++++++++ static/css/styles2.css | 1 + 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index a53ff5b4..3bd2fb0e 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -986,7 +986,7 @@ def course_map(course): ) div = """ -

 

+
""" return script,div diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index 6dc64e04..21097ed6 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -13,19 +13,16 @@

{{ race.name }}

- -
  • Course

    -

    - {{ coursediv|safe }} - - {{ coursescript|safe }} - -

    +
    + {{ coursediv|safe }} + + {{ coursescript|safe }} +
  • diff --git a/rowers/templates/virtualeventregister.html b/rowers/templates/virtualeventregister.html index e7501437..5ed6c79a 100644 --- a/rowers/templates/virtualeventregister.html +++ b/rowers/templates/virtualeventregister.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} @@ -16,13 +16,10 @@ {% endblock %} -{% block content %} -
    -
    -

    Register for {{ race.name }}

    -
    +{% block main %} +

    Register for {{ race.name }}

    + -
    @@ -44,10 +41,8 @@
    -
    {% csrf_token %} -
    @@ -55,3 +50,7 @@ {% block scripts %} {% endblock %} + +{% block sidebar %} +{% include 'menu_racing.html' %} +{% endblock %} diff --git a/rowers/views.py b/rowers/views.py index 2e1f0263..345f8e42 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13908,7 +13908,7 @@ def virtualevent_addboat_view(request,id=0): 'form':form, 'race':race, 'rowerid':r.id, - + 'active': 'nav-racing', }) @login_required() diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css index 03bf46a1..67061de3 100644 --- a/static/css/rowsandall2.css +++ b/static/css/rowsandall2.css @@ -312,6 +312,14 @@ th.rotate > div > span { color: #ffffff; } +.leafletmap { + padding:0; + margin:0; + display: grid; + grid-gap: 0; +} + + .input { font: 1.1em/1.5em sans-serif; text-decoration: none; @@ -902,3 +910,4 @@ a.wh:hover { /* show children when item is checked */ display: block; } + diff --git a/static/css/styles2.css b/static/css/styles2.css index 44736ddb..1b166c5b 100644 --- a/static/css/styles2.css +++ b/static/css/styles2.css @@ -390,6 +390,7 @@ grid-column-end: span 4; } + .maxheight { max-height: 300px; overflow: scroll;