diff --git a/src/views/settings.html b/src/views/settings.html index 45327271d..05c3c3466 100644 --- a/src/views/settings.html +++ b/src/views/settings.html @@ -154,49 +154,63 @@
+
-
- A Cloudron subscription provides access to the Cloudron App Store. This ensures you are running the latest version and keeps your apps and server secure. -
+
+

+
+
+
+
+
+
+ A Cloudron account provides access to the Cloudron App Store. This ensures you are running the latest versions to keep your apps and server secure. +

-
-
- Account Email -
-
- {{ subscription.email }} -
+
+
+ Setup Account +
-
-
- Cloudron ID -
-
- {{ subscription.cloudronId }} -
+
+
+ Account Email +
+
+ {{ subscription.email }} +
-
-
- Subscription -
-
- {{ subscription.plan.name }} -
+
+
+ Cloudron ID +
+
+ {{ subscription.cloudronId }} +
-
-
- Canceled and ends on {{ (subscription.cancel_at*1000) | prettyShortDate }} -
+
+
+ Subscription +
+
+ {{ subscription.plan.name }} +
+
+
+
+ Canceled and ends on {{ (subscription.cancel_at*1000) | prettyShortDate }} +

-
-
- Change Subscription - Reactivate Subscription - Setup Subscription -
+
+
+ Change Subscription + Reactivate Subscription + Setup Subscription +
+
diff --git a/src/views/settings.js b/src/views/settings.js index 4cbfb6e8e..a8916bc76 100644 --- a/src/views/settings.js +++ b/src/views/settings.js @@ -12,6 +12,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca $scope.installedApps = Client.getInstalledApps(); $scope.subscription = null; + $scope.subscriptionBusy = true; $scope.prettyProviderName = function (provider) { switch (provider) { @@ -307,7 +308,12 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca } function getSubscription() { + $scope.subscriptionBusy = true; + Client.getSubscription(function (error, result) { + $scope.subscriptionBusy = false; + + if (error && error.statusCode === 412) return; // not yet registered if (error) return console.error(error); if (!$scope.$parent) return; // user changed view. otherwise we get an error that $scope.$parent is null