From b694b08fcf912f5d860e61e38db667c1e96430a0 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 5 May 2020 18:08:57 +0200
Subject: [PATCH] better layout

---
 rowers/interactiveplots.py           | 5 +++--
 rowers/templates/history.html        | 7 ++++---
 rowers/templates/menu_analytics.html | 5 +++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 829b7777..7fe3049e 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -223,7 +223,7 @@ def interactive_hr_piechart(df,rower,title):
     colors = ['gray','yellow','lime','blue','purple','red']
 
 
-    size=220
+    size=350
     TOOLS = 'save'
 
     z = figure(title="HR "+title, x_range=(-1,1), y_range=(-1,1), width=size, height=size,
@@ -236,7 +236,8 @@ def interactive_hr_piechart(df,rower,title):
 
 
     z.toolbar_location = 'right'
-    z.legend.visible = False
+    z.legend.location = 'top_right'
+    #z.legend.visible = False
     z.axis.visible = False
     z.xgrid.grid_line_color = None
     z.ygrid.grid_line_color = None
diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index b315eb9f..89132f1e 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -8,7 +8,8 @@
   <h1>History</h1>
 <ul class="main-content">
   <script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
-  <li class="grid_4">
+  <li class="grid_2">
+    <p>
     <form enctype="multipart/form-data"  method="post">
     {% csrf_token %}
     <table>
@@ -16,8 +17,7 @@
     </table>
     <input type="submit" value="Submit">
     </form>
-  </li>
-  <li class="grid_2">
+    </p>
     <h2>All workouts</h2>
 
     <p>
@@ -51,6 +51,7 @@
   <li class="grid_2">
     <div>{{ totalscript|safe }}{{ totaldiv|safe }}</div>
   </li>
+
   {% for ddict in typedicts %}
   <li class="grid_1">
     <h2>{{ ddict|lookup:"wtype"}}</h2>
diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html
index 9e9c32e3..df8a23c6 100644
--- a/rowers/templates/menu_analytics.html
+++ b/rowers/templates/menu_analytics.html
@@ -90,6 +90,11 @@
 					<i class="fas fa-bell fa-fw"></i>&nbsp;Alerts
 				</a>
 			</li>
+			<li>
+				<a href="/rowers/history/">
+					<i class="fas fa-history fa-fw"></i>&nbsp;History
+				</a>
+			</li>
 		</ul>
 	</li>
 	<li>