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

Fixes to the update dialog logic

Browse Source
This commit is contained in:
Johannes Zellner
2017-06-08 17:44:29 +02:00
parent 89878ff9ad
commit fb4f13eb13
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webadmin/src/index.html
View File

@@ -171,8 +171,7 @@
</p>
</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&email=' + appstoreConfig.profile.email }}" target="_blank">Setup Update Subscription</a>
<a class="btn btn-success" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.email + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank">Choose Your Options</a>
</div>
</div>
</div>
@@ -199,8 +198,7 @@
<ul class="nav navbar-nav navbar-right">
<li ng-show="config.update.box && user.admin">
<a ng-href="" ng-click="showUpdateModal(update_form)" style="cursor: pointer">
<span ng-show="config.update.box.version !== '1.0.0' || config.provider === 'caas'" class="badge badge-success">Update available</span>
<span ng-show="config.update.box.version === '1.0.0' && config.provider !== 'caas'" class="badge badge-success">Setup Cloudron Subscription</span>
<span class="badge badge-success">Update available</span>
</a>
</li>
<li>