From 7708e185360fb06ea852cbd70e2b18d9acc7a223 Mon Sep 17 00:00:00 2001
From: Davide Bongiovanni <davidebo@kth.se>
Date: Wed, 2 Nov 2016 10:48:02 +0100
Subject: [PATCH] Fixed overflow. Added Open fridge and Open tools buttons

---
 server.py             |   8 +-------
 server.pyc            | Bin 4045 -> 4055 bytes
 static/style.css      |   1 +
 templates/status.html |   4 +++-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/server.py b/server.py
index 1075013..9106408 100644
--- a/server.py
+++ b/server.py
@@ -26,18 +26,12 @@ def index():
 @app.route('/status')
 @requires_auth
 def somehtml():
-	#history = []
-	#with open('history.json', 'r') as json_data:
-	#	history = json.load(json_data)
-	#history = history[-15:]
-	#for event in history:
-	#	event['time'] = epochFormat(event['time'])
 	return render_template('status.html')
 
 @app.route('/users')
 @requires_auth
 def users():
-	return 'You have reached Users'
+	return 'This button is actually useless.'
 
 @app.route('/history')
 @requires_auth
diff --git a/server.pyc b/server.pyc
index 8f47eb9a7a46bbd966101fd91fa6194a11eb5a59..0cfba351c51a2baf7f727a23cfbad1e92f77cf40 100644
GIT binary patch
delta 134
zcmX>re_fu9`7<w<(bkP@<!p@1lk3=Y)D##P7(y~KixrYeOG@(d6o9P6<dV|FoSaI9
z(&E&d)Z$`24Ti}9{B~TdK&3#TqGI{UeC+cWRVJ@xU(2XDIhx}Lquyo(PA6tYlg-II
YCQOXsn`iJTFp9G9FbW}KRv=#q07AAQPyhe`

delta 113
zcmcaEe^#E2`7<w<8~aAKayCZJ$#rZxQeq4Y43YVz3K@xIsR~7@iOCtMDGH&*sYS(;
z&#`$js!o<*pU0>*c{}@BM*YdD97h;UHfwP@F*90i&gC&-VvOCqh);o0l#7Q^hy@9=
H0@+Fc3mh9F

diff --git a/static/style.css b/static/style.css
index d26b433..95e347d 100644
--- a/static/style.css
+++ b/static/style.css
@@ -11,6 +11,7 @@ html {
 	top: 0;
 	width: 30%;
 	text-align: center;
+	overflow: scroll;
 }
 
 .event {
diff --git a/templates/status.html b/templates/status.html
index 990f3ee..0959042 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -20,7 +20,9 @@
 	<div class="everything-else">
 		<h1>Card access manager</h1>
 		<br>
-		<a href="/users"><div class="big-button">Users list</div></a>	
+		<a href="/users"><div class="big-button">Open fridge</div></a>
+		<br>
+		<a href="/users"><div class="big-button">Open tools</div></a>	
 	</div>
 	<div class="shadow" onclick="overlay_out()"></div>
 	<div class="overlay">