diff --git a/build/css/main.css b/build/css/main.css index b342f29b..c10d7ec8 100644 --- a/build/css/main.css +++ b/build/css/main.css @@ -6540,6 +6540,13 @@ body { color: #85898c; font-size: 10px; } +.step-footer-split { + margin-left: auto; + margin-right: auto; + display: flex; + justify-content: space-between; + max-width: 170px; } + .step-footer-underline { border-bottom: 1px dotted; padding-bottom: 2px; } diff --git a/lib/gui/app.js b/lib/gui/app.js index 007a928d..858c86e3 100644 --- a/lib/gui/app.js +++ b/lib/gui/app.js @@ -26,6 +26,7 @@ const _ = require('lodash'); const app = angular.module('Etcher', [ require('angular-ui-router'), require('angular-ui-bootstrap'), + require('angular-moment'), // Etcher modules require('./modules/drive-scanner'), @@ -136,7 +137,7 @@ app.controller('AppController', function( } NotifierService.subscribe($scope, 'image-writer:state', function(state) { - AnalyticsService.log(`Progress (${state.type}): ${state.progress}% at ${state.speed} MB/s`); + AnalyticsService.log(`Progress (${state.type}): ${state.progress}% at ${state.speed} MB/s (eta ${state.eta}s)`); OSWindowProgressService.set(state.progress); }); diff --git a/lib/gui/modules/image-writer.js b/lib/gui/modules/image-writer.js index a89f4653..397a9e04 100644 --- a/lib/gui/modules/image-writer.js +++ b/lib/gui/modules/image-writer.js @@ -229,6 +229,7 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel, self.state = { type: state.type, progress: state.percentage, + eta: state.eta, // Transform bytes to megabytes preserving only two decimal places speed: Math.floor(state.speed / 1e+6 * 100) / 100 || 0 diff --git a/lib/gui/partials/main.html b/lib/gui/partials/main.html index 628d43ae..c6c0660e 100644 --- a/lib/gui/partials/main.html +++ b/lib/gui/partials/main.html @@ -104,9 +104,13 @@ Retry -
+ diff --git a/lib/gui/scss/main.scss b/lib/gui/scss/main.scss index 432f14b7..4c7c9c2d 100644 --- a/lib/gui/scss/main.scss +++ b/lib/gui/scss/main.scss @@ -164,6 +164,14 @@ body { font-size: 10px; } +.step-footer-split { + margin-left: auto; + margin-right: auto; + display: flex; + justify-content: space-between; + max-width: $btn-min-width; +} + .step-footer-underline { border-bottom: 1px dotted; padding-bottom: 2px; diff --git a/package.json b/package.json index 829e2107..52ce1b1a 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ }, "dependencies": { "angular": "^1.5.3", + "angular-moment": "^1.0.0-beta.6", "angular-q-promisify": "^1.1.0", "angular-ui-bootstrap": "^1.3.2", "angular-ui-router": "^0.2.18",