From 73a18542b02ff4a70e58a7a4e24b6bada56e92d6 Mon Sep 17 00:00:00 2001
From: unknown <nquintero@wbinnova.com>
Date: Thu, 8 Dec 2016 19:15:59 -0400
Subject: [PATCH] coherent button style and notice box

---
 .../digitalglarus/booking_orders_detail.html  |  29 +-
 .../templates/digitalglarus/login_hello.html  |  80 ++++++
 .../templates/new_base_glarus123123.html      | 249 ++++++++++++++++++
 stripe_keys.sh                                |   2 -
 4 files changed, 350 insertions(+), 10 deletions(-)
 create mode 100644 digitalglarus/templates/digitalglarus/login_hello.html
 create mode 100644 digitalglarus/templates/new_base_glarus123123.html
 delete mode 100644 stripe_keys.sh

diff --git a/digitalglarus/templates/digitalglarus/booking_orders_detail.html b/digitalglarus/templates/digitalglarus/booking_orders_detail.html
index 8163b7cb..a91ec55a 100644
--- a/digitalglarus/templates/digitalglarus/booking_orders_detail.html
+++ b/digitalglarus/templates/digitalglarus/booking_orders_detail.html
@@ -8,6 +8,16 @@
     text-align: center !important;
   }
   
+#outer
+{
+    width:100%;
+    text-align: center;
+}
+.inner
+{
+    display: inline-block;
+}
+   
   </style>
 
 <script type="text/javascript">
@@ -63,21 +73,20 @@
             <hr class="greyline-long">
             <h2 class="col-xs-6 payment-total text-left"> Total</h2>
             <h2 class="order-result">{{final_price|floatformat}}CHF</h2>
-            <br>   
+            
 
-            <p class="">
-              View my bookings <br/><a class="btn btn-primary btn-sm btn-blck "  href="{% url 'digitalglarus:booking_orders_list' %}">Go to my page</a>            
-            </p> 
+			
+            
             {% if not order.get_status_display == 'Cancelled' %}
             <form method="POST" action="">
               {% csrf_token %} 
-              <p class="">
+              <p class="inner">
                 <input type="hidden" name="start_date" value="{{order.booking.start_date}}">
                 <!-- <a class=""  href="{% url 'digitalglarus:booking_orders_list' %}" data-toggle="modal" data-target="#cancel-booking-modal">Cancel booking</a> -->
-                <button type="button" class="btn btn-edit btn-sm btn-blue" data-toggle="modal" data-target="#cancel-booking-modal">Cancel booking</button>
+				 <a class="btn btn-primary btn-blue"  href="{% url 'digitalglarus:booking_orders_list' %}">Go to my page</a>
+                <button type="button" class="btn btn-primary btn-blue" data-toggle="modal" data-target="#cancel-booking-modal">Cancel booking</button>
               </p>
-              
-
+			         
               <div class="modal fade bs-example-modal-sm" id="cancel-booking-modal" tabindex="-1" role="dialog">
                 <div class="modal-dialog" role="document">
                   <div class="modal-content">
@@ -102,6 +111,10 @@
               </div><!-- /.modal -->
 
             </form>
+			{% else %}
+				<p class="inner">
+					<a class="btn btn-primary btn-blue"  href="{% url 'digitalglarus:booking_orders_list' %}">Go to my page</a>            
+				</p> 
             {% endif %}
 
 
