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

Remove subscription setup modal, instead open cloudron.io directly

Browse Source
This commit is contained in:
Johannes Zellner
2020-02-14 14:16:04 +01:00
parent 9fcd049bdc
commit 21e7190b72
3 changed files with 34 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/index.html
View File

@@ -95,24 +95,6 @@
<a class="offline-banner animateMe" ng-show="client.offline" ng-cloak href="https://cloudron.io/documentation/troubleshooting/" target="_blank"><i class="fa fa-circle-notch fa-spin"></i> Cloudron is offline. Reconnecting...</a>
<!-- Modal setup subscription -->
<div class="modal fade" id="setupSubscriptionModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Setup Subscription</h4>
</div>
<div class="modal-body">
<iframe ng-show="subscription.plan.id === 'free'" ng-src="{{ config.webServerOrigin + '/helper/setup_subscription_info.html?email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 100px; border: none;"></iframe>
<iframe ng-show="subscription.plan.id === 'expired'" ng-src="{{ config.webServerOrigin + '/helper/subscription_expired.html?email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 100px; border: none;"></iframe>
</div>
<div class="modal-footer">
</div>
</div>
</div>
</div>
<div class="animateMe ng-hide layout-root" ng-show="initialized">
<!-- Navigation -->
@@ -131,15 +113,11 @@
<!-- /.navbar-header -->
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right" ng-hide="hideNavBarActions">
<li ng-show="subscription.plan.id === 'free'">
<a ng-href="" ng-click="showSubscriptionModal()" style="cursor: pointer">
<span class="badge badge-success">Setup Subscription</span>
</a>
</li>
<li ng-show="subscription.plan.id === 'expired'">
<a ng-href="" ng-click="showSubscriptionModal()" style="cursor: pointer">
<span class="badge badge-danger">Subscription expired</span>
<ul class="nav navbar-nav navbar-right" ng-hide="hideNavBarActions">
<li ng-show="subscription.plan.id === 'free' || subscription.plan.id === 'expired'">
<a ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" target="_blank" ng-click="pollSubscriptionStatus()" style="cursor: pointer">
<span class="badge badge-success" ng-show="subscription.plan.id === 'free'">Setup Subscription</span>
<span class="badge badge-success" ng-show="subscription.plan.id === 'expired'">Reactivate Subscription</span>
</a>
</li>
<li>