mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

modal fixed

Browse source
This commit is contained in:
unknown 2017-01-10 18:32:53 -04:00
commit cc7a670d2d
2 changed files with 69 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

20
digitalglarus/templates/digitalglarus/booking_payment.html
View file

@ -147,7 +147,11 @@
<div class="order-box"> <div class="order-box">
<h3 class="col-xs-6 order-item">Dates {{start_date}} - {{end_date}}</h3> <h3 class="col-xs-6 order-item">Dates {{start_date}} - {{end_date}}</h3>
<p class="order-bottom-text"> <p class="order-bottom-text">
<a href="{{request.META.HTTP_REFERER}}">Change dates</a> <!-- <a href="{{request.META.HTTP_REFERER}}">Change dates</a> -->
<a href="{% url 'digitalglarus:booking' %}">Change dates</a>
</p> </p>
<hr class="greyline"> <hr class="greyline">
<h2 class="col-xs-6 payment-total">Total days: {{booking_days}} </h2> <h2 class="col-xs-6 payment-total">Total days: {{booking_days}} </h2>
@ -208,19 +212,22 @@
<div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog" aria-hidden ="true"> <div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog" aria-hidden ="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body"> <div class="modal-body">
<section id="price2"> <section id="price2">
<div class="container"> <div class="container">
<!--<div class="row col-md-2 text-center wow fadeInDown"></div> --> <!--<div class="row col-md-2 text-center wow fadeInDown"></div> -->
<div class="row col-xs-12 col-sm-7 col-lg-6 text-center wow fadeInDown"> <div class="row col-xs-12 col-sm-12 col-lg-6 text-center wow fadeInDown">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="price-box"> <div class="price-box">
<span class="glyphicon glyphicon-flag"></span> <span class="glyphicon glyphicon-flag"></span>
<h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2> <h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2>
<h2 class="price">Valid from 31 October 2016, v1.0 dated 31 October 2016</h2> <h2 class="price">Valid from 31 October 2016, v1.0 dated 31 October 2016</h2>
<hr class="primary"> <hr class="primary">
<div class="price-exp-box"> <div class="price-exp-box">
<p class="text-center"> <p class="text-left">
<p class="term-head">1. Membership</p> <p class="term-head">1. Membership</p>
1.1. The membership fee is 35CHF per month and charged on the 1st day of each month after your first month of subscription. <br> 1.1. The membership fee is 35CHF per month and charged on the 1st day of each month after your first month of subscription. <br>
1.2. Each additional day costs 15CHF for members.<br> 1.2. Each additional day costs 15CHF for members.<br>
@ -245,13 +252,15 @@
6.3. Digital Glarus may terminate the membership of a member who disrupts the environment of coworking space. <br> 6.3. Digital Glarus may terminate the membership of a member who disrupts the environment of coworking space. <br>
6.4. Digital Glarus may expell a member who disrupts the environment of coworking space from the coworking space, stating the reasons for the expulsion. 6.4. Digital Glarus may expell a member who disrupts the environment of coworking space from the coworking space, stating the reasons for the expulsion.
<br><br> <br><br>
</p> </p>
<div class="row col-xs-12 col-sm-7 col-lg-6 text-center"> <div class="text-center">
<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a> <a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
</div> </div>
<div class="row col-md-2 text-center wow fadeInDown"> <div class="row col-md-2 text-center wow fadeInDown">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row col-md-3 text-center wow fadeInDown"></div> <div class="row col-md-3 text-center wow fadeInDown"></div>
@ -265,6 +274,7 @@
<!-- stripe key data --> <!-- stripe key data -->
{% if stripe_key %} {% if stripe_key %}
<script type="text/javascript"> <script type="text/javascript">

4
dynamicweb/settings/base.py
View file

@ -182,9 +182,7 @@ CMS_TEMPLATES = (
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2', 'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'app', 'NAME': 'app'
'USER': 'app',
'HOST': 'db'
} }
} }