From 888cdc51e2976ecc0e76f5bd52c48da155ddbce6 Mon Sep 17 00:00:00 2001
From: unknown <nquintero@wbinnova.com>
Date: Mon, 12 Dec 2016 11:38:23 -0400
Subject: [PATCH] sprint 6

---
 .../templates/digitalglarus/confirm_reset_password.html  | 1 +
 digitalglarus/templates/digitalglarus/login.html         | 2 +-
 .../templates/digitalglarus/membership_deactivated.html  | 9 ++++++---
 .../templates/digitalglarus/reset_password.html          | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/digitalglarus/templates/digitalglarus/confirm_reset_password.html b/digitalglarus/templates/digitalglarus/confirm_reset_password.html
index 40a93730..eccfc066 100644
--- a/digitalglarus/templates/digitalglarus/confirm_reset_password.html
+++ b/digitalglarus/templates/digitalglarus/confirm_reset_password.html
@@ -25,6 +25,7 @@
                 <br>
                 <div class="notice-box">
                     <p class="order-bottom-text">Still have trouble? Contact us for technical support.</p>
+					<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have trouble? Contact us for technical support</a>
                 </div>
             </div>
 
diff --git a/digitalglarus/templates/digitalglarus/login.html b/digitalglarus/templates/digitalglarus/login.html
index 3a0b91e3..0222e3f0 100644
--- a/digitalglarus/templates/digitalglarus/login.html
+++ b/digitalglarus/templates/digitalglarus/login.html
@@ -144,7 +144,7 @@
     <div class="container">
 	<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
      <!--<div class="row col-md-2 text-center wow fadeInDown"></div> -->
-    <div class="row col-xs-12 col-sm-12	col-lg-10 text-center wow fadeInDown">
+    <div class="row col-xs-12 col-sm-7 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>
diff --git a/digitalglarus/templates/digitalglarus/membership_deactivated.html b/digitalglarus/templates/digitalglarus/membership_deactivated.html
index 9eeb5c39..c324d4fa 100644
--- a/digitalglarus/templates/digitalglarus/membership_deactivated.html
+++ b/digitalglarus/templates/digitalglarus/membership_deactivated.html
@@ -44,8 +44,9 @@
 
                           <form method="POST" action="">
                             {% csrf_token %} 
+							<a class="btn btn-primary btn-blue space-above" 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>
+                        
 
 
 
@@ -59,7 +60,7 @@
                                   <div class="modal-body">
                                     <p>Do you want to cancel your subscription?</p>
                                   </div>
-                                  <div class="modal-footer text-center">
+                                  <div class="modal-footer">
                                     <button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button>
                                     <button type="submit" class="btn btn-primary">Yes</button>
                                   </div>
@@ -81,7 +82,9 @@
 
 
         
-      </div>       
+      </div>  
+
+	  
      <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
       </div>
     </div> 
diff --git a/digitalglarus/templates/digitalglarus/reset_password.html b/digitalglarus/templates/digitalglarus/reset_password.html
index 265248fd..6da417a0 100644
--- a/digitalglarus/templates/digitalglarus/reset_password.html
+++ b/digitalglarus/templates/digitalglarus/reset_password.html
@@ -26,7 +26,8 @@
                 </form>
                 <br>
                 <div class="notice-box">
-                    <p class="order-bottom-text">Still have trouble? Contact us for technical support.</p>
+					<p class="signup-text">Still have trouble?<a href="mailto:info@ungleich.ch" > Contact us for technical support</a>.</p>
+					
                 </div>
             </div>