Merge branch 'master' into style-polish

Conflicts:
	src/components/ContainerHomeFolders.react.js
	src/components/Containers.react.js
	styles/right-panel.less
	styles/variables.less

CONTRIBUTING.md

@@ -17,8 +17,7 @@ Before you fil an issue or a pull request, quickly read of the following tips on
 
 ### Prerequisites
 
-Most of the time, you'll have installed Kitematic before contibuting, but for the
-sake of completeness, you can also install [Node.js 0.10.38](https://nodejs.org/dist/v0.10.38/).
+- [Node.js 0.10.38](https://nodejs.org/dist/v0.10.38/)
 
 ### Other Prerequisites (Mac)
 - The latest Xcode from the Apple App Store.

README.md

@@ -1,5 +1,4 @@
 [![Build Status](https://travis-ci.org/kitematic/kitematic.svg?branch=master)](https://travis-ci.org/kitematic/kitematic)
-[![Coverage Status](https://coveralls.io/repos/kitematic/kitematic/badge.svg?branch=master)](https://coveralls.io/r/kitematic/kitematic?branch=master)
 [![bitHound Score](https://www.bithound.io/github/kitematic/kitematic/badges/score.svg)](https://www.bithound.io/github/kitematic/kitematic)
 
 
@@ -7,6 +6,8 @@
 
 Kitematic is a simple application for managing Docker containers on Mac OS X and Windows (coming soon).
 
+![Kitematic Screenshot](https://cloud.githubusercontent.com/assets/3325447/8119979/152f1010-104f-11e5-9298-cd3e92b61ec6.png)
+
 ## Installing Kitematic
 
 [Download the latest version](https://kitematic.com/download) of Kitematic.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Kitematic",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "author": "Kitematic",
   "description": "Simple Docker Container management for Mac OS X.",
   "homepage": "https://kitematic.com/",

src/components/ContainerHomeFolders.react.js

@@ -63,7 +63,6 @@ var ContainerHomeFolder = React.createClass({
       return false;
     }
 
-    console.log(this.props.container.Volumes);
     var folders = _.map(_.omit(this.props.container.Volumes, (v, k) => k.indexOf('/Users/') !== -1), (val, key) => {
       var firstFolder = key;
       return (

src/components/Containers.react.js

@@ -160,7 +160,7 @@ var Containers = React.createClass({
             <section className={sidebarHeaderClass}>
               <h4>Containers</h4>
               <div className="create">
-                <Router.Link tabIndex="-1" to="new">
+                <Router.Link to="new">
                   <span className="btn btn-new btn-action has-icon btn-hollow"><span className="icon icon-add"></span>New</span>
                 </Router.Link>
               </div>

src/stores/SetupStore.js

@@ -49,6 +49,8 @@ var _steps = [{
       } catch (err) {
         throw null;
       }
+    } else if (!virtualBox.active()) {
+      yield util.exec(setupUtil.macSudoCmd(util.escapePath('/Library/Application Support/VirtualBox/LaunchDaemons/VirtualBoxStartup.sh') + ' restart'));
     }
   })
 }, {
@@ -157,7 +159,7 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), {
     var vboxNeedsInstall = !virtualBox.installed();
 
     required.download = vboxNeedsInstall && (!fs.existsSync(vboxfile) || setupUtil.checksum(vboxfile) !== virtualBox.checksum());
-    required.install = vboxNeedsInstall;
+    required.install = vboxNeedsInstall || !virtualBox.active();
     required.init = required.install || !(yield machine.exists()) || (yield machine.state()) !== 'Running' || !isoversion || util.compareVersions(isoversion, packagejson['docker-version']) < 0;
 
     var exists = yield machine.exists();

src/utils/SetupUtil.js

@@ -59,7 +59,7 @@ var SetupUtil = {
     }
   },
   macSudoCmd: function (cmd) {
-    return `${util.escapePath(resources.macsudo())} -p "Kitematic requires administrative privileges to install." sh -c \"${cmd}\"`;
+    return `${util.escapePath(resources.macsudo())} -p "Kitematic requires administrative privileges to install and/or start VirtualBox." sh -c \"${cmd}\"`;
   },
   simulateProgress(estimateSeconds, progress) {
     var times = _.range(0, estimateSeconds * 1000, 200);

src/utils/VirtualBoxUtil.js

@@ -23,9 +23,12 @@ var VirtualBox = {
     if(util.isWindows()) {
       return fs.existsSync('C:\\Program Files\\Oracle\\VirtualBox\\VBoxManage.exe') && fs.existsSync('C:\\Program Files\\Oracle\\VirtualBox\\VirtualBox.exe');
     } else {
-      return fs.existsSync('/usr/bin/VBoxManage') && fs.existsSync('/Applications/VirtualBox.app');
+      return fs.existsSync('/usr/bin/VBoxManage') && fs.existsSync('/Applications/VirtualBox.app') && fs.existsSync('/Applications/VirtualBox.app/Contents/MacOS/VBoxManage');
     }
   },
+  active: function () {
+    return fs.existsSync('/dev/vboxnetctl');
+  },
   version: function () {
     return new Promise((resolve, reject) => {
       util.exec([this.command(), '-v']).then(stdout => {

styles/theme.less

@@ -29,6 +29,7 @@ a {
     text-decoration: none;
     color: darken(@brand-action, 10%);
   }
+  outline: 0 !important;
 }
 
 input[type="text"] {