diff --git a/digitalglarus/templates/digitalglarus/login_hello.html b/digitalglarus/templates/digitalglarus/login_hello.html
new file mode 100644
index 00000000..f61a3f9b
--- /dev/null
+++ b/digitalglarus/templates/digitalglarus/login_hello.html
@@ -0,0 +1,80 @@
+{% extends "new_base_glarus.html" %}
+{% load staticfiles bootstrap3 i18n %}
+{% block content %}
+
+
+  <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-user"></span>
+          <h2 class="section-heading">Log In</h2>
+          {% if not messages %}
+            <h2 class="signup-lead">Welcome!<br></h2>
+          {% endif %}
+          
+
+          {% if messages %}
+              <ul class="list-unstyled">
+              {% for message in messages %}
+                  <li>{{ message }}</li>
+              {% endfor %}
+              </ul>
+          {% endif %}
+
+          <hr class="primary">
+
+          {% block messages %}
+              {% if request.GET.logged_out %}
+                      <div class="alert">  <!-- singular -->
+                          <a class="close" data-dismiss="alert">×</a>
+                          {% trans "You haven been logged out"%}
+                      </div>
+              {% endif %}
+          {% endblock %}
+          
+          <div class="signup-form form-group row">
+            <form action="{% url 'digitalglarus:login' %}" method="post" class="form" novalidate>
+              {% csrf_token %}
+              <input type="hidden" name="" value="{{ request.GET.next }}">
+              {% for field in form %}
+                  {% bootstrap_field field show_label=False type='fields'%}
+              {% endfor %}
+              <p>{{form.non_field_errors|striptags}}</p>
+         
+              <p class="signup-notice">By logging in you agree to our<a href=#terms>Terms of Service</a>.</p>
+              <button type="submit" class="btn btn-primary btn-blue">Login</button>
+            </form>
+            <br>
+            <div class="notice-box">
+               <p class="signup-text">Forgot password?<a href="{% url 'digitalglarus:reset_password' %}">Find ID/Password</a></p>
+               <p class="signup-text">Not a member yet?<a href="{% url 'digitalglarus:signup' %}?{{request.GET.next}}">Sign up </a>now.</p>
+            </div>
+          </div>
+        </div>       
+        <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown">
+        </div>
+      </div>
+    </div>    
+  </section> 
+  
+  <section id="contact">
+    <div class="fill">
+     <div class="row" class="wow fadeInDown">
+      <div class="col-lg-12 text-center wow fadeInDown">
+          <div class="col-md-4 map-title">
+            Digital Glarus<br>
+            <span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
+            <br>info@digitalglarus.ch
+            <br>
+            (044) 534-66-22
+            <p>&nbsp;</p>
+            </span>
+          </div>
+           <p>&nbsp;</p>
+        </div>
+      </div>
+    </div>
+  </section>
+{% endblock %}
\ No newline at end of file
diff --git a/digitalglarus/templates/new_base_glarus123123.html b/digitalglarus/templates/new_base_glarus123123.html
new file mode 100644
index 00000000..b156dd45
--- /dev/null
+++ b/digitalglarus/templates/new_base_glarus123123.html
@@ -0,0 +1,249 @@
+{% load static %}
+{% load staticfiles cms_tags menu_tags sekizai_tags  menu_tags  bootstrap3 %}
+{% load i18n %}
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <title>Digital Glarus</title>
+
+
+    <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
+
+    <!-- Bootstrap Core CSS -->
+    <link href="{% static 'digitalglarus/font-awesome-4.1.0/css/font-awesome.min.css' %}" rel="stylesheet">
+    <link href="{% static  'ungleich_page/font-awesome-4.1.0/css/font-awesome.min.css' %}" rel="stylesheet"
+      type="text/css">
+
+    <link href="{% static 'digitalglarus/css/agency.css' %}" rel="stylesheet">
+    <link href="{% static 'digitalglarus/css/ungleich.css' %}" rel="stylesheet">
+    <link href="{% static 'digitalglarus/css/history.css' %}" rel="stylesheet">
+    <link href="{% static 'digitalglarus/css/price.css' %}" rel="stylesheet">
+
+    <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.css" />
+    <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.42/css/bootstrap-datetimepicker.min.css" />
+
+    <!-- <link href="css/bootstrap.min.css" rel="stylesheet"> -->
+    <link href="{% static 'digitalglarus/css/lib/animate.min.css' %}" rel="stylesheet">
+    <!-- <link href="{% static 'css/membership.css' %}" rel="stylesheet"> -->
+
+
+
+    <!-- Custom CSS -->
+    <!-- <link href="css/agency.css" rel="stylesheet"> -->
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+    <script src="{% static 'digitalglarus/https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="{% static 'digitalglarus/https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <!-- <link href="css/ungleich.css" rel="stylesheet" type="text/css"></link> -->
+    <!-- Google tracking -->
+    <script src="//www.google-analytics.com/analytics.js" async></script><script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', 'UA-62285904-1', 'auto');
+      ga('send', 'pageview');
+
+    </script>
+    <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+    <style id="igtranslator-color" type="text/css"></style>
+    <style type="text/css">
+
+
+      .navbar-default .nav .dropdown.open .dropdown-toggle {
+        background: none !important;
+        color: white !important;
+      }
+
+
+      .navbar-default .nav .dropdown li a{
+        color:#0f1221;
+        text-transform: capitalize;
+      }
+
+      .navbar-default .nav li a .glyphicon-user{
+
+        font-size: 15px;
+        display: inline-block;
+        margin: 0px;
+        color:white;
+      }
+    </style>
+  </head>
+
+
+
+  <body id="page-top" class="index">
+
+    <!-- Navigation -->
+    <nav class="navbar navbar-default navbar-fixed-top">
+      <div class="container" style="margin-right: -; margin-left: 0px;margin-right: 0px;">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header page-scroll">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <p><a class="navbar-brand page-scroll"href="{% url 'digitalglarus:landing' %}"><img src="{% static 'digitalglarus/img/logo_white.svg' %}"></a></p>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right">
+        <li class="hidden active">
+          <a href="#page-top"></a>
+        </li>
+        <li>
+          <a class="page-scroll" href="{% url 'digitalglarus:booking' %}">booking & price</a>
+        </li>
+        <li>
+          <a class="page-scroll" href="{% url 'digitalglarus:history' %}">history</a>
+        </li>
+        <li>
+          <a class="page-scroll" href="http://blog.ungleich.ch">BLOG</a>
+        </li>
+        <li>
+          <a class="page-scroll" href="#contact">Contact</a>
+        </li>
+
+        {% if request.user.is_authenticated %}
+        <li class="dropdown home-dropdown">
+          <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
+            <i class="glyphicon glyphicon-user"></i>{{request.user.name}} <span class="caret"></span>
+          </a>
+          <ul id="g-account-menu" class="dropdown-menu" role="menu">
+            <li>
+              <a href="{% url 'digitalglarus:booking_orders_list' %}">
+                <i class="fa fa-home" aria-hidden="true"></i> {% trans "Bookings"%} 
+              </a>
+            </li>
+            <li>
+              <a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%} 
+              </a>
+            </li>
+            <li>
+              <a href="{% url 'digitalglarus:logout' %}">
+                <i class="fa fa-lock" aria-hidden="true"></i>
+                {% trans "Logout"%}
+              </a>
+            </li>
+          </ul>
+        </li>              
+        {% else %}
+            <li>
+                <a class="page-scroll" href="{% url 'digitalglarus:login' %}">Login</a>
+            </li> 
+        {% endif %}
+<!--          <li>
+          <a class="page-scroll" href="{% url 'digitalglarus:signup' %}">Sign Up</a>
+        </li>
+ -->      </ul>
+    </div>
+    <!-- /.navbar-collapse -->
+      </div>
+      <!-- /.container-fluid -->
+    </nav>
+
+    {% block content %} {% endblock %}
+    
+    <footer>
+      <div class="container">
+    <div class="row">
+      <div class="col-md-4">
+        <span class="copyright">Copyright © ungleich GmbH 2016</span>
+      </div>
+      <div class="col-md-4">
+        <ul class="list-inline social-buttons">
+          <li><a href="https://facebook.com/digitalglarus"><i class="fa fa-facebook"></i></a>
+          </li>
+          <li><a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a>
+          </li>
+          <li><a href="https://github.com/ungleich"><i class="fa fa-github"></i></a>
+          </li>
+          <li><a href="https://www.linkedin.com/company/ungleich-gmbh?trk=nav_account_sub_nav_company_admin/"><i class="fa fa-linkedin"></i></a>
+          </li>
+        </ul>
+      </div>
+      <div class="col-md-4">
+        <ul class="list-inline quicklinks">
+          <li><a href="http://www.ungleich.ch/">ungleich Home</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+      </div>
+    </footer>
+        
+<script type="text/javascript" src="{% static 'digitalglarus/bower_components/jquery/dist/jquery.min.js' %}"></script>
+
+<!-- jQuery -->
+<script src="{% static 'digitalglarus/js/jquery.js' %}"></script>
+<script type="text/javascript" src="//cdn.jsdelivr.net/jquery.validation/1.13.1/jquery.validate.min.js"></script>
+
+
+<!-- Bootstrap Core JavaScript -->
+<script src="{% static 'digitalglarus/js/bootstrap.min.js'  %}"></script>
+
+
+<!-- Plugin JavaScript -->
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
+<script src="{% static 'digitalglarus/js/classie.js' %}"></script>
+<script src="{% static 'digitalglarus/js/cbpAnimatedHeader.js' %}"></script>
+
+<!-- Stripe Lib -->
+<script type="text/javascript" src="//js.stripe.com/v2/"></script>
+
+<!-- Proccess payment lib -->
+<script src="{% static 'digitalglarus/js/payment.js' %}"></script>
+
+<!-- Contact Form JavaScript -->
+<script src="{% static 'digitalglarus/js/jqBootstrapValidation.js' %}"></script>
+
+<!-- <script src="{% static 'digitalglarus/js/contact_me.js' %}"></script>
+ -->
+<script src="{% static 'digitalglarus/./js/lib/wow.min.js' %}"></script>
+<!-- Custom Theme JavaScript -->
+<script src="{% static 'digitalglarus/js/agency.js' %}"></script>
+
+<script src="{% static 'digitalglarus/js/ungleich.js' %}"></script>
+
+
+
+<!-- Include Required Prerequisites -->
+<script type="text/javascript" src="//cdn.jsdelivr.net/jquery/1/jquery.min.js"></script>
+<script type="text/javascript" src="//cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
+<!-- <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/bootstrap/latest/css/bootstrap.css" />
+ --> 
+<!-- Include Date Range Picker -->
+<script type="text/javascript" src="//cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.js"></script>
+<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.42/js/bootstrap-datetimepicker.min.js
+"></script>
+
+
+<!-- Booking JavaScript -->
+<script src="{% static 'digitalglarus/js/booking.js' %}"></script>
+
+<!-- Utils JavaScript -->
+<script src="{% static 'digitalglarus/js/utils.js' %}"></script>
+
+<!-- Custom Fonts -->
+<link href="//fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css">
+<link href="{% static 'digitalglarus/font-awesome-4.1.0/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
+<link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
+<link href="//fonts.googleapis.com/css?family=Kaushan+Script" rel="stylesheet" type="text/css">
+<link href="//fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic" rel="stylesheet" type="text/css">
+<link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700" rel="stylesheet" type="text/css">
+</html>
\ No newline at end of file
diff --git a/stripe_keys.sh b/stripe_keys.sh
deleted file mode 100644
index 5681e62c..00000000
--- a/stripe_keys.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export STRIPE_API_PRIVATE_KEY=sk_test_dqAmbKAij12QCGfkYZ3poGt2
-export STRIPE_API_PUBLIC_KEY=pk_test_QqBZ50Am8KOxaAlOxbcm9Psl
\ No newline at end of file