Merge pull request #4 from ninSmith/master

ninSmith · web-flow · commit c1121a6409c3 · 2016-11-08T23:04:36.000+01:00
Fixes to issues #1, #2, #3, #5, #6
diff --git a/core/static/bower.json b/core/static/bower.json
@@ -6,7 +6,8 @@
     "angular-ui-router": "~0.2.15",
     "angular-chart.js": "~0.8.5",
     "angular-bootstrap": "~1.3.3",
-    "angular-ui-notification": "^0.2.0"
+    "angular-ui-notification": "^0.2.0",
+    "bootstrap": "^3.3.7"
   },
   "resolutions": {
     "angular": "^1.5.0"
diff --git a/core/templates/error.html b/core/templates/error.html
@@ -2,10 +2,19 @@
 <html>
 	<head>
 		<title>Hippocampe</title>
-		<link rel="stylesheet" href="css/bootstrap.min.css" media= "screen" title="no title" charset="utf-8">
+		<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css" media= "screen" title="no title" charset="utf-8">
 		<script src="bower_components/angular/angular.js" charset="utf-8"></script>
 		<script src="bower_components/angular-bootstrap/ui-bootstrap.js" charset="utf-8"></script>
 		<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js" charset="utf-8"></script>
+		
+		<link rel="apple-touch-icon" sizes="180x180" href="images/apple-touch-icon.png">
+                <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32">
+                <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16">
+                <link rel="manifest" href="images/manifest.json">
+                <link rel="mask-icon" href="images/safari-pinned-tab.svg" color="#5bbad5">
+                <meta name="apple-mobile-web-app-title" content="hippocampe">
+                <meta name="application-name" content="hippocampe">
+                <meta name="theme-color" content="#ffffff">
 
 		<!-- CSS -->	
 		<style type="text/css">
diff --git a/docs/install_guide.md b/docs/install_guide.md
@@ -17,9 +17,10 @@ Hippocampe needs some external tools to work, you will find below the list of re
     + flask
     + python-dateutil
     + apscheduler
+    + requests
 
 ```
-pip install elasticsearch Configparser netaddr flask python-dateutil apscheduler
+pip install elasticsearch Configparser netaddr flask python-dateutil apscheduler requests
 ```
 
 ##Configuration
@@ -34,8 +35,18 @@ threadpool.search.queue_size: 10000
 threadpool.search.type: cached
 ```
 
+If elasticsearch and Hippocampe are on the same host, it might be a good idea to restrict the access to elasticsearch to localhost only in ```/etc/elasticsearch/elasticsearch.yml```:
+```
+network.host: 127.0.0.1
+```
+
 ##Installation
 * Clone or download the project
+* Install the web dependencies with bower (https://bower.io/)
+```
+cd Hippocampe/core/static
+bower install
+```
 * Start elasticsearch
 ```
 service elasticsearch start
@@ -49,7 +60,10 @@ By default, Hippocampe is listening on port 5000.
 ##docker
 If you just want to give it a try, you may want to use Hippocampe inside a docker:
 
-+ Launch ```Hippocampe/packaging/build.sh```
-+ Launch ```Hippocampe/packaging/run.sh```
+```
+cd Hippocampe/core
+docker build -t hippocampe .
+docker run -p 5000:5000 hippocampe 
+```
 
-Now Hippocampe is available on port 5000 and runs inside a docker. 
+Now Hippocampe is available on port 5000 and runs inside a docker. 
