-
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
{{ tpl.title }}
+
{{ tpl.description }}
+
+
diff --git a/app/directives/widget-custom-header.js b/app/directives/widget-custom-header.js
new file mode 100644
index 000000000..c1444b3f6
--- /dev/null
+++ b/app/directives/widget-custom-header.js
@@ -0,0 +1,15 @@
+angular
+.module('portainer')
+.directive('rdWidgetCustomHeader', function rdWidgetCustomHeader() {
+ var directive = {
+ requires: '^rdWidget',
+ scope: {
+ title: '=',
+ icon: '='
+ },
+ transclude: true,
+ template: '',
+ restrict: 'E'
+ };
+ return directive;
+});
diff --git a/app/shared/filters.js b/app/shared/filters.js
index 339b7f85a..2de2e49c8 100644
--- a/app/shared/filters.js
+++ b/app/shared/filters.js
@@ -123,15 +123,13 @@ angular.module('portainer.filters', [])
})
.filter('humansize', function () {
'use strict';
- return function (bytes) {
- var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
- if (bytes === 0) {
- return 'n/a';
+ return function (bytes, round) {
+ if (!round) {
+ round = 1;
+ }
+ if (bytes || bytes === 0) {
+ return filesize(bytes, {base: 10, round: round});
}
- var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
- var value = bytes / Math.pow(1024, i);
- var decimalPlaces = (i < 1) ? 0 : (i - 1);
- return value.toFixed(decimalPlaces) + ' ' + sizes[[i]];
};
})
.filter('containername', function () {
diff --git a/app/shared/viewmodel.js b/app/shared/viewmodel.js
index b505ac162..921df1ff2 100644
--- a/app/shared/viewmodel.js
+++ b/app/shared/viewmodel.js
@@ -105,6 +105,9 @@ function createEventDetails(event) {
case 'unpause':
details = 'Container ' + eventAttr.name + ' unpaused';
break;
+ case 'attach':
+ details = 'Container ' + eventAttr.name + ' attached';
+ break;
default:
if (event.Action.indexOf('exec_create') === 0) {
details = 'Exec instance created';
@@ -159,6 +162,12 @@ function createEventDetails(event) {
case 'destroy':
details = 'Volume ' + event.Actor.ID + ' deleted';
break;
+ case 'mount':
+ details = 'Volume ' + event.Actor.ID + ' mounted';
+ break;
+ case 'unmount':
+ details = 'Volume ' + event.Actor.ID + ' unmounted';
+ break;
default:
details = 'Unsupported event';
}
diff --git a/assets/css/app.css b/assets/css/app.css
index 38711bdb9..c993c6230 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -216,6 +216,11 @@ input[type="radio"] {
flex-wrap: wrap;
}
+.custom-header-ico {
+ max-width: 16px;
+ max-height: 16px;
+}
+
.container-template {
font-size: 1em;
width: 256px;
diff --git a/assets/ico/apple-touch-icon-precomposed.png b/assets/ico/apple-touch-icon-precomposed.png
index 074c906a8..942ba394b 100644
Binary files a/assets/ico/apple-touch-icon-precomposed.png and b/assets/ico/apple-touch-icon-precomposed.png differ
diff --git a/assets/ico/favicon.ico b/assets/ico/favicon.ico
index 074c906a8..942ba394b 100644
Binary files a/assets/ico/favicon.ico and b/assets/ico/favicon.ico differ
diff --git a/bower.json b/bower.json
index f04b4f56f..0e811c6fb 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "portainer",
- "version": "1.9.0",
+ "version": "1.9.1",
"homepage": "https://github.com/portainer/portainer",
"authors": [
"Anthony Lapenna
"
@@ -34,13 +34,14 @@
"angular-ui-select": "~0.17.1",
"bootstrap": "~3.3.6",
"font-awesome": "~4.6.3",
+ "filesize": "~3.3.0",
"Hover": "2.0.2",
"jquery": "1.11.1",
"jquery.gritter": "1.7.4",
"lodash": "4.12.0",
"rdash-ui": "1.0.*",
"moment": "~2.14.1",
- "xterm.js": "~1.0.0"
+ "xterm.js": "~1.1.3"
},
"resolutions": {
"angular": "1.5.5"
diff --git a/gruntFile.js b/gruntFile.js
index 4b9ae9fb8..f1e4db93b 100644
--- a/gruntFile.js
+++ b/gruntFile.js
@@ -71,6 +71,7 @@ module.exports = function (grunt) {
'bower_components/bootstrap/dist/js/bootstrap.min.js',
'bower_components/Chart.js/Chart.min.js',
'bower_components/lodash/dist/lodash.min.js',
+ 'bower_components/filesize/lib/filesize.min.js',
'bower_components/moment/min/moment.min.js',
'bower_components/xterm.js/src/xterm.js',
'assets/js/jquery.gritter.js', // Using custom version to fix error in minified build due to "use strict"
@@ -274,7 +275,7 @@ module.exports = function (grunt) {
command: [
'docker stop portainer',
'docker rm portainer',
- 'docker run -d -p 9000:9000 -v /tmp/portainer:/data --name portainer portainer -H tcp://10.0.7.10:4000 --swarm -d /data'
+ 'docker run -d -p 9000:9000 -v /tmp/portainer:/data --name portainer portainer -H tcp://10.0.7.10:2375 --swarm -d /data'
].join(';')
},
runSsl: {
diff --git a/index.html b/index.html
index e3db77937..71859a52d 100644
--- a/index.html
+++ b/index.html
@@ -59,13 +59,13 @@
-
-
diff --git a/package.json b/package.json
index e434261d9..62bfd505b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"author": "Portainer.io",
"name": "portainer",
"homepage": "http://portainer.io",
- "version": "1.9.0",
+ "version": "1.9.1",
"repository": {
"type": "git",
"url": "git@github.com:portainer/portainer.git"
diff --git a/test/unit/app/shared/filters.spec.js b/test/unit/app/shared/filters.spec.js
index 5b8bb17d8..ad45d2ace 100644
--- a/test/unit/app/shared/filters.spec.js
+++ b/test/unit/app/shared/filters.spec.js
@@ -82,32 +82,6 @@ describe('filters', function () {
}));
});
- describe('humansize', function () {
- it('should return n/a when size is zero', inject(function (humansizeFilter) {
- expect(humansizeFilter(0)).toBe('n/a');
- }));
-
- it('should handle Bytes values', inject(function (humansizeFilter) {
- expect(humansizeFilter(512)).toBe('512 Bytes');
- }));
-
- it('should handle KB values', inject(function (humansizeFilter) {
- expect(humansizeFilter(5 * 1024)).toBe('5 KB');
- }));
-
- it('should handle MB values', inject(function (humansizeFilter) {
- expect(humansizeFilter(5 * 1024 * 1024)).toBe('5.0 MB');
- }));
-
- it('should handle GB values', inject(function (humansizeFilter) {
- expect(humansizeFilter(5 * 1024 * 1024 * 1024)).toBe('5.00 GB');
- }));
-
- it('should handle TB values', inject(function (humansizeFilter) {
- expect(humansizeFilter(5 * 1024 * 1024 * 1024 * 1024)).toBe('5.000 TB');
- }));
- });
-
describe('containername', function () {
it('should strip the leading slash from container name', inject(function (containernameFilter) {
var container = {