From cc7a670d2dbc133b93e334b925afbdb9385259c0 Mon Sep 17 00:00:00 2001
From: unknown <nquintero@wbinnova.com>
Date: Tue, 10 Jan 2017 18:32:53 -0400
Subject: [PATCH] modal fixed

---
 .../digitalglarus/booking_payment.html        | 126 ++++++++++--------
 dynamicweb/settings/base.py                   |   4 +-
 2 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/digitalglarus/templates/digitalglarus/booking_payment.html b/digitalglarus/templates/digitalglarus/booking_payment.html
index 79bf3038..97ae1bce 100644
--- a/digitalglarus/templates/digitalglarus/booking_payment.html
+++ b/digitalglarus/templates/digitalglarus/booking_payment.html
@@ -147,7 +147,11 @@
                 <div class="order-box">
                   <h3 class="col-xs-6 order-item">Dates {{start_date}} - {{end_date}}</h3>
                   <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>
                   <hr class="greyline">
                   <h2 class="col-xs-6 payment-total">Total days: {{booking_days}} </h2>
@@ -204,64 +208,70 @@
       </div>
     </div>
   </section>
-  
-<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-content">
-			<div class="modal-body">
-				<section id="price2">
-					<div class="container">
-						<!--<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">
-							<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-								<div class="price-box">
-									<span class="glyphicon glyphicon-flag"></span>
-									<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>
-									<hr class="primary">
-										<div class="price-exp-box">
-											<p class="text-center">
-												<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.2. Each additional day costs 15CHF for members.<br>
-													<br>
-													<p class="term-head">2. Coworking days</p> 
-													2.1. Coworking days are counted as 1 calendar day. <br> 
-													2.2. Free coworking days are included in the membership. <br>
-													2.3. Unused working days are not refunded and can not be compensated for. <br><br>
-													<p class="term-head">3. Possible reduction</p>
-													3.1. Your first month's membership fee is calculated according to the date of your subscription. <br>
-													3.2. The days already passed in the first month are discounted from the first month's membership fee.<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">4. Member's right to cancellation </p>
-													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>
-													4.2. Bookings cancelled less than 7 days before the working date will not be refunded.<br><br>
-													<p class="term-head">5. Digital Glarus' right to cancel a membership </p>
-													5.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
-													5.2. Members disrupting the environment of coworking may be rejected to join the membership.<br><br>
-													<p class="term-head">6. 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>
-													6.2. Digital Glarus may reject a member who disrupts the environment of coworking space from joining the membership.<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. 
-													<br><br>
-											</p>
-											<div class="row col-xs-12 col-sm-7 col-lg-6 text-center">
-												<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
-											</div>
-											<div class="row col-md-2 text-center wow fadeInDown"> 
-											</div>
-										</div>
-								</div>        
-						</div>
-						<div class="row col-md-3 text-center wow fadeInDown"></div>
-						</div> 
-			</section> 
-			</div>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
+   
+ <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-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">
+                     
+					   <section id="price2">
+    <div class="container">
+     <!--<div class="row col-md-2 text-center wow fadeInDown"></div> -->
+    <div class="row col-xs-12 col-sm-12	col-lg-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>
+         <h2 class="price">Valid from 31 October 2016, v1.0 dated 31 October 2016</h2>
+         <hr class="primary">
+            <div class="price-exp-box">
+                <p class="text-left">
+                <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.2. Each additional day costs 15CHF for members.<br>
+               <br>
+                <p class="term-head">2. Coworking days</p> 
+                2.1. Coworking days are counted as 1 calendar day. <br> 
+                2.2. Free coworking days are included in the membership. <br>
+                2.3. Unused working days are not refunded and can not be compensated for. <br><br>
+                 <p class="term-head">3. Possible reduction</p>
+                  3.1. Your first month's membership fee is calculated according to the date of your subscription. <br>
+                  3.2. The days already passed in the first month are discounted from the first month's membership fee.<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">4. Member's right to cancellation </p>
+                  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>
+                  4.2. Bookings cancelled less than 7 days before the working date will not be refunded.<br><br>
+                  <p class="term-head">5. Digital Glarus' right to cancel a membership </p>
+                  5.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
+                  5.2. Members disrupting the environment of coworking may be rejected to join the membership.<br><br>
+                  <p class="term-head">6. 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>
+                  6.2. Digital Glarus may reject a member who disrupts the environment of coworking space from joining the membership.<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. 
+                <br><br>
+              
+                </p>
+                <div class="text-center">
+					<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
+              </div>
+              <div class="row col-md-2 text-center wow fadeInDown"> 
+              </div>
+                    </div>
+              
+       </div>        
+      </div>
+      <div class="row col-md-3 text-center wow fadeInDown"></div>
+    </div> 
+  </section> 
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
 
+	
 
   
 
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 0bb142ab..7d1de32c 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -182,9 +182,7 @@ CMS_TEMPLATES = (
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'app',
-		'USER': 'app',
-		'HOST': 'db'
+        'NAME': 'app'
     }
 }