spring 5 without the notice box

digitalglarus/templates/digitalglarus/index.html

@@ -248,21 +248,22 @@
       </div>-->
     </div>
     <div class="row no-gutter popup-gallery">
+	
+	
       <div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="0.5s">
         <ul class="caption-style-1">
           <li>
             <img src="{% static 'digitalglarus/img/portfolio/excursion.png' %}" class="img-responsive inline-block" alt=""> 
               <div class="caption">
                 <div class="blur"></div>
-                  <div class="caption-text">
+                 
-                    <div class="caption portfolio-caption-white">excursions</div>
-                  </div>
                    
               </div>      
           </li>
         </ul>
-      </div>
+		<div class="caption portfolio-caption-white">excursions</div>
 		
+      </div>
 	  
        <div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="0.8s">
           <ul class="caption-style-1">
@@ -270,12 +271,11 @@
               <img src="{% static 'digitalglarus/img/portfolio/ski.png' %}" class="img-responsive inline-block" alt="">
                 <div class="caption">
                   <div class="blur"></div>
-                      <div class="caption-text">
+                     
-                        <div class="caption portfolio-caption-white">enjoy the great outdoors</div>
-                      </div>
                 </div>
             </li>
           </ul>
+		  <div class="caption portfolio-caption-white">enjoy the great outdoors</div>
       </div>
 
 
@@ -285,12 +285,11 @@
             <img src="{% static 'digitalglarus/img/portfolio/concert.png' %}" class="img-responsive inline-block" alt="">
               <div class="caption">
                 <div class="blur"></div>
-                    <div class="caption-text">
+                    
-                      <div class="caption portfolio-caption-white">cultural events</div>
-                    </div>
               </div>
           </li>           
         </ul>  
+		<div class="caption portfolio-caption-white">cultural events</div>
       </div>
 
       <div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="1.2s">
@@ -299,12 +298,11 @@
             <img src="{% static 'digitalglarus/img/portfolio/inspire.png' %}" class="img-responsive inline-block" alt="">
               <div class="caption">
                 <div class="blur"></div>
-                    <div class="caption-text">
+                    
-                      <div class="caption portfolio-caption-white">be inspired</div>
-                    </div>
               </div>
           </li>       
         </ul>  
+		<div class="caption portfolio-caption-white">be inspired</div>
       </div>
 
 
@@ -315,12 +313,10 @@
             <img src="{% static 'digitalglarus/img/portfolio/workshop.png' %}" class="img-responsive inline-block" alt="">
               <div class="caption">
                 <div class="blur"></div>
-                    <div class="caption-text">
-                        <div class="caption portfolio-caption-white">workshops</div>
-                    </div>
               </div>
            </li>      
         </ul>
+		<div class="caption portfolio-caption-white">workshops</div>
       </div>
 
       <div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="1.4s">
@@ -329,16 +325,20 @@
             <img src="{% static 'digitalglarus/img/portfolio/recharge.png' %}" class="img-responsive inline-block" alt="">
               <div class="caption">
                 <div class="blur"></div>
-                  <div class="caption-text">
-                    <div class="caption portfolio-caption-white">recharge</div>
-                  </div>
                </div>         
           </li>      
         </ul>
+		 <div class="caption portfolio-caption-white">recharge</div>
       </div>
+	  
+	  
+	 
    </div>
   </section>
   
+  
+
+
     <!--aside-->
     <aside class="bg-dark">
         <div class="container text-center">

digitalglarus/templates/digitalglarus/membership_orders_list.html

@@ -1,8 +1,19 @@
 {% extends "new_base_glarus.html" %}
 {% load staticfiles bootstrap3 i18n %}
 {% block content %}
+<style type="text/css">
 
 
+@media only screen and (max-width: 320px) {
+
+   body { font-size: 2em; }
+   
+    
+
+}
+h2 {text-transform: lowercase;}
+  </style>
+
   <!-- Header -->
   <!-- Services Section -->
   <section id="price">
@@ -18,7 +29,7 @@
             {% if  membership_start_date and membership_end_date%}
               <h2 class="member-name">{{membership_start_date|date}}-{{membership_end_date|date}}</h2>
             {% else %}
-              <h2 class="member-name">You don't have an active membership</h2>
+              <h2>You don't have an active membership</h2>
             {% endif %}
             <hr class="greyline-long">
             <h2 class="order-head">Orders history</h2>

digitalglarus/templates/digitalglarus/membership_payment.html

