diff --git a/src/index.html b/src/index.html index 77c999104..25eedffe4 100644 --- a/src/index.html +++ b/src/index.html @@ -108,7 +108,7 @@ - {{ config.cloudronName || 'Cloudron' }} + {{ status.cloudronName || 'Cloudron' }} @@ -157,8 +157,8 @@
diff --git a/src/js/login.js b/src/js/login.js index 18fdea09f..d817646d6 100644 --- a/src/js/login.js +++ b/src/js/login.js @@ -32,9 +32,7 @@ app.controller('LoginController', ['$scope', '$http', function ($scope, $http) { $scope.mode = ''; $scope.busy = false; $scope.error = false; - $scope.cloudronName = 'Cloudron'; - $scope.footer = ''; - $scope.version = ''; + $scope.status = null; $scope.username = ''; $scope.password = ''; $scope.totpToken = ''; @@ -139,9 +137,7 @@ app.controller('LoginController', ['$scope', '$http', function ($scope, $http) { if (status !== 200) return; - $scope.cloudronName = data.cloudronName; - $scope.footer = data.footer; - $scope.version = data.version; + $scope.status = data.status; }).error(function () { $scope.initialized = false; }); diff --git a/src/js/setupaccount.js b/src/js/setupaccount.js index 6a8af5097..4bd6dd9d8 100644 --- a/src/js/setupaccount.js +++ b/src/js/setupaccount.js @@ -33,9 +33,7 @@ app.controller('SetupAccountController', ['$scope', '$http', function ($scope, $ $scope.busy = false; $scope.error = null; $scope.view = 'setup'; - $scope.cloudronName = 'Cloudron'; - $scope.footer = ''; - $scope.version = ''; + $scope.status = null; $scope.existingUsername = !!search.username; $scope.username = search.username || ''; @@ -96,9 +94,7 @@ app.controller('SetupAccountController', ['$scope', '$http', function ($scope, $ if (status !== 200) return; - $scope.cloudronName = data.cloudronName; - $scope.footer = data.footer; - $scope.version = data.version; + $scope.status = data; }).error(function () { $scope.initialized = false; }); diff --git a/src/login.html b/src/login.html index 14a77600f..951543c01 100644 --- a/src/login.html +++ b/src/login.html @@ -50,7 +50,7 @@

-

Login to {{ cloudronName }}

+

Login to {{ status.cloudronName || 'Cloudron' }}


@@ -180,8 +180,8 @@ diff --git a/src/setupaccount.html b/src/setupaccount.html index 36777a59d..2aaf8d704 100644 --- a/src/setupaccount.html +++ b/src/setupaccount.html @@ -50,7 +50,7 @@

-

Welcome to {{ cloudronName }}

+

Welcome to {{ status.cloudronName || 'Cloudron' }}

Please setup your account

@@ -136,8 +136,8 @@