From 26bc61c101a7422be0634852966f89ab549eb58c Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <mokaddem.sami@gmail.com>
Date: Fri, 27 Oct 2017 22:19:51 +0200
Subject: [PATCH] Added MISP logo

---
 templates/geo.html   | 2 +-
 templates/index.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/geo.html b/templates/geo.html
index a0aab9d..9b30b0f 100644
--- a/templates/geo.html
+++ b/templates/geo.html
@@ -72,7 +72,7 @@ small {
         <!-- Navigation -->
         <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0; padding-left: 15px;">
             <div class="navbar-header">
-                <a class="navbar-brand dropdown-toggle" data-toggle="dropdown" href="#">MISP Geolocalisation
+                <img src="{{ url_for('static', filename='pics/MISP.png') }}" alt="MISP" style="float: left; height: 40px; margin-top: 5px;"><a class="navbar-brand dropdown-toggle" data-toggle="dropdown" href="#">MISP Geolocalisation
                     <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                       <li><a href="{{ url_for('index') }}">MISP Live Dashboard</a></li>
diff --git a/templates/index.html b/templates/index.html
index 9c1066b..8341f1e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -111,7 +111,7 @@ small {
         <!-- Navigation -->
         <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0; padding-left: 15px;">
             <div class="navbar-header">
-                <img src="{{ url_for('static', filename='pics/MISP.png') }}" alt="MISP"><a class="navbar-brand dropdown-toggle" data-toggle="dropdown" href="#">MISP Live Dashboard
+                <img src="{{ url_for('static', filename='pics/MISP.png') }}" alt="MISP" style="float: left; height: 40px; margin-top: 5px;"><a class="navbar-brand dropdown-toggle" data-toggle="dropdown" href="#">MISP Live Dashboard
                     <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                       <li><a href="{{ url_for('index') }}">MISP Live Dashboard</a></li>
@@ -237,7 +237,7 @@ small {
     <script src="{{ url_for('static', filename='js/jquery.flot.pie.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/jquery.flot.resize.js') }}"></script>
     <!-- Bootstrap Core JavaScript -->
-    <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/bootstrap.js') }}"></script>
     <!-- Index -->
     <script> 
         /* URL */