From 004031e352bae765290a651ab21ff6032d63dea5 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sat, 29 Sep 2018 11:36:16 +0200
Subject: [PATCH] added virtualevent_view urls.py line 146

---
 rowers/templates/virtualevent.html | 129 +++++++++++++++++++----------
 rowers/views.py                    |   1 +
 static/css/rowsandall2.css         |  25 +++---
 3 files changed, 97 insertions(+), 58 deletions(-)

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 %}
-
-<div class="grid_12 alpha">
-  
-  <h1>{{ race.name }}</h1>
+{% block main %}
 
   
-</div>
+<h1>{{ race.name }}</h1>
 
-<div class="grid_12 alpha">
-  <div class="grid_8 alpha">
+  
+
+<ul class="main-content">
+  <li class="grid_2">
+    <p>
+      <h2>Course</h2>
+    </p>
+    <p>
+      {{ coursediv|safe }}
+      
+      {{ coursescript|safe }}
+      
+    </p>
+  </li>
+  <li class="grid_2">
     <div id="raceinfo">
-      <h2>Race Information</h2>
       <p>
-        <table class="listtable shortpadded" width="80%">
+        <h2>Race Information</h2>
+      </p>
+      <p>
+        <table class="listtable shortpadded" width="100%">
           <tbody>
             <tr>
               <th>Course</th><td>{{ race.course }}</td>
@@ -72,29 +83,50 @@
         <p>
         {% for button in buttons %}
         {% if button == 'registerbutton' %}
-        <a href="/rowers/virtualevent/{{ race.id }}/register" class="button gray small grid_2">Register</a>
+        <p>
+          <a href="/rowers/virtualevent/{{ race.id }}/register"
+             class="blue button">Register</a>
+        </p>
         {% endif %}
         {% if button == 'submitbutton' %}
-        <a href="/rowers/virtualevent/{{ race.id }}/submit" class="button gray small grid_2">Submit Result</a>
+        <a href="/rowers/virtualevent/{{ race.id }}/submit" class="blue button">Submit Result</a>
         {% endif %}
         {% if button == 'resubmitbutton' %}
-        <a href="/rowers/virtualevent/{{ race.id }}/submit" class="button gray small grid_2">Submit New Result</a>
+        <p>
+          <a href="/rowers/virtualevent/{{ race.id }}/submit"
+             class="blue button">Submit New Result</a>
+        </p>
         {% endif %}
         {% if button == 'withdrawbutton' %}
-        <a href="/rowers/virtualevent/{{ race.id }}/withdraw" class="button gray small grid_2">Withdraw</a>
+        <p>
+          <a href="/rowers/virtualevent/{{ race.id }}/withdraw"
+             class="blue button">Withdraw</a>
+        </p>
         {% endif %}
         {% if button == 'adddisciplinebutton' %}
-        <a href="/rowers/virtualevent/{{ race.id }}/adddiscipline" class="button gray small grid_2">Register New Boat</a>
+        <p>
+          <a href="/rowers/virtualevent/{{ race.id }}/adddiscipline"
+             class="blue button">
+            Register New Boat
+          </a>
+        </p>
         {% endif %}
         {% if button == 'editbutton' %}
-        <a href="/rowers/virtualevent/{{ race.id }}/edit" class="button gray small grid_2">Edit Race</a>
+        <p>
+          <a href="/rowers/virtualevent/{{ race.id }}/edit"
+             class="blue button">Edit Race
+          </a>
+        </p>
         {% endif %}
         {% endfor %}
-      </p>
         {% endif %}
     </div>
+  </li>
+  <li class="grid_2">
     <div id="results">
-      <h2>Results</h2>
+      <p>
+        <h2>Results</h2>
+      </p>
       <p>
         {% if results or dns %}
         <table class="listtable shortpadded" width="100%">
@@ -153,10 +185,30 @@
         {% endif %}
       </p>
     </div>
+  </li>
+  {% if form %}
+  <li class="grid_2">
+
+    <p>
+      <h2>Filter Results</h2>
+    </p>
+    <p>
+
+    <form id="result_filter_form", method="post">
+    <table>
+      {{ form.as_table }}
+    </table>
+
+    {% csrf_token %}
+    <input class="button green" type="submit" value="Submit">
+    </p>
+  </li>
+  {% endif %}
+  <li class="grid_2">
     <div id="registered">
       {% if records %}
       <h2>Registered Competitors</h2>
-      <table class="listtable shortpadded" width="80%">
+      <table class="listtable shortpadded" width="100%">
         <thead>
           <tr>
             <th>Name</th>
@@ -188,8 +240,12 @@
       </table>
       {% endif %}
     </div>
+  </li>
+  <li class="grid_4">
     <div id="rules">
-      <h2>Rules</h2>
+      <p>
+        <h2>Rules</h2>
+      </p>
       <p>
         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.
         </p>
     </div>
-  </div>
-  <div class="grid_4 omega">
-    <p>
-    <h2>Course</h2>
-    {{ coursediv|safe }}
-
-    {{ coursescript|safe }}
-
-    </p>
-
-    {% if form %}
-    <p>
-    <h2>Filter Results</h2>
-
-    <form id="result_filter_form", method="post">
-    <table>
-      {{ form.as_table }}
-    </table>
-
-    {% csrf_token %}
-    <input class="button green" type="submit" value="Submit">
-    </p>
-    {% endif %}
-  </div>
-</div>
+  </li>
+</ul>
 
 {% 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;