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

Allow to specify the appstore subscription helper origins

Browse Source
This commit is contained in:
Johannes Zellner
2019-08-05 20:32:56 +02:00
parent 1d7e73c162
commit 2227e1dd4b
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/index.html
View File

@@ -101,7 +101,7 @@
<h4 class="modal-title">Setup Subscription</h4>
</div>
<div class="modal-body">
<iframe ng-src="{{ 'https://cloudron.io/helper/setup_subscription_info.html?email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 100px; border: none;"></iframe>
<iframe ng-src="{{ config.webServerOrigin + '/helper/setup_subscription_info.html?email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 100px; border: none;"></iframe>
</div>
<div class="modal-footer">
<a class="btn btn-success" ng-click="waitForPlanSelection()" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" target="_blank" ng-disabled="waitingForPlanSelection"><i class="fa fa-circle-notch fa-spin" ng-show="waitingForPlanSelection"></i> Try For Free</a>
@@ -129,7 +129,7 @@
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right" ng-hide="hideNavBarActions">
<li ng-show="subscription.plan && subscription.plan.id === 'free'">
<li ng-show="subscription.plan.id === 'free' || subscription.plan.id === 'expired'">
<a ng-href="" ng-click="showSubscriptionModal()" style="cursor: pointer">
<span class="badge badge-success">Setup Subscription</span>
</a>