@@ -19,6 +19,10 @@
     padding-right: 1.5em
   }
   
+  @media screen and (min-width: 768px) {
+	
+	#cancel-subscription-modal .modal-dialog  {width:900px;}
+
 </style>
 
   <section id="price">
@@ -96,7 +100,7 @@
                                      <br/>
                                      <input type="checkbox" class="custom-control-input agree-terms">
                                      <span class="custom-control-indicator"></span>
-                                     <span class="custom-control-description">I accept the Digital Glarus <a href="{% url 'digitalglarus:TermsAndConditions' %}" target="_blank">Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span>
+                                     <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">
@@ -177,6 +181,78 @@
     </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-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="text-center">General Terms & Conditions of Digital Glarus Membership</h4>
+                </div>
+                <div class="modal-body">
+                     
+					   <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="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">
+					<button type="submit" class="btn btn-primary btn-blue">Still have a question?</button>
+					<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 class="modal-footer text-center">
+                    <button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button>
+                    <button type="submit" class="btn btn-primary">Yes</button>
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
+  
+
 <!-- stripe key data -->
 {% if stripe_key %}
 <script type="text/javascript"> 

digitalglarus/templates/digitalglarus/membership_pricing.html

@@ -3,6 +3,13 @@
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
+
+<style  type="text/css">
+@media screen and (min-width: 768px) {
+	
+	#cancel-subscription-modal .modal-dialog  {width:900px;}
+</style>
+
   <section id="price">
     <div class="container">
     <div class="row col-md-2 text-center wow fadeInDown"></div>
@@ -24,6 +31,11 @@
                 </p>
                 <div class="text-center">
 					<a class="btn btn-primary btn-blue" href="{% url 'digitalglarus:membership_payment' %}">become a member</a>
+					
+              </div>
+			  <div class="text-center">
+					<br>
+					<a data-toggle="modal" data-target="#cancel-subscription-modal" target="_blank">How to pay?</a>
 			  </div>
             </div>
               
@@ -73,4 +85,52 @@
       </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-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="text-center">Payment information</h4>
+                </div>
+                <div class="modal-body">
+                  
+					 
+					   <section id="price">
+    <div class="signup-container">
+	  <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
+      <div class="col-xs-12 col-sm-6 col-lg-4 text-center wow fadeInDown"> 
+        <div class="signup-box">
+          <span class="glyphicon glyphicon-calendar"></span>
+             <h2 class="section-heading">How the pricing works</h2>
+             <hr class="primary">
+               <h2 class="signup-lead text-left"><ul><li>All members get 2 free days per month for booking.<br></li> </ul><ul><li>Additional booking costs 15CHF per day. <br></li></ul><ul><li>But your coworking after 17th day is free of charge. </li></ul><ul><li>So more you work, more you can save money! <br></li></ul><ul><li>You will never be charged more than 290CHF per month.  <br>  </li></ul>            </h2></ul>
+               
+               
+                     
+                          <p class="signup-notice">Still have questions?<a href=#terms>Contact us!</a>.</p>
+                          <div class="notice-box">
+                          </div>
+        </div>
+      </div>       
+     <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
+      </div>
+    </div> 
+    </div>
+      </div>
+    </div>   
+  </section>
+					 
+					 
+					 
+					 
+                </div>
+                <div class="modal-footer text-center">
+                    <button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button>
+                    <button type="submit" class="btn btn-primary">Yes</button>
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
 {% endblock %} 

dynamicweb/settings/base.py

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

dynamicweb/settings/base.py.orig

@@ -63,11 +63,8 @@ INSTALLED_APPS = (
     'django_select2',
     'meta',
     'meta_mixin',
-<<<<<<< HEAD
 #   'admin_enhancer',
     'djangocms_blog',
-=======
->>>>>>> 006d49d7dbddcfd9bb24c40d1f1939b902bc1fc4
     'bootstrap3',
     'compressor',
     'filer',
@@ -438,3 +435,7 @@ REGISTRATION_MESSAGE = {'subject': "Validation mail",
 
 #dont migrate test
 # SOUTH_TESTS_MIGRATE = False
+
+STRIPE_API_PUBLIC_KEY = 'pk_test_uvWyHNJgVL2IB8kjfgJkGjg4'  # used in frontend to call from user browser
+STRIPE_API_PRIVATE_KEY = 'sk_test_uIPMdgXoRGydrcD7fkwcn7dj'  # used in backend payment
+STRIPE_DESCRIPTION_ON_PAYMENT = "Payment for ungleich GmbH services"