docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #191 from kitematic/setup-polish 

UI Polish
This commit is contained in:
Jeffrey Morgan 2015-02-17 16:15:05 -08:00
parent d454335f4b e8f62ab4d3
commit df559a845f
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
__tests__/util/reset
View File

@ -2,9 +2,12 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
sudo rm -f /usr/local/bin/docker
sudo rm -f /usr/local/bin/boot2docker
rm -rf ~/Library/Application\ Support/Kitematic/ rm -rf ~/Library/Application\ Support/Kitematic/
rm -rf ~/.boot2docker
rm -rf ~/VirtualBox\ VMs/boot2docker-vm
rm -rf ~/Library/VirtualBox/
pkill VBox pkill VBox
pkill VirtualBox pkill VirtualBox
$DIR/VirtualBox_Uninstall.tool $DIR/VirtualBox_Uninstall.tool
rm -rf ~/.boot2docker
rm -rf ~/VirtualBox\ VMs/boot2docker-vm

4
src/Setup.react.js
View File

@ -48,7 +48,7 @@ var Setup = React.createClass({
} }
return ( return (
<div className="contents"> <div className="contents">
<RetinaImage src={img}/> <RetinaImage src={img} checkIfRetinaImgExists={false}/>
<div className="detail"> <div className="detail">
<Radial progress={SetupStore.percent()} thick={true} gray={true}/> <Radial progress={SetupStore.percent()} thick={true} gray={true}/>
</div> </div>
@ -97,7 +97,7 @@ var Setup = React.createClass({
<Header /> <Header />
<div className="image"> <div className="image">
<div className="contents"> <div className="contents">
<RetinaImage img src="install-error.png"/> <RetinaImage src="install-error.png" checkIfRetinaImgExists={false}/>
<div className="detail"> <div className="detail">
</div> </div>
</div> </div>

10
src/SetupStore.js
View File

@ -40,6 +40,10 @@ var _steps = [{
if (!virtualBox.installed() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0) { if (!virtualBox.installed() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0) {
yield virtualBox.killall(); yield virtualBox.killall();
cmd += ' && ' + setupUtil.installVirtualBoxCmd(); cmd += ' && ' + setupUtil.installVirtualBoxCmd();
} else {
if (!setupUtil.needsBinaryFix()) {
return;
}
} }
try { try {
progressCallback(50); // TODO: detect when the installation has started so we can simulate progress progressCallback(50); // TODO: detect when the installation has started so we can simulate progress
@ -139,7 +143,7 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), {
var required = {}; var required = {};
var vboxfile = path.join(util.supportDir(), packagejson['virtualbox-filename']); var vboxfile = path.join(util.supportDir(), packagejson['virtualbox-filename']);
required.download = !virtualBox.installed() && (!fs.existsSync(vboxfile) || setupUtil.checksum(vboxfile) !== packagejson['virtualbox-checksum']); required.download = !virtualBox.installed() && (!fs.existsSync(vboxfile) || setupUtil.checksum(vboxfile) !== packagejson['virtualbox-checksum']);
required.install = !virtualBox.installed() || setupUtil.needsBinaryFix(); required.install = !virtualBox.installed() || setupUtil.needsBinaryFix() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0;
required.init = !(yield boot2docker.exists()) || !isoversion || setupUtil.compareVersions(isoversion, boot2docker.version()) < 0; required.init = !(yield boot2docker.exists()) || !isoversion || setupUtil.compareVersions(isoversion, boot2docker.version()) < 0;
required.start = required.init || (yield boot2docker.status()) !== 'running'; required.start = required.init || (yield boot2docker.status()) !== 'running';
@ -181,9 +185,9 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), {
step.percent = 100; step.percent = 100;
break; break;
} catch (err) { } catch (err) {
console.log('Setup encountered an error.');
console.log(err);
if (err) { if (err) {
console.log(err);
console.log(err.stack);
_error = err; _error = err;
this.emit(this.ERROR_EVENT); this.emit(this.ERROR_EVENT);
} else { } else {

1
styles/containers.less
View File

@ -829,6 +829,7 @@
white-space: pre; white-space: pre;
.logs { .logs {
overflow: auto; overflow: auto;
overflow-x: hidden;
height: 100%; height: 100%;
} }
p { p {

5
styles/setup.less
View File

@ -15,6 +15,11 @@
padding-right: 40px; padding-right: 40px;
padding-left: 80px; padding-left: 80px;
img {
width: 399px;
height: 340px;
}
.contents { .contents {
position: relative; position: relative;
.detail { .detail {