Merge branch 'dev'

.gitignore

@@ -1,3 +1,4 @@
+app/tmp
 *.version
 app/scripts/config.js
 pkg/build-info

README.md

@@ -1,22 +1,4 @@
-How to use
-----------
-- Install yeoman if not installed: 'npm install yeoman -g'
-- Clone the repo
-- 'yeoman server'
+About
+-----
 
-BUGS:
-- Firefox: gives 415
-
-Features missing
--------------
-- Change ram, quota, resolvers. Packages?
-- User profile with ssh managment
-- Funkyer way to select datasets.
-- Funkyer way to create vm's http://www.orionvm.com.au/pricing
-- Use this: http://mgcrea.github.com/angular-strap
-- Keystrokes
-
-Things that could be done
---------------------------
-- When another user creates a VM, show the new vm in the list (requires: howl to notify 'look, there is a new channel')
-  (Security considerations)
+Jingles is the Web UI of FiFo. More into at http://project-fifo.net/

app/index.html

@@ -119,6 +119,7 @@ <h3>{{title}}</h3>
           <nav-tab href="#/virtual-machines" icon="display">Machines</nav-tab>
           <nav-tab href="#/datasets" icon="hdd">Datasets</nav-tab>
           <nav-tab href="#/hypervisors" icon="cloud">Hypervisors</nav-tab>
+          <nav-tab href="#/graph" icon="snowflake">CloudView</nav-tab>
           <nav-tab href="#/packages" icon="cargo">Packages</nav-tab>
           <nav-tab href="#/networks" icon="share_alt">Networks</nav-tab>
           <nav-tab href="#/dtrace" icon="stats">DTrace</nav-tab>
@@ -185,6 +186,7 @@ <h3>{{title}}</h3>
     <script src="scripts/controllers/new_package.js"></script>
     <script src="scripts/controllers/new_network.js"></script>
     <script src="scripts/controllers/about.js"></script>
+    <script src="scripts/controllers/graph.js"></script>
     <script src="scripts/services/wiggle.js"></script>
     <script src="scripts/services/datasetsat.js"></script>
     <script src="scripts/services/howl.js"></script>

app/scripts/app.js

@@ -107,6 +107,10 @@ var fifoApp = angular.module('fifoApp', ['ngResource', 'ngCookies', 'fifoHooks']
         templateUrl: 'views/about.html',
         controller: 'AboutCtrl'
     })
+    .when('/graph', {
+        templateUrl: 'views/graph.html',
+        controller: 'GraphCtrl'
+    })
 
     .otherwise({
         redirectTo: '/status'
@@ -120,7 +124,7 @@ var fifoApp = angular.module('fifoApp', ['ngResource', 'ngCookies', 'fifoHooks']
     /* This is an accepted bug in angularjs.. 1.1.1 has this 'fixed' */
     delete $http.defaults.headers.common['X-Requested-With']
 
-    var token = $cookies["X-Snarl-Token"];
+    var token = $cookies["x-snarl-token"];
 
     if (token)
         wiggle.sessions.get({id: token},

app/scripts/config.js.example

@@ -26,6 +26,9 @@ Config = {
     */
     datasets: 'datasets.at',
 
+     /* Polling interval in seconds for checking if there is a new VM */
+     newVmPolling: false,
+
      /* Time in seconds to wait to show the force stop button for the VM's */
      timeForceButton: 10,