From b2c7f2ab30b643e1f5711490f856ed442404d885 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 3 Oct 2018 18:29:14 +0200
Subject: [PATCH] addmanual

---
 rowers/templates/manualadd.html | 52 ++++++++++++++++-----------------
 rowers/views.py                 |  1 +
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/rowers/templates/manualadd.html b/rowers/templates/manualadd.html
index ef7ecc78..be698545 100644
--- a/rowers/templates/manualadd.html
+++ b/rowers/templates/manualadd.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
 {% load tz %}
@@ -35,33 +35,33 @@ $('#id_workouttype').change();
 </script>
 {% endblock %}
 
-{% block content %}
-<div class="grid_12 alpha">
-    <h1>Add Workout Manually</h1>
-    <div class="grid_6 alpha">
-      {% if form.errors %}
-      <p style="color: red;">
-        Please correct the error{{ form.errors|pluralize }} below.
+{% block main %}
+<h1>Add Workout Manually</h1>
+<ul class="main-content">
+  <li class="grid_2">
+    {% if form.errors %}
+    <p style="color: red;">
+      Please correct the error{{ form.errors|pluralize }} below.
+    </p>
+    {% endif %}
+    
+    <form id="importantform"
+          enctype="multipart/form-data" action="" method="post">
+      <table width=100%>
+        {{ form.as_table }}
+      </table>
+      {% csrf_token %}
+      <p>
+        <input class="button green" type="submit" value="Save">
       </p>
-      {% endif %}
-      
-      <form id="importantform"
-            enctype="multipart/form-data" action="" method="post">
-        <table width=100%>
-          {{ form.as_table }}
-        </table>
-        {% csrf_token %}
-        <div id="formbutton" class="grid_1 suffix_1 omega">
-          <input class="button green" type="submit" value="Save">
-        </div>
-      </form>
-    </div>
+    </form>
+  </li>
+</ul>
 
-    <div id="images" class="grid_6 omega">
-      <p>&nbsp;</p>
-      
-    </div>
-</div>
   
 
+{% endblock %}
+
+{% block sidebar %}
+{% include 'menu_workouts.html' %}
 {% endblock %}
diff --git a/rowers/views.py b/rowers/views.py
index 81c69bf1..63c16026 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -3188,6 +3188,7 @@ def addmanual_view(request):
 
     return render(request,'manualadd.html',
                   {'form':form,
+                   'active':'nav-workouts',
                    })
 
 @login_required()