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
parent 6a9d8f2b8b
commit 5675c402fa
10 changed files with 8377 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
digitalglarus/static/digitalglarus/css/agency.css
View file

@ -1074,7 +1074,7 @@ h6 intro-smallcap {
.carousel-text { .carousel-text {
text-transform : none; text-transform : none;
font-famil:"Raleway" , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; font-family:"Raleway" , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size : 20px; font-size : 20px;
font-weight : 100; font-weight : 100;
lign-heignt: 2px; lign-heignt: 2px;

117
digitalglarus/templates/digitalglarus/history.html
View file

@ -86,97 +86,6 @@
</div> </div>
</section> </section>
<!--carousel-->
<!-- Team Section -->
<!-- <section id="team" class="bg-light-gray">
<div class="container">
<div class="row">
<div class="col-sm-16 text-center center-block wow fadeInDown">
<h2 class="section-heading">Why ungleich?*</h2>
<h3 class="text-muted">What our customers say</h3>
</div>
</div>
<div class="row">
<div class="col-sm-10 center-block wow fadeInDown">
<!-- start:recommendationSlider -->
<!--
<div id="carousel-recommendation-ungleich" class="carousel slide ungleich ungleich-gallery ungleich-gallery-text-carousel" data-ride="carousel" data-interval="3000">
<!-- Indicators -->
<!-- <ol class="carousel-indicators">
<li data-target="#carousel-recommendation-ungleich" data-slide-to="0" class="active"></li>
<li data-target="#carousel-recommendation-ungleich" data-slide-to="1"></li>
<li data-target="#carousel-recommendation-ungleich" data-slide-to="2"></li>
</ol>
<!-- Wrapper for slides -->
<!-- <div class="carousel-inner" role="listbox">
<div class="item active">
<img class="center-block img-client img-responsive" src="./img/client-logos/teralytics.png" />
<p class="carousel-text text-muted text-center">
"ungleich helped us getting started with our internal
infrastructure, hosted on physical servers in a
co-location data centre in Zurich. From planning the
network layout and virtualisation setup,
inviting offers and securing a great deal from a
hardware vendor, all the way to the installation of
basic services like DNS, VPN and firewalls using the
configuration management software cdist, we could
count on the support of ungleich. At the end, we got
a high availability infrastructure setup enabling our
engineers to work more efficiently and comfortable
than before."
</p>
<p class="text-center">
<strong>- Luciano Franceschina</strong>, CTO at Teralytics
</p>
</div>
<div class="item">
<img class="center-block img-client img-responsive" src="./img/client-logos/panter.png" />
<p class="carousel-text text-muted text-center">
"Thanks to ungleich team, who has designed and
configured our company's Linux infrastructure, our
systems are very easy to maintain. Their innovative
configuration management system cdist helped us
significantly not only in cost but also in time
saving, which is crucial for IT companies like ours."
</p>
<p class="text-center">
<strong> - Beat Seeliger </strong>, CTO at Panter AG
</p>
</div>
<div class="item">
<img class="center-block img-client img-responsive" src="./img/client-logos/logo_ruag.png" />
<p class="carousel-text text-muted text-center">
"ungleich provided an excellent service in designing
our system architecture and created secure and stable
appliance. For us it is important to have an enduring
stability in our system, and ungleich's configuration
management system cdist is easy to adapt for our
system administrators. We had a successful
collaboration with ungleich in the time of very
high workload, and their project leading was
high-skilled and very reliable. I would definitely
recommend them to any companies with high demand in
solid infrastructures."
</p>
<p class="text-center">
<strong>- Sebastian Plattner,</strong>
Teamleader Development Cyber Security Products at RUAG
</p>
</div>
</div>
</div>
<!-- end:recommendationSlider -->
<!-- </div>
</div>
</div>
<div class="col-sm-16 text-center center-block">
<h3 class="section-subheading text-muted">*ungleich means not equal to (≠) U+2260. </h3>
</div>
</section>
<!-- Supporters --> <!-- Supporters -->
<section id="supporters"> <section id="supporters">
<div class="supporter-bg"> <div class="supporter-bg">
@ -186,7 +95,7 @@
<hr class="primary"> <hr class="primary">
<p class="carousel-text supporter-intro text-muted text-center"> Here are our proud supporters of project Digital Glarus. Thanks to our supporters, the first cowerking space in Glarus <p class="carousel-text supporter-intro text-muted text-center"> Here are our proud supporters of project Digital Glarus. Thanks to our supporters, the first cowerking space in Glarus
is going to have a new look!</p> is going to have a new look!</p>
<p class="supporter"> <p class="supporter" style="text-transform: uppercase;">
{% for supporter in supporters %} {% for supporter in supporters %}
{{ supporter.name }} {{ supporter.name }}
@ -202,4 +111,28 @@
</div> </div>
</div> </div>
</section> </section>
<section id="contact">
<div class="fill">
<div class="row" class="wow fadeInDown">
<div class="col-lg-12 text-center wow fadeInDown">
<div class=" map-wrap">
<iframe style="pointer-events:none;margin-top:20px;" src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2721.4267495037207!2d9.070190915609343!3d46.99259307914885!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47852e9322cc1971%3A0xf1558647dfdfaa60!2sIn+der+Au+7%2C+8762+Glarus+S%C3%BCd!5e0!3m2!1sen!2sch!4v1470238006004" width="100%" height="450" frameborder="0" style="border:0"></iframe></div>
<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 %} {% endblock %}

15
digitalglarus/templates/new_base_glarus.html
View file

@ -27,6 +27,7 @@
<link href="{% static 'digitalglarus/css/history.css' %}" rel="stylesheet"> <link href="{% static 'digitalglarus/css/history.css' %}" rel="stylesheet">
<!-- <link href="css/bootstrap.min.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 'digitalglarus/css/lib/animate.min.css' %}" rel="stylesheet">
<!-- <link href="{% static 'css/membership.css' %}" rel="stylesheet"> -->
@ -67,7 +68,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<p><a class="navbar-brand page-scroll" href="#page-top"><img src="{% static 'digitalglarus/img/logo_white.svg' %}"></a></p> <p><a class="navbar-brand page-scroll"href="{% url 'digitalglarus:landing' %}"><img src="{% static 'digitalglarus/img/logo_white.svg' %}"></a></p>
</div> </div>
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->
@ -80,7 +81,7 @@
<a class="page-scroll" href="#portfolio">booking & price</a> <a class="page-scroll" href="#portfolio">booking & price</a>
</li> </li>
<li> <li>
<a class="page-scroll" href="#team">history</a> <a class="page-scroll" href="{% url 'digitalglarus:history' %}">history</a>
</li> </li>
<li> <li>
<a class="page-scroll" href="http://blog.ungleich.ch">BLOG</a> <a class="page-scroll" href="http://blog.ungleich.ch">BLOG</a>
@ -89,10 +90,10 @@
<a class="page-scroll" href="#contact">Contact</a> <a class="page-scroll" href="#contact">Contact</a>
</li> </li>
<li> <li>
<a class="page-scroll" href="#contact">Log In</a> <a class="page-scroll" href="{% url 'digitalglarus:login' %}">Log In</a>
</li> </li>
<li> <li>
<a class="page-scroll" href="#contact">Sign Up</a> <a class="page-scroll" href="{% url 'digitalglarus:login' %}">Sign Up</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -131,6 +132,8 @@
</div> </div>
</footer> </footer>
<script type="text/javascript" src="{% static 'digitalglarus/bower_components/jquery/dist/jquery.min.js' %}"></script>
<!-- jQuery --> <!-- jQuery -->
<script src="{% static 'digitalglarus/js/jquery.js' %}"></script> <script src="{% static 'digitalglarus/js/jquery.js' %}"></script>
@ -144,7 +147,9 @@
<!-- Contact Form JavaScript --> <!-- Contact Form JavaScript -->
<script src="{% static 'digitalglarus/js/jqBootstrapValidation.js' %}"></script> <script src="{% static 'digitalglarus/js/jqBootstrapValidation.js' %}"></script>
<script src="{% static 'digitalglarus/js/contact_me.js' %}"></script>
<!-- <script src="{% static 'digitalglarus/js/contact_me.js' %}"></script>
-->
<script src="{% static 'digitalglarus/./js/lib/wow.min.js' %}"></script> <script src="{% static 'digitalglarus/./js/lib/wow.min.js' %}"></script>
<!-- Custom Theme JavaScript --> <!-- Custom Theme JavaScript -->
<script src="{% static 'digitalglarus/js/agency.js' %}"></script> <script src="{% static 'digitalglarus/js/agency.js' %}"></script>

2
digitalglarus/urls.py
View file

@ -3,10 +3,12 @@ from django.utils.translation import ugettext_lazy as _
from . import views from . import views
from .views import ContactView, IndexView, AboutView, HistoryView from .views import ContactView, IndexView, AboutView, HistoryView
from membership.views import LoginRegistrationView
urlpatterns = [ urlpatterns = [
url(_(r'^$'), IndexView.as_view(), name='landing'), url(_(r'^$'), IndexView.as_view(), name='landing'),
url(_(r'contact/?$'), ContactView.as_view(), name='contact'), url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'login/?$'), LoginRegistrationView.as_view(), name='login'),
url(_(r'history/?$'), HistoryView.as_view(), name='history'), url(_(r'history/?$'), HistoryView.as_view(), name='history'),
url(_(r'supporters/?$'), views.supporters, name='supporters'), url(_(r'supporters/?$'), views.supporters, name='supporters'),
url(r'calendar_api/(?P<month>\d+)/(?P<year>\d+)?$', views.CalendarApi.as_view(),name='calendar_api_1'), url(r'calendar_api/(?P<month>\d+)/(?P<year>\d+)?$', views.CalendarApi.as_view(),name='calendar_api_1'),

2
dynamicweb/urls.py
View file

@ -25,7 +25,7 @@ urlpatterns = [ url(r'^index.html$', LandingView.as_view()),
urlpatterns += i18n_patterns('', urlpatterns += i18n_patterns('',
url(r'^/?$', LandingView.as_view()), url(r'^/?$', LandingView.as_view()),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^digitalglarus/login/', include(membership_urls)), url(r'^membership/', include(membership_urls)),
url(r'^digitalglarus/', include('digitalglarus.urls', url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus")), namespace="digitalglarus")),
#url(r'^blog/', include('ungleich.urls', namespace='ungleich')), #url(r'^blog/', include('ungleich.urls', namespace='ungleich')),

11
membership/forms.py
View file

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

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

File diff suppressed because it is too large Load diff

115
membership/templates/login.html
View file

@ -1,59 +1,39 @@
{% load static cms_tags %} {% extends "new_base_glarus.html" %}
<html> {% load staticfiles cms_tags bootstrap3%}
<head> {% block title %}crowdfunding{% endblock %}
<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">
</head> {% block content %}
<body>
<div class="navbar navbar-default navbar-static-top"> <style type="text/css">
<div class="container">
<div class="navbar-header"> .navbar-default {
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-ex-collapse"> background-color: black;
<span class="sr-only">Toggle navigation</span> }
<span class="icon-bar"></span>
<span class="icon-bar"></span> section.login {
<span class="icon-bar"></span> margin-top: 10%;
</button> margin-bottom: 8%;
<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"> </style>
<ul class="nav navbar-nav navbar-right">
<li> <section class="login">
<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">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<h1>I'm already a member!</h1> <h1>I'm already a member!</h1>
<p>To book you need to be logged in.</p> <p>To book you need to be logged in.</p>
<h2>Log in</h2> <h2>Log in</h2>
<hr> <hr>
<form role="form" action="" method="POST"> <form role="form" action="" method="POST" novalidate>
{% csrf_token %} {% csrf_token %}
{{ login_form.non_field_errors }}
{% for field in login_form %} {% for field in login_form %}
<div class="form-group"> <div class="form-group">
{{ field.errors }} <input type="hidden" name="is_login" value="True">
<label class="control-label">{{ field.label }}</label>{{ field }} {% bootstrap_field field type='fields'%}
</div> </div>
{% endfor %} {% endfor %}
{{ login_form.non_field_errors }}
<button type="submit" class="btn btn-default">Submit</button> <button type="submit" class="btn btn-default">Submit</button>
</form> </form>
</div> </div>
@ -67,13 +47,13 @@
<h2>Register</h2> <h2>Register</h2>
<hr> <hr>
<form role="form" action="" method="POST"> <form role="form" action="" method="POST" novalidate>
{% csrf_token %} {% csrf_token %}
<div class="form-group"> <div class="form-group">
{% for field in register_form %} {% for field in register_form %}
{{ field.errors }} {% bootstrap_field field type='fields'%}
<label class="control-label">{{ field.label }}</label> <!-- <label class="control-label">{{ field.label }}</label> -->
{{ field }} <!-- {{ field }} -->
{% endfor %} {% endfor %}
</div> </div>
<button type="submit" class="btn btn-default">Submit</button> <button type="submit" class="btn btn-default">Submit</button>
@ -81,43 +61,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </section>
<footer class="section section-primary">
<div class="container">
<div class="row">
<div class="col-sm-6">
<h1>Digital Glarus</h1>
<p>In der Au 7 8762 Schwanden {% endblock %}
<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>

25
membership/views.py
View file

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

2
ungleich_page/static/ungleich_page/css/agency.css
View file

@ -949,7 +949,7 @@ h6 intro-smallcap {
.carousel-text { .carousel-text {
text-transform : none; text-transform : none;
font-famil:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size : 20px; font-size : 20px;
font-weight : 100; font-weight : 100;
lign-heignt: 2px; lign-heignt: 2px;