From ce01de459d50980e58bdc6e7987ac9d4628a79aa Mon Sep 17 00:00:00 2001 From: Davide Bongiovanni Date: Wed, 15 Feb 2017 10:26:36 +0100 Subject: [PATCH] Added action display --- static/script.js | 4 ++++ static/style.css | 2 +- templates/status.html | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/static/script.js b/static/script.js index 58f851e..d9566ff 100644 --- a/static/script.js +++ b/static/script.js @@ -41,6 +41,10 @@ $(document).ready(function() { var newElement = '
\
' + dateString + '
\
'; + if (eventHistory[i].action == "fridge") + newElement += ''; + else if (eventHistory[i].action == "tools") + newElement += ''; if (eventHistory[i].name == "") newElement += '' + eventHistory[i].cardID + ''; else diff --git a/static/style.css b/static/style.css index 6cb52bd..0ee0407 100644 --- a/static/style.css +++ b/static/style.css @@ -134,7 +134,7 @@ h1 { height: 60%; left: 35%; padding: 8pt; - position: absolute; + position: absolute; /*Should probably be 'fixed' instead*/ top: -70%; width: 30%; z-index: 201; diff --git a/templates/status.html b/templates/status.html index 78e7dbf..962bf2d 100644 --- a/templates/status.html +++ b/templates/status.html @@ -9,6 +9,7 @@ src="http://code.jquery.com/jquery-3.1.1.js" integrity="sha256-16cdPddA6VdVInumRGo6IbivbERE8p7CQR3HzTBuELA=" crossorigin="anonymous"> +