diff --git a/src/js/client.js b/src/js/client.js index 6e3ca4531..a15ef9579 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -67,6 +67,31 @@ var ROLES = { var SECRET_PLACEHOLDER = String.fromCharCode(0x25CF).repeat(8); +// ---------------------------------------------- +// Shared Angular Filters +// ---------------------------------------------- + +// binary units (non SI) 1024 based +function prettyByteSize(size, fallback) { + if (!size) return fallback || 0; + + var i = Math.floor(Math.log(size) / Math.log(1024)); + return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i]; +}; + +angular.module('Application').filter('prettyByteSize', function () { + return function (size, fallback) { return prettyByteSize(size, fallback) || '0 kb'; } +}); + +angular.module('Application').filter('prettyDiskSize', function () { + return function (size, fallback) { return prettyByteSize(size, fallback) || 'Not available yet'; } +}); + + +// ---------------------------------------------- +// Cloudron REST API wrapper +// ---------------------------------------------- + angular.module('Application').service('Client', ['$http', '$interval', '$timeout', 'md5', 'Notification', function ($http, $interval, $timeout, md5, Notification) { var client = null; diff --git a/src/js/index.js b/src/js/index.js index d5927d9ef..cdad370a5 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -278,29 +278,6 @@ app.filter('prettyDomains', function () { }; }); -// we use 1024 unit in memory limit in manifest -app.filter('prettyMemory', function () { - return function (memory) { - return memory ? Math.floor(memory / 1024 / 1024) : 256; - }; -}); - -// df -H style (si) output -app.filter('prettyMailSize', function () { - return function (size) { - if (!size) return '0 kB'; - var i = Math.floor(Math.log(size) / Math.log(1000)); - return (size / Math.pow(1000, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i]; }; -}); - -// df -H style (si) output -app.filter('prettyDiskSize', function () { - return function (size) { - if (!size) return 'Not available yet'; - var i = Math.floor(Math.log(size) / Math.log(1000)); - return (size / Math.pow(1000, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i]; }; -}); - app.filter('installationActive', function () { return function (app) { if (app.installationState === ISTATES.ERROR) return false; diff --git a/src/js/terminal.js b/src/js/terminal.js index c0cdc758c..19b6c4ff6 100644 --- a/src/js/terminal.js +++ b/src/js/terminal.js @@ -6,9 +6,9 @@ /* global ISTATES */ // create main application module -var app = angular.module('Application', ['angular-md5', 'ui-notification']); +angular.module('Application', ['angular-md5', 'ui-notification']); -app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client', function ($scope, $timeout, $location, Client) { +angular.module('Application').controller('TerminalController', ['$scope', '$timeout', '$location', 'Client', function ($scope, $timeout, $location, Client) { var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {}); $scope.config = Client.getConfig(); diff --git a/src/terminal.html b/src/terminal.html index 71ca765bf..79c172b1e 100644 --- a/src/terminal.html +++ b/src/terminal.html @@ -89,7 +89,7 @@

Uploading file to {{ selected.name }}

- {{ (uploadProgress.current/1000/1000).toFixed(2) }}MB (total {{ (uploadProgress.total/1000/1000).toFixed(2) }}MB) + {{ uploadProgress.current | prettyByteSize }} (total {{ uploadProgress.total | prettyByteSize }})
diff --git a/src/views/app.html b/src/views/app.html index d41e0c623..0935cd3df 100644 --- a/src/views/app.html +++ b/src/views/app.html @@ -697,7 +697,7 @@
- +

Cloudron allocates 50% of this value as RAM and 50% as swap.

diff --git a/src/views/appstore.html b/src/views/appstore.html index dfd87b869..c1448524f 100644 --- a/src/views/appstore.html +++ b/src/views/appstore.html @@ -11,7 +11,7 @@
Last updated {{ appInstall.app.creationDate | prettyDate }}
- Requires atleast {{ appInstall.app.manifest.memoryLimit | prettyMemory }}MB memory + Requires atleast {{ appInstall.app.manifest.memoryLimit | prettyByteSize }} memory
diff --git a/src/views/email.html b/src/views/email.html index d5d351080..115d8cb89 100644 --- a/src/views/email.html +++ b/src/views/email.html @@ -356,7 +356,7 @@ {{ alias.name + '@' + alias.domain }} - {{ mailbox.usage | prettyMailSize }} + {{ mailbox.usage | prettyByteSize }} diff --git a/src/views/emails.html b/src/views/emails.html index eebf733ee..085500720 100644 --- a/src/views/emails.html +++ b/src/views/emails.html @@ -72,7 +72,7 @@