Fixed blling form goes out of background image, Fixed billing address page "amount" field seems broken, Changed authentication page fonts
Added new DG login.html, Fixed DG login contact footer, Added new DG login form, Added DG login, Added DG signup, Added DG reset password, Added DG confirm reset password, Added DG membership payment view Please enter the commit message for your changes. Lines starting
This commit is contained in:
Levi
parent
1470caee89
commit
f56f294205
23 changed files with 1512 additions and 140 deletions
|
|
@ -0,0 +1,55 @@
|
|||
{% extends "new_base_glarus.html" %}
|
||||
{% load staticfiles cms_tags bootstrap3%}
|
||||
{% block title %}crowdfunding{% endblock %}
|
||||
|
||||
{% 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="payment-box">
|
||||
<h2 class="billing-head">Set your new password</h2>
|
||||
<hr class="greyline-long">
|
||||
|
||||
<div class="signup-form form-group row">
|
||||
<form action="" method="post" class="form" novalidate>
|
||||
{% csrf_token %}
|
||||
{% for field in form %}
|
||||
{% bootstrap_field field show_label=False type='fields'%}
|
||||
{% endfor %}
|
||||
<p>{{form.non_field_errors|striptags}}</p>
|
||||
|
||||
<button type="submit" class="btn btn-primary btn-blue">Reset</button>
|
||||
</form>
|
||||
<br>
|
||||
<div class="notice-box">
|
||||
<p class="order-bottom-text">Still have trouble? Contact us for technical support.</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> </p>
|
||||
</span>
|
||||
</div>
|
||||
<p> </p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
{% load i18n %}{% autoescape off %}
|
||||
{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
|
||||
|
||||
{% trans "Please go to the following page and choose a new password:" %}
|
||||
{% block reset_link %}
|
||||
{{ base_url }}{% url 'digitalglarus:reset_password_confirm' uidb64=uid token=token %}
|
||||
{% endblock %}
|
||||
|
||||
{% trans "Thanks for using our site!" %}
|
||||
|
||||
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
|
||||
|
||||
{% endautoescape %}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
{% load i18n %}{% autoescape off %}
|
||||
{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
|
||||
|
||||
{% trans "Please go to the following page and choose a new password:" %}
|
||||
{% block reset_link %}
|
||||
{{ base_url }}{% url 'digitalglarus:reset_password_confirm' uidb64=uid token=token %}
|
||||
{% endblock %}
|
||||
|
||||
{% trans "Thanks for using our site!" %}
|
||||
|
||||
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
|
||||
|
||||
{% endautoescape %}
|
||||
78
digitalglarus/templates/digitalglarus/login.html
Normal file
78
digitalglarus/templates/digitalglarus/login.html
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{% 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>
|
||||
<h2 class="signup-lead">Welcome!<br></h2>
|
||||
|
||||
|
||||
{% 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' %}">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> </p>
|
||||
</span>
|
||||
</div>
|
||||
<p> </p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
{% endblock %}
|
||||
177
digitalglarus/templates/digitalglarus/membership_payment.html
Normal file
177
digitalglarus/templates/digitalglarus/membership_payment.html
Normal file
|
|
@ -0,0 +1,177 @@
|
|||
{% extends "new_base_glarus.html" %}
|
||||
{% load staticfiles bootstrap3 i18n %}
|
||||
{% block content %}
|
||||
|
||||
<style type="text/css">
|
||||
|
||||
.nopadding {
|
||||
padding: 0 !important;
|
||||
margin: 0 !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
<section id="price">
|
||||
<div class="signup-container">
|
||||
<div class="col-xs-12 col-sm-6 col-lg-8 text-center wow fadeInDown">
|
||||
<div class="payment-box">
|
||||
<h2 class="section-heading payment-head">Membership</h2>
|
||||
<!-- <h2 class="membership-amount">35CHF</h2> -->
|
||||
<h2 class="membership-lead">Your Digital Glarus Membership enables
|
||||
you to use our coworking space and it includes
|
||||
2 working days for the month you signed up.
|
||||
The membership fee is a monthly subscription.
|
||||
Additional day costs
|
||||
15CHF per day. More than 17 days a month it
|
||||
will charge only 290CHF/month.</h2>
|
||||
<hr class="greyline-long">
|
||||
<h2 class="billing-head">Member Name</h2>
|
||||
<h2 class="member-name">Nico Schottelius</h2>
|
||||
<hr class="greyline-long">
|
||||
<h2 class="billing-head">Billing Adress</h2>
|
||||
<div class="signup-form form-group row">
|
||||
<form role="form" id="billing-form" method="post" action="{% url 'digitalglarus:membership_payment' %}" novalidate>
|
||||
{% for field in form %}
|
||||
{% csrf_token %}
|
||||
{% bootstrap_field field show_label=False type='fields'%}
|
||||
{% endfor %}
|
||||
{% bootstrap_form_errors form type='non_fields'%}
|
||||
<br>
|
||||
</form>
|
||||
</div>
|
||||
<h2 class="billing-head">Credit Card</h2>
|
||||
<div class="signup-form form-group row">
|
||||
<form role="form" id="payment-form" novalidate>
|
||||
<div class="row">
|
||||
<div class="col-xs-9 col-md-12">
|
||||
<div class="form-group">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" name="cardName" placeholder="Name on card" required autofocus data-stripe="name" />
|
||||
<span class="input-group-addon"><i class="fa fa-user" aria-hidden="true"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-9 col-md-12">
|
||||
<div class="form-group">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" name="cardNumber" placeholder="Valid Card Number" required data-stripe="number" />
|
||||
<span class="input-group-addon"><i class="fa fa-credit-card"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6 col-md-6 nopadding">
|
||||
<label for="expMonth">EXPIRATION DATE</label><br/>
|
||||
<div class="col-xs-6 col-lg-6 col-md-6">
|
||||
<div class="form-group">
|
||||
<input type="text" class="form-control" name="expMonth" placeholder="MM" required data-stripe="exp_month" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6 col-lg-6 col-md-6 pl-ziro">
|
||||
<div class="form-group">
|
||||
<input type="text" class="form-control" name="expYear" placeholder="YY" required data-stripe="exp_year" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-4 col-md-6 pull-right nopadding">
|
||||
<div class="form-group">
|
||||
<label for="cvCode">CV CODE</label>
|
||||
<input type="password" class="form-control" name="cvCode" placeholder="CV" required data-stripe="cvc" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<button class="btn btn-success btn-lg btn-block" type="submit">Purchase membership</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" style="display:none;">
|
||||
<div class="col-xs-12">
|
||||
<p class="payment-errors"></p>
|
||||
</div>
|
||||
</div>
|
||||
{% if paymentError %}
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<p>
|
||||
{% bootstrap_alert paymentError alert_type='danger' %}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</form>
|
||||
<br>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4 col-lg-4 wow fadeInDown">
|
||||
<div class="order-summary">
|
||||
<div class="header text-center">
|
||||
<h2 class="order-name">Order Summary</h2>
|
||||
</div>
|
||||
<div class="order-box">
|
||||
<h2 class="col-xs-6 order-item">Digital Glarus Membership</h2>
|
||||
<br>
|
||||
<h2 class="col-xs-6 order-duration">valid 2016.09.08 - 2016.10.08</h2>
|
||||
<h2 class="order-person">1 person</h2>
|
||||
<h2 class="col-xs-6 payment-total">Today's Total</h2>
|
||||
<h2 class="order-sum">0.00CHF</h2>
|
||||
<hr class="greyline">
|
||||
<h2 class="col-xs-6 payment-total">Total</h2>
|
||||
<h2 class="order-result">35CHF</h2>
|
||||
<div class="text-center">
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input type="checkbox" class="custom-control-input">
|
||||
<span class="custom-control-indicator"></span>
|
||||
<span class="custom-control-description">I accept the Digital Glarus <a href=#>Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span>
|
||||
</label>
|
||||
<div class="button-box">
|
||||
<button type="submit" class="btn btn-primary">Continue to Review</button>
|
||||
</div>
|
||||
|
||||
<div class="button-box">
|
||||
<p class="order-bottom-text">You can checkout on the next page</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</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> </p>
|
||||
</span>
|
||||
</div>
|
||||
<p> </p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- stripe key data -->
|
||||
{% if stripe_key %}
|
||||
<script type="text/javascript">
|
||||
(function () {window.stripeKey = "{{stripe_key}}";})();
|
||||
</script>
|
||||
|
||||
{%endif%}
|
||||
|
||||
{% endblock %}
|
||||
57
digitalglarus/templates/digitalglarus/reset_password.html
Normal file
57
digitalglarus/templates/digitalglarus/reset_password.html
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{% extends "new_base_glarus.html" %}
|
||||
{% load staticfiles cms_tags bootstrap3%}
|
||||
{% block title %}crowdfunding{% endblock %}
|
||||
|
||||
{% 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="payment-box">
|
||||
<h2 class="billing-head">Reset Password</h2>
|
||||
<hr class="greyline-long">
|
||||
<h2 class="membership-lead">To have your password reset, enter your email address below.
|
||||
We will then send an email containing a link to reset your password.</h2>
|
||||
|
||||
<div class="signup-form form-group row">
|
||||
<form action="{% url 'digitalglarus:reset_password' %}" method="post" class="form" novalidate>
|
||||
{% csrf_token %}
|
||||
{% for field in form %}
|
||||
{% bootstrap_field field show_label=False type='fields'%}
|
||||
{% endfor %}
|
||||
<p>{{form.non_field_errors|striptags}}</p>
|
||||
|
||||
<button type="submit" class="btn btn-primary btn-blue">Send Email</button>
|
||||
</form>
|
||||
<br>
|
||||
<div class="notice-box">
|
||||
<p class="order-bottom-text">Still have trouble? Contact us for technical support.</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> </p>
|
||||
</span>
|
||||
</div>
|
||||
<p> </p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
{% endblock %}
|
||||
59
digitalglarus/templates/digitalglarus/signup.html
Normal file
59
digitalglarus/templates/digitalglarus/signup.html
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{% extends "new_base_glarus.html" %}
|
||||
{% load staticfiles cms_tags bootstrap3%}
|
||||
{% block title %}crowdfunding{% endblock %}
|
||||
|
||||
{% 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-plus"></span>
|
||||
<h2 class="section-heading">Sign up</h2>
|
||||
<h2 class="signup-lead">Start coworking at Digital Glarus! <br> Membership costs only
|
||||
<strong>35CHF</strong> per month.<br> 2 free working days included!</h2>
|
||||
<hr class="primary">
|
||||
|
||||
<div class="signup-form form-group row">
|
||||
<form action="{% url 'digitalglarus:signup' %}" 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>
|
||||
|
||||
<button type="submit" class="btn btn-primary btn-blue">Signup</button>
|
||||
</form>
|
||||
<br>
|
||||
<div class="notice-box">
|
||||
<p class="signup-text">Already a member?<a href=#login>Log in</a></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> </p>
|
||||
</span>
|
||||
</div>
|
||||
<p> </p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
{% load static %}
|
||||
{% load bootstrap3 %}
|
||||
{% load staticfiles cms_tags menu_tags sekizai_tags menu_tags %}
|
||||
{% load staticfiles cms_tags menu_tags sekizai_tags menu_tags bootstrap3 %}
|
||||
{% load i18n %}
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
|
@ -25,6 +24,7 @@
|
|||
<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 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"> -->
|
||||
|
|
@ -135,16 +135,25 @@
|
|||
<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 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="http://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>
|
||||
|
||||
|
|
@ -156,6 +165,8 @@
|
|||
|
||||
<script src="{% static 'digitalglarus/js/ungleich.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">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue