diff options
| -rw-r--r-- | public/assets/javascripts/ui/site/EditSubscriptionModal.js | 7 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 23 | ||||
| -rw-r--r-- | views/partials/edit-subscription.ejs | 5 |
3 files changed, 27 insertions, 8 deletions
diff --git a/public/assets/javascripts/ui/site/EditSubscriptionModal.js b/public/assets/javascripts/ui/site/EditSubscriptionModal.js index 0d54d8f..6823740 100644 --- a/public/assets/javascripts/ui/site/EditSubscriptionModal.js +++ b/public/assets/javascripts/ui/site/EditSubscriptionModal.js @@ -10,7 +10,8 @@ var EditSubscriptionModal = ModalView.extend({ subscriber: null, events: { - "click [data-role='upgradeSubscription']": 'upgradeSubscription', + "click [data-role='addLayouts']": 'addLayouts', + "click [data-role='changePlan']": 'changePlan', "click [data-role='cancelSubscription']": 'cancelSubscription', "click .gear": 'sync', "click .planList button": 'followLink', @@ -141,11 +142,11 @@ var EditSubscriptionModal = ModalView.extend({ }) }, - update: function(){ + update: function(data){ $.ajax({ url: this.updateAction, type: "put", - data: { _csrf: this.$csrf.val() }, + data: { _csrf: $("[name=_csrf]").val() }, success: function(data){ } }) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index bedf2c4..2570bb2 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -985,12 +985,15 @@ iframe.embed { left: 10px; opacity: 0.1; cursor: pointer; + -webkit-transition: all 0.3s; + -webkit-transform-origin: 49% 53%; transition: all 0.3s; + transform-origin: 49% 53%; } .editSubscription .gear.turning { opacity: 0.3; - -webkit-animation: gear 1s; - animation: gear 1s; + -webkit-animation: gear 1s infinite linear; + animation: gear 1s infinite linear; } @-webkit-keyframes gear { from { transform: rotate(0deg); } @@ -1027,6 +1030,22 @@ iframe.embed { .totalRow td:nth-child(4) { border-top: 1px solid; } +.paidPlan button { + width: 200px; + float: none; + margin: 5px 7px; +} +.paidPlan [data-role="cancelSubscription"] { + color: red; + width: 200px; + float: none; +} +.paidPlan [data-role="cancelSubscription"]:hover { + color: white; + background: red; + border-color: red; +} + /* LAYOUTS MODAL */ diff --git a/views/partials/edit-subscription.ejs b/views/partials/edit-subscription.ejs index 266d43b..8599fb5 100644 --- a/views/partials/edit-subscription.ejs +++ b/views/partials/edit-subscription.ejs @@ -28,14 +28,12 @@ <td><span data-role="basicLayoutQuantity"></span></td> <td>each $<span data-role="basicLayoutCost"></span>/<span data-role="billingInterval"></span></td> <td>$<span data-role="basicLayoutTotal"></span>/<span data-role="billingInterval"></span></td> - <td>Buy more</td> </tr> <tr class="proLayoutRow"> <th>Additional Pro layouts</th> <td><span data-role="proLayoutQuantity"></span></td> <td>@ $<span data-role="proLayoutCost"></span> ...</td> <td>$<span data-role="proLayoutTotal"></span>/<span data-role="billingInterval"></span></td> - <td>Buy more</td> </tr> <tr class="totalRow"> <td></td> @@ -44,7 +42,8 @@ <td>$<span data-role="planTotal"></span>/<span data-role="billingInterval"></span></td> </tr> </table> - <button data-role="upgradeSubscription">Upgrade your subscription</button> + <button data-role="addLayouts">Add more layouts</button> + <button data-role="changePlan">Upgrade your plan</button> <button data-role="cancelSubscription">Cancel your subscription</button> </li> <div class="gear"><span class="ion-gear-a"></span></div> |