moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed history.html , contact us section added again history.html, supporter list style added, changed digitalglarus login, Fixed digitalglarus login form when user sent nothing,Fixed digitalglarus signup form , Fixed relaway font bug

Browse source
This commit is contained in:
Levi 2016-08-11 01:07:12 -05:00
commit dca2250378
10 changed files with 8377 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

11
membership/forms.py
View file

@ -5,6 +5,8 @@ from django.contrib.auth import authenticate,login
from .models import CreditCards
from utils.forms import SignupFormMixin
class LoginForm(forms.Form):
email = forms.EmailField(label="Email address", max_length=50,
@ -30,12 +32,9 @@ class LoginForm(forms.Form):
return user
class RegisterForm(LoginForm):
name = forms.CharField(label='Name', max_length=50,
widget=forms.TextInput(
attrs={'class': 'form-control', 'placeholder': 'Enter name'}))
class RegisterForm(SignupFormMixin):
password = forms.CharField(widget=forms.PasswordInput())
confirm_password = forms.CharField(widget=forms.PasswordInput())
class PaymentForm(forms.ModelForm):
class Meta:

8280
membership/static/css/membership.css Normal file
View file

File diff suppressed because it is too large Load diff

119
membership/templates/login.html
View file

@ -1,59 +1,39 @@
{% load static cms_tags %}
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<script type="text/javascript" src="{% static 'digitalglarus/bower_components/jquery/dist/jquery.min.js' %}"></script>
<script type="text/javascript" src="{% static 'digitalglarus/bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script>
<link href="{% static 'digitalglarus/css/font-awesome.min.css' %}" rel="stylesheet"
type="text/css">
<link href="{% get_static_prefix %}membership.css" rel="stylesheet" type="text/css">
{% extends "new_base_glarus.html" %}
{% load staticfiles cms_tags bootstrap3%}
{% block title %}crowdfunding{% endblock %}
</head>
<body>
<div class="navbar navbar-default navbar-static-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-ex-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% page_url 'digital-glarus-page' %}"><span>Digital Glarus</span></a>
</div>
<div class="collapse navbar-collapse" id="navbar-ex-collapse">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="{% page_url 'digital-glarus-page' %}">Home</a>
</li>
<li>
<a href="{% url 'digitalglarus:contact' %}">Contacts</a>
</li>
</ul>
</div>
</div>
</div>
<div class="section">
{% block content %}
<style type="text/css">
.navbar-default {
background-color: black;
}
section.login {
margin-top: 10%;
margin-bottom: 8%;
}
</style>
<section class="login">
<div class="container">
<div class="row">
<div class="col-md-6">
<h1>I'm already a member!</h1>
<p>To book you need to be logged in.</p>
<h2>Log in</h2>
<hr>
<form role="form" action="" method="POST">
<form role="form" action="" method="POST" novalidate>
{% csrf_token %}
{{ login_form.non_field_errors }}
{% for field in login_form %}
<div class="form-group">
{{ field.errors }}
<label class="control-label">{{ field.label }}</label>{{ field }}
<input type="hidden" name="is_login" value="True">
{% bootstrap_field field type='fields'%}
</div>
{% endfor %}
{% endfor %}
{{ login_form.non_field_errors }}
<button type="submit" class="btn btn-default">Submit</button>
</form>
</div>
@ -67,13 +47,13 @@
<h2>Register</h2>
<hr>
<form role="form" action="" method="POST">
{% csrf_token %}
<form role="form" action="" method="POST" novalidate>
{% csrf_token %}
<div class="form-group">
{% for field in register_form %}
{{ field.errors }}
<label class="control-label">{{ field.label }}</label>
{{ field }}
{% bootstrap_field field type='fields'%}
<!-- <label class="control-label">{{ field.label }}</label> -->
<!-- {{ field }} -->
{% endfor %}
</div>
<button type="submit" class="btn btn-default">Submit</button>
@ -81,43 +61,6 @@
</div>
</div>
</div>
</div>
<footer class="section section-primary">
<div class="container">
<div class="row">
<div class="col-sm-6">
<h1>Digital Glarus</h1>
</section>
<p>In der Au 7 8762 Schwanden
<br>Copyright © ungleich GmbH 2016</p>
</div>
<div class="col-sm-6">
<p class="text-info text-right">
<br>
<br>
</p>
<div class="row">
<div class="col-md-12 hidden-lg hidden-md hidden-sm text-left">
<a href="#"><i class="fa fa-3x fa-fw fa-instagram text-inverse"></i></a>
<a href="https://twitter.com/digitalglarus"><i class="fa fa-3x fa-fw fa-twitter text-inverse"></i></a>
<a href="#"><i class="fa fa-3x fa-fw fa-facebook text-inverse"></i></a>
<a href="#"><i class="fa fa-3x fa-fw fa-github text-inverse"></i></a>
</div>
</div>
<div class="row">
<div class="col-md-12 hidden-xs text-right">
{# <a href="#"><i class="fa fa-3x fa-fw fa-instagram text-inverse"></i></a>#}
<a href="https://twitter.com/digitalglarus"><i class="fa fa-3x fa-fw fa-twitter text-inverse"></i></a>
<a href="https://www.facebook.com/digitalglarus"><i class="fa fa-3x fa-fw fa-facebook text-inverse"></i></a>
<a href="https://github.com/ungleich"><i class="fa fa-3x fa-fw fa-github text-inverse"></i></a>
</div>
</div>
</div>
</div>
</div>
</footer>
</body>
</html>
{% endblock %}

33
membership/views.py
View file

@ -9,10 +9,11 @@ from django.http import HttpResponseRedirect
from django.contrib.auth import login
from .models import CustomUser,StripeCustomer
from .forms import (LoginForm, RegisterForm, PaymentForm)
from .forms import LoginForm, RegisterForm, PaymentForm
from utils.stripe_utils import StripeUtils
def validate_email(request, validate_slug):
validated = CustomUser.validate_url(validate_slug)
if validated:
@ -88,16 +89,24 @@ class LoginRegistrationView(View):
{'login_form': login_form, 'register_form': register_form})
def post(self, request):
email = request.POST.get('email')
password = request.POST.get('password')
name = request.POST.get('name')
if name and email and password:
user = CustomUser.register(name, password, email)
if user:
return render(request, 'templates/success.html')
is_login = request.POST.get('is_login', False)
if not is_login:
form = RegisterForm(request.POST)
if form.is_valid():
email = form.validated_data.get('email')
password = form.validated_data.get('password')
name = form.validated_data.get('name')
user = CustomUser.register(name, password, email)
if user:
return render(request, 'templates/success.html')
else:
return render(request, 'templates/error.html')
else:
return render(request, 'templates/error.html')
elif email and password and not name:
login_form = LoginForm()
return render(request, 'templates/login.html',
context={'login_form': login_form, 'register_form': form})
else:
form = LoginForm(request.POST)
if form.is_valid():
user = form.login(request)
@ -106,8 +115,8 @@ class LoginRegistrationView(View):
return redirect('membership')
else:
registration_form = RegisterForm()
return render(request,'templates/login.html', context={'login_form':form,'register_form':registration_form})
return render(request, 'templates/login.html',
context={'login_form': form, 'register_form': registration_form})
class MembershipView(View):