From 53ba981db998f2713175c2cebba3aaf6554e5551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Ates?= <mates@entrouvert.com>
Date: Tue, 3 Nov 2015 18:28:35 +0100
Subject: [PATCH] Start implementing botton control bar.

---
 src/biomon/static/biomon/js/biomon.js | 4 ++--
 src/biomon/templates/biomon/base.html | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/biomon/static/biomon/js/biomon.js b/src/biomon/static/biomon/js/biomon.js
index cfd7d4d..750ec25 100644
--- a/src/biomon/static/biomon/js/biomon.js
+++ b/src/biomon/static/biomon/js/biomon.js
@@ -264,7 +264,7 @@ $(document).ready(function(){
     */
     $('ul#menu li a[href="' + location.pathname + '"]').parent().addClass('active');
 
-    $('div#content-1').css({'height': '100%'});
-    $('div#alerts').css({'height': '94%'});
+//    $('div#content-1').css({'height': '100%'});
+//    $('div#alerts').css({'height': '94%'});
 
 });
diff --git a/src/biomon/templates/biomon/base.html b/src/biomon/templates/biomon/base.html
index e33e4c7..a2c58ea 100644
--- a/src/biomon/templates/biomon/base.html
+++ b/src/biomon/templates/biomon/base.html
@@ -75,10 +75,10 @@
                     {% block content-1-right %}{% endblock %}
                 </div>
             </div>
-<!--            {% block controlbar %}-->
-<!--            <div id="controlbar">-->
-<!--            </div>-->
-<!--            {% endblock %}-->
+            {% block controlbar %}
+            <div id="controlbar">
+            </div>
+            {% endblock %}
             {% endblock %}
         </div>