ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

modal fixed

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

124
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>
@ -205,62 +209,68 @@
</div> </div>
</section> </section>
<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-body"> <div class="modal-header">
<section id="price2"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="container"> </div>
<!--<div class="row col-md-2 text-center wow fadeInDown"></div> --> <div class="modal-body">
<div class="row col-xs-12 col-sm-7 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> <section id="price2">
<div class="price-box"> <div class="container">
<span class="glyphicon glyphicon-flag"></span> <!--<div class="row col-md-2 text-center wow fadeInDown"></div> -->
<h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2> <div class="row col-xs-12 col-sm-12 col-lg-6 text-center wow fadeInDown">
<h2 class="price">Valid from 31 October 2016, v1.0 dated 31 October 2016</h2> <div class="price-box">
<hr class="primary"> <span class="glyphicon glyphicon-flag"></span>
<div class="price-exp-box"> <h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2>
<p class="text-center"> <h2 class="price">Valid from 31 October 2016, v1.0 dated 31 October 2016</h2>
<p class="term-head">1. Membership</p> <hr class="primary">
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> <div class="price-exp-box">
1.2. Each additional day costs 15CHF for members.<br> <p class="text-left">
<br> <p class="term-head">1. Membership</p>
<p class="term-head">2. Coworking days</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>
2.1. Coworking days are counted as 1 calendar day. <br> 1.2. Each additional day costs 15CHF for members.<br>
2.2. Free coworking days are included in the membership. <br> <br>
2.3. Unused working days are not refunded and can not be compensated for. <br><br> <p class="term-head">2. Coworking days</p>
<p class="term-head">3. Possible reduction</p> 2.1. Coworking days are counted as 1 calendar day. <br>
3.1. Your first month's membership fee is calculated according to the date of your subscription. <br> 2.2. Free coworking days are included in the membership. <br>
3.2. The days already passed in the first month are discounted from the first month's membership fee.<br> 2.3. Unused working days are not refunded and can not be compensated for. <br><br>
3.3. A member booking more than 19 days for coworking gets a reduction in total cost and will only pay maximum 290CHF per month. The reduction will be applied automatically on Digital Glarus website.<br><br> <p class="term-head">3. Possible reduction</p>
<p class="term-head">4. Member's right to cancellation </p> 3.1. Your first month's membership fee is calculated according to the date of your subscription. <br>
4.1. The member may cancel or change the booking of working day at any time prior to 7 days before the working day with no extra cost. <br> 3.2. The days already passed in the first month are discounted from the first month's membership fee.<br>
4.2. Bookings cancelled less than 7 days before the working date will not be refunded.<br><br> 3.3. A member booking more than 19 days for coworking gets a reduction in total cost and will only pay maximum 290CHF per month. The reduction will be applied automatically on Digital Glarus website.<br><br>
<p class="term-head">5. Digital Glarus' right to cancel a membership </p> <p class="term-head">4. Member's right to cancellation </p>
5.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br> 4.1. The member may cancel or change the booking of working day at any time prior to 7 days before the working day with no extra cost. <br>
5.2. Members disrupting the environment of coworking may be rejected to join the membership.<br><br> 4.2. Bookings cancelled less than 7 days before the working date will not be refunded.<br><br>
<p class="term-head">6. Digital Glarus' right to cancel a membership </p> <p class="term-head">5. Digital Glarus' right to cancel a membership </p>
6.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br> 5.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
6.2. Digital Glarus may reject a member who disrupts the environment of coworking space from joining the membership.<br> 5.2. Members disrupting the environment of coworking may be rejected to join the membership.<br><br>
6.3. Digital Glarus may terminate the membership of a member who disrupts the environment of coworking space. <br> <p class="term-head">6. Digital Glarus' right to cancel a membership </p>
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.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
<br><br> 6.2. Digital Glarus may reject a member who disrupts the environment of coworking space from joining the membership.<br>
</p> 6.3. Digital Glarus may terminate the membership of a member who disrupts the environment of coworking space. <br>
<div class="row col-xs-12 col-sm-7 col-lg-6 text-center"> 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.
<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a> <br><br>
</div>
<div class="row col-md-2 text-center wow fadeInDown"> </p>
</div> <div class="text-center">
</div> <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 class="row col-md-3 text-center wow fadeInDown"></div> </div>
</div> </div>
</section>
</div> </div>
</div><!-- /.modal-content --> </div>
</div><!-- /.modal-dialog --> <div class="row col-md-3 text-center wow fadeInDown"></div>
</div><!-- /.modal --> </div>
</section>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->

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'
} }
} }