From 16485576c84e463851bc85b78e4be72f086ffa8c Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Wed, 6 Sep 2017 21:41:12 -0400
Subject: [PATCH] bootstrap needs to be included before jQuery UI, otherwise
 close icon in the dialog will be missing

---
 src/templates/app.html | 7 ++++---
 static/js/init.js      | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/templates/app.html b/src/templates/app.html
index 8d94b4c92..06a26e6a2 100644
--- a/src/templates/app.html
+++ b/src/templates/app.html
@@ -115,6 +115,10 @@
 
     <script src="stat/lib/jquery.min.js"></script>
 
+    <!-- bootstrap needs to be included before jQuery UI, otherwise close icon in the dialog will be missing -->
+    <link href="stat/lib/bootstrap/css/bootstrap.css" rel="stylesheet">
+    <script src="stat/lib/bootstrap/js/bootstrap.js"></script>
+
     <link href="stat/lib/jqueryui/jquery-ui.min.css" rel="stylesheet">
     <script src="stat/lib/jqueryui/jquery-ui.min.js"></script>
 
@@ -122,9 +126,6 @@
     <link href="stat/lib/fancytree/skin-win8/ui.fancytree.css" rel="stylesheet">
     <script src="stat/lib/fancytree/jquery.fancytree-all.js"></script>
 
-    <link href="stat/lib/bootstrap/css/bootstrap.css" rel="stylesheet">
-    <script src="stat/lib/bootstrap/js/bootstrap.js"></script>
-
     <link href="stat/lib/summernote/summernote.css" rel="stylesheet">
     <script src="stat/lib/summernote/summernote.js"></script>
 
diff --git a/static/js/init.js b/static/js/init.js
index 601f75a38..d97adcc12 100644
--- a/static/js/init.js
+++ b/static/js/init.js
@@ -4,8 +4,6 @@ $(function() {
 
         if (fancyTree.length) {
             fancyTree.height($(window).height() - fancyTree.offset().top - 10);
-
-            console.log("height: ", $(window).height() - fancyTree.offset().top - 10);
         }
 
         const noteEditable = $('div.note-editable');