diff --git a/app/app.js b/app/app.js index 3e0faba21..d41c7e039 100644 --- a/app/app.js +++ b/app/app.js @@ -6,7 +6,7 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services' $routeProvider.when('/containers/:id/', {templateUrl: 'app/components/container/container.html', controller: 'ContainerController'}); $routeProvider.when('/containers/:id/logs/', {templateUrl: 'app/components/containerLogs/containerlogs.html', controller: 'ContainerLogsController'}); $routeProvider.when('/images/', {templateUrl: 'app/components/images/images.html', controller: 'ImagesController'}); - $routeProvider.when('/images/:id/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'}); + $routeProvider.when('/images/:id*/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'}); $routeProvider.when('/info', {templateUrl: 'app/components/info/info.html', controller: 'InfoController'}); $routeProvider.otherwise({redirectTo: '/'}); }]) diff --git a/app/components/container/container.html b/app/components/container/container.html index 6bacb011e..e192a2ce0 100644 --- a/app/components/container/container.html +++ b/app/components/container/container.html @@ -60,7 +60,7 @@ diff --git a/app/components/containerLogs/containerLogsController.js b/app/components/containerLogs/containerLogsController.js index 97db2a5b9..458c8b091 100644 --- a/app/components/containerLogs/containerLogsController.js +++ b/app/components/containerLogs/containerLogsController.js @@ -27,8 +27,12 @@ function($scope, $routeParams, $location, $anchorScroll, ContainerLogs, Containe timestamps: $scope.showTimestamps, tail: $scope.tailLines }, function(data, status, headers, config) { - // Replace carriage returns twith newlines to clean up output - $scope.stdout = data.replace(/[\r]/g, '\n'); + // Replace carriage returns with newlines to clean up output + data = data.replace(/[\r]/g, '\n') + // Strip 8 byte header from each line of output + data = data.substring(8); + data = data.replace(/\n(.{8})/g, '\n'); + $scope.stdout = data; ViewSpinner.stop(); }); @@ -38,7 +42,12 @@ function($scope, $routeParams, $location, $anchorScroll, ContainerLogs, Containe timestamps: $scope.showTimestamps, tail: $scope.tailLines }, function(data, status, headers, config) { - $scope.stderr = data.replace(/[\r]/g, '\n'); + // Replace carriage returns with newlines to clean up output + data = data.replace(/[\r]/g, '\n') + // Strip 8 byte header from each line of output + data = data.substring(8); + data = data.replace(/\n(.{8})/g, '\n'); + $scope.stderr = data; ViewSpinner.stop(); }); } diff --git a/app/components/dashboard/dashboard.html b/app/components/dashboard/dashboard.html index 037516ad0..7dd6f34dc 100644 --- a/app/components/dashboard/dashboard.html +++ b/app/components/dashboard/dashboard.html @@ -27,7 +27,7 @@

Status

- Get a better browser... Your holding everyone back. +

You are using an outdated browser. Please upgrade your browser to improve your experience.

@@ -38,11 +38,11 @@

Containers created

- Get a better browser... You're holding everyone back. +

You are using an outdated browser. Please upgrade your browser to improve your experience.

Images created

- Get a better browser... You're holding everyone back. +

You are using an outdated browser. Please upgrade your browser to improve your experience.

diff --git a/app/components/image/image.html b/app/components/image/image.html index cfb8c2638..9a76eeb5d 100644 --- a/app/components/image/image.html +++ b/app/components/image/image.html @@ -15,7 +15,7 @@

Containers created:

- Get a better broswer... Your holding everyone back. +

You are using an outdated browser. Please upgrade your browser to improve your experience.