diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index c1e22e52..6dc64e04 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} @@ -8,21 +8,32 @@ {% include "monitorjobs.html" %} {% endblock %} -{% block content %} - -
- -

{{ race.name }}

+{% block main %} -
+

{{ race.name }}

-
-
+ + +
    +
  • +

    +

    Course

    +

    +

    + {{ coursediv|safe }} + + {{ coursescript|safe }} + +

    +
  • +
  • -

    Race Information

    - +

    Race Information

    +

    +

    +

    @@ -72,29 +83,50 @@

    {% for button in buttons %} {% if button == 'registerbutton' %} - Register +

    + Register +

    {% endif %} {% if button == 'submitbutton' %} - Submit Result + Submit Result {% endif %} {% if button == 'resubmitbutton' %} - Submit New Result +

    + Submit New Result +

    {% endif %} {% if button == 'withdrawbutton' %} - Withdraw +

    + Withdraw +

    {% endif %} {% if button == 'adddisciplinebutton' %} - Register New Boat +

    + + Register New Boat + +

    {% endif %} {% if button == 'editbutton' %} - Edit Race +

    + Edit Race + +

    {% endif %} {% endfor %} -

    {% endif %} + +
  • -

    Results

    +

    +

    Results

    +

    {% if results or dns %}

  • Course{{ race.course }}
    @@ -153,10 +185,30 @@ {% endif %}

    + + {% if form %} +
  • + +

    +

    Filter Results

    +

    +

    + +
    +

  • + {{ form.as_table }} +
    + + {% csrf_token %} + +

    +
  • + {% endif %} +
  • {% if records %}

    Registered Competitors

    - +
    @@ -188,8 +240,12 @@
    Name
    {% endif %}
    +
  • +
  • -

    Rules

    +

    +

    Rules

    +

    Virtual races are intended as an informal way to add a competitive element to training and as a quick way to set @@ -233,30 +289,11 @@ safety while participating in a virtual race.

    -
-
-

-

Course

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

- - {% if form %} -

-

Filter Results

- - - - {{ form.as_table }} -
- - {% csrf_token %} - -

- {% endif %} -
-
+ + {% endblock %} + +{% block sidebar %} +{% include 'menu_racing.html' %} +{% endblock %} diff --git a/rowers/views.py b/rowers/views.py index d2dd7611..2e1f0263 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13762,6 +13762,7 @@ def virtualevent_view(request,id=0): 'dns':dns, 'records':records, 'form':form, + 'active':'nav-racing', }) @login_required() diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css index db5f716c..03bf46a1 100644 --- a/static/css/rowsandall2.css +++ b/static/css/rowsandall2.css @@ -299,6 +299,19 @@ th.rotate > div > span { color: #a9c08c; } +.blue { + color: #fae7e9; + border: solid 1px #27aae2; + background: #27aae2; +} +.blue:hover { + background: #1c74bb; + border: solid 1px #27aae2; +} +.blue:active { + color: #ffffff; +} + .input { font: 1.1em/1.5em sans-serif; text-decoration: none; @@ -399,18 +412,6 @@ th.rotate > div > span { color: #27aae2; } -.blue { - color: #fae7e9; - border: solid 1px #27aae2; - background: #27aae2; -} -.blue:hover { - background: #1c74bb; - border: solid 1px #27aae2; -} -.blue:active { - color: #ffffff; -} .rbluetext { color: #27aae1;