jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add version 1.0 welcome dialog

Browse Source
This commit is contained in:
Johannes Zellner
2017-06-06 14:43:21 +02:00
parent b7e3447a46
commit b5f678613b
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
webadmin/src/index.html
View File

@@ -159,6 +159,28 @@
</div>
</div>
<!-- Modal version 1.0 -->
<div class="modal fade" id="version1Modal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<h3>We are happy to announce Cloudron version 1.0!</h3>
<p>
With this release we introduce the Cloudron.io effortless app and platform update subscription.
</p>
<h4 class="text-success">
As an early adopter, you will get a 25% discount.
</h4>
See detailed information <a ng-href="{{ config.webServerOrigin + '/pricing.html' }}" target="_blank">here</a>.
</div>
<div class="modal-footer">
<a class="btn btn-default pull-left" ng-click="showUpdateModalFromVersion1Modal()">Maybe later</a>
<a class="btn btn-success" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions' }}" target="_blank">Setup Update Subscription</a>
</div>
</div>
</div>
</div>
<div class="animateMe ng-hide" ng-show="initialized">
<!-- Navigation -->

26
webadmin/src/js/main.js
View File

@@ -32,17 +32,27 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
window.location.href = '/error.html';
};
$scope.showUpdateModalFromVersion1Modal = function () {
$('#version1Modal').modal('hide');
$('#updateModal').modal('show');
};
$scope.showUpdateModal = function (form) {
$scope.update.error.generic = null;
$scope.update.error.password = null;
$scope.update.password = '';
form.$setPristine();
form.$setUntouched();
if ($scope.currentSubscription.plan && $scope.currentSubscription.plan.id === 'free') {
$('#setupSubscriptionModal').modal('show');
if ($scope.config.update.box.version === '1.0.0') {
$('#version1Modal').modal('show');
} else {
$('#setupSubscriptionModal').modal('show');
}
} else {
$scope.update.error.generic = null;
$scope.update.error.password = null;
$scope.update.password = '';
form.$setPristine();
form.$setUntouched();
$('#updateModal').modal('show');
}
};