diff --git a/digitalglarus/mixins.py b/digitalglarus/mixins.py index 54b738d2..7c214e14 100644 --- a/digitalglarus/mixins.py +++ b/digitalglarus/mixins.py @@ -48,7 +48,6 @@ class Ordereable(models.Model): @classmethod def create(cls, data): stripe_charge = data.pop('stripe_charge', None) - # del(data['status']) instance = cls.objects.create(**data) if not stripe_charge: return instance diff --git a/digitalglarus/templates/digitalglarus/membership_deactivated.html b/digitalglarus/templates/digitalglarus/membership_deactivated.html index 4283b8b5..9eeb5c39 100644 --- a/digitalglarus/templates/digitalglarus/membership_deactivated.html +++ b/digitalglarus/templates/digitalglarus/membership_deactivated.html @@ -19,6 +19,10 @@ text-align: center; } + .space-above { + margin-top: 10px; + } + </style> <section id="price"> @@ -40,8 +44,8 @@ <form method="POST" action=""> {% csrf_token %} - <button type="button" class="btn btn-primary btn-blue" data-toggle="modal" data-target="#cancel-subscription-modal">Cancel my Membership</button> - <a class="btn btn-primary btn-blue" href="{{request.META.HTTP_REFERER}}">Go back</a> + <button type="button" class="btn btn-primary btn-blue space-above" data-toggle="modal" data-target="#cancel-subscription-modal">Cancel my Membership</button> + <a class="btn btn-primary btn-grey space-above" href="{{request.META.HTTP_REFERER}}">Go back</a> diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html index d73f4fab..c6360d16 100644 --- a/digitalglarus/templates/digitalglarus/membership_payment.html +++ b/digitalglarus/templates/digitalglarus/membership_payment.html @@ -20,6 +20,7 @@ } @media screen and (min-width: 768px) { + } #cancel-subscription-modal .modal-dialog {width:1000px;} @@ -129,7 +130,7 @@ <span class="custom-control-description">I accept the Digital Glarus <a data-toggle="modal" data-target="#cancel-subscription-modal" target="_blank">Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span> </label> <div class="row"> - <div class="col-xs-6 col-md-12"> + <div class="col-xs-6 col-md-6 col-xs-offset-1 col-md-offset-3"> <button class="btn btn-primary btn-md btn-blck submit-payment" type="submit">Purchase membership</button> </div> </div> diff --git a/digitalglarus/templates/digitalglarus/terms.html b/digitalglarus/templates/digitalglarus/terms.html index e5bbaa81..dc2c48c3 100755 --- a/digitalglarus/templates/digitalglarus/terms.html +++ b/digitalglarus/templates/digitalglarus/terms.html @@ -51,7 +51,7 @@ <section id="price"> <div class="container"> <div class="row col-md-2 text-center wow fadeInDown"></div> - <div class="row col-md-8 text-center wow fadeInDown"> + <div class="row col-md-8 col-sm-6 text-center wow fadeInDown"> <div class="price-box"> <span class="glyphicon glyphicon-flag"></span> <h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2> @@ -86,7 +86,13 @@ </p> <div class="text-center"> - <a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a> + <div class="row"> + <div class="col-sm-3 col-md-offset-4"> + <a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a> + + </div> + + </div> </div> <div class="row col-md-2 text-center wow fadeInDown"> </div>