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 %} - - - - + {% block controlbar %} +
+
+ {% endblock %} {% endblock %}