'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},c.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){var e=a.proxy(this.process,this);this.$body=a("body"),this.$scrollElement=a(a(c).is("body")?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",e),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.2",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b="offset",c=0;a.isWindow(this.$scrollElement[0])||(b="position",c=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var d=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+c,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){d.offsets.push(this[0]),d.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c&&c.$tip&&c.$tip.is(":visible")?void(c.hoverState="in"):(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.options.container?a(this.options.container):this.$element.parent(),p=this.getPosition(o);h="bottom"==h&&k.bottom+m>p.bottom?"top":"top"==h&&k.top-m
'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},c.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){var e=a.proxy(this.process,this);this.$body=a("body"),this.$scrollElement=a(a(c).is("body")?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",e),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.0",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b="offset",c=0;a.isWindow(this.$scrollElement[0])||(b="position",c=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var d=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+c,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){d.offsets.push(this[0]),d.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b
");
+ $('#success > .alert-success').html("");
+ $('#success > .alert-success')
+ .append("Your message has been sent. ");
+ $('#success > .alert-success')
+ .append('
');
+
+ //clear all fields
+ $('#contactForm').trigger("reset");
+ },
+ error: function() {
+ // Fail message
+ $('#success').html("");
+ $('#success > .alert-danger').html("");
+ $('#success > .alert-danger').append("Sorry " + firstName + ", it seems that my mail server is not responding. Please try again later!");
+ $('#success > .alert-danger').append('
');
+ //clear all fields
+ $('#contactForm').trigger("reset");
+ },
+ })
+ },
+ filter: function() {
+ return $(this).is(":visible");
+ },
+ });
+
+ $("a[data-toggle=\"tab\"]").click(function(e) {
+ e.preventDefault();
+ $(this).tab("show");
+ });
+});
+
+
+/*When clicking on Full hide fail/success boxes */
+$('#name').focus(function() {
+ $('#success').html('');
+});
diff --git a/digitalglarus/static/digitalglarus/js/jqBootstrapValidation.js b/digitalglarus/static/digitalglarus/js/jqBootstrapValidation.js
new file mode 100755
index 00000000..7b3b9222
--- /dev/null
+++ b/digitalglarus/static/digitalglarus/js/jqBootstrapValidation.js
@@ -0,0 +1,912 @@
+/* jqBootstrapValidation
+ * A plugin for automating validation on Twitter Bootstrap formatted forms.
+ *
+ * v1.3.6
+ *
+ * License: MIT - " + errorsFound.join("
- ") + "
+
+
+
+
+ +
+
+
+ Where great minds work
+
+
+
+
+
+
+
+
+
+
+ the story of Digital Glarus
+ ++ In search for a better environment for creativity, ungleich + arrived at a small village in Glarus. First we were driven by the + cheap real estate price, then we were genuinely surprised by the beauty of its nature. People were incredibly friendly as well. Working just became so relaxed and enjoyable in such a beautiful + surrounding..How come we are the only ones here?! We can't be + enjoying this alone, we need to let others know about this great + place. That's how it all started... +
+ +we fell in love
+ ++ We didn't see this coming, but we really fell in love with Glarus. The lakes, the mountains, the mist, the (amazing) snow, + the fresh air, the stream, the people, the stars...how could we not? And before long, we found an 100 something years old house, + formerly a family home, but long time unused, next to a river in + Schwanden. Full of old furniture, the house and the neighborhood + was stepping in a time machine. There, we found our first + coworking space in Glarus.
+ +Our crowdfunding success
+ ++ What comes with a very old house? Lots of charm, yes. Great + history, yes. A contract stating that we can park our goats in the + storage room, yes. And, yes, tons of things to be fixed. We + couldn't afford much of renovation-we are a young start up rich + with creativity but not much money (yet)-that is why we decided to ask for help. To our surprise, generous people found hope and + inspiration from our project. We got much supports from people we + know and we don't know. People wrote to us, called us, met us. We + were on the cover of newspaper. We were on TV. We became the talk + of the town. +
+ + + + +And the story continues..!
++ With the money we raised from our crowdfunding campaign, we + started renovating the hourse, ripping floors off and fixing + walls, giving a fresh coat of paint on old walls. We hired Samuel, + who came to Glarus as a refugee from Eritrea, as our intern to + renovate the house and learn computer science. We opened our door for students to live. Our coworking space is growing slowly but + meaningfully. Our journey only started! +
++
+
+
+
+
+
+
+
+
+
+
+ Our Supporters
++
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!
+
+
+ {% for supporter in supporters %}
+ {{ supporter.name }}
+
+ {% endfor %}
+
+ Become a supporter
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Digital Glarus
+ In der Au 7 Schwanden 8762 Switzerland +
info@digitalglarus.ch +
+ (044) 534-66-22 +
+ + In der Au 7 Schwanden 8762 Switzerland +
info@digitalglarus.ch +
+ (044) 534-66-22 +
+ +
+
+
+
+
+
+ +
+
+
+ Where great minds work
+
+
+
+
+ + Book a date today and dive in
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ In Digital Glarus you can..
++
+
+ + +
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+ + + +
+
+
+
+
+
+
+ 
+
+ excursions
+
+ 
+
+
+ enjoy the great outdoors
+
+ 
+
+
+ cultural events
+
+ 
+
+
+ be inspired
+
+ 
+
+
+ workshops
+
+ 
+
+
+ recharge
+
+
+
+
+
+
+ Contact Us
+
+
+
+ Digital Glarus
+ In der Au 7 Schwanden 8762 Switzerland +
info@digitalglarus.ch +
+ (044) 534-66-22 +
+ + In der Au 7 Schwanden 8762 Switzerland +
info@digitalglarus.ch +
+ (044) 534-66-22 +
+ +
+
@@ -19,7 +287,6 @@
+
{% endblock %}
\ No newline at end of file
diff --git a/digitalglarus/templates/index.html b/digitalglarus/templates/index.html
index d7894fb2..aeab4f1e 100644
--- a/digitalglarus/templates/index.html
+++ b/digitalglarus/templates/index.html
@@ -2,6 +2,8 @@
{% load staticfiles cms_tags %}
{% block content %}
+
+
+
{% endblock %}
\ No newline at end of file
diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html
index e75c4139..48a65457 100644
--- a/digitalglarus/templates/new_base_glarus.html
+++ b/digitalglarus/templates/new_base_glarus.html
@@ -4,7 +4,7 @@
{% load i18n %}
-
+
@@ -12,234 +12,155 @@
- Digital Glarus - {% block title %}Welcome{% endblock %}
+ Digital Glarus
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
- {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
- {% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}
-
-
+
-
-
-
-
+
- .intro-cap{
-
- font-size:3em;
- }
- .intro-text a{
- color:white;
- }
-
-
-
-
-
-{% cms_toolbar %}
-
-
-
-
-
-
-
+ {% block content %} {% endblock %}
+
+
+
+
-
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py
index b465da78..26f606a8 100644
--- a/digitalglarus/urls.py
+++ b/digitalglarus/urls.py
@@ -2,11 +2,14 @@ from django.conf.urls import url
from django.utils.translation import ugettext_lazy as _
from . import views
-from .views import ContactView, IndexView, AboutView
+from .views import ContactView, IndexView, AboutView, HistoryView
+from membership.views import LoginRegistrationView
urlpatterns = [
url(_(r'^$'), IndexView.as_view(), name='landing'),
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'supporters/?$'), views.supporters, name='supporters'),
url(r'calendar_api/(?P
@@ -96,4 +98,5 @@
+{% block content %}
+
+
+
+
-
@@ -67,13 +47,13 @@
-
-
-
-
-
-
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/membership/views.py b/membership/views.py
index 9115f578..fded13e1 100644
--- a/membership/views.py
+++ b/membership/views.py
@@ -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):
diff --git a/nosystemd/static/nosystemd/css/creative.css b/nosystemd/static/nosystemd/css/creative.css
index a2783afa..24e9347a 100755
--- a/nosystemd/static/nosystemd/css/creative.css
+++ b/nosystemd/static/nosystemd/css/creative.css
@@ -155,7 +155,7 @@ header {
background-size: cover;
-o-background-size: cover;
background-position: center;
- background-image: url('../img/header.jpg');
+ background-image: url('../img/bg-price.png');
text-align: center;
color: white;
}
@@ -206,6 +206,8 @@ header .header-content .header-content-inner p {
max-width: 80%;
margin-left: auto;
margin-right: auto;
+ letter-spacing: 0.015em;
+ font-family: 'Roboto','Helvetica Neue', Arial, sans-serif;
}
}
.section-heading {
diff --git a/nosystemd/static/nosystemd/css/nosystemd.css b/nosystemd/static/nosystemd/css/nosystemd.css
index 28b7b7e6..5a4e2048 100644
--- a/nosystemd/static/nosystemd/css/nosystemd.css
+++ b/nosystemd/static/nosystemd/css/nosystemd.css
@@ -5,9 +5,10 @@ form{
}
-.donation-container {
+header.donation-container {
- margin-top:0% !important;
+ padding-top:0% !important;
+ height: 1100px;
}
@@ -32,3 +33,14 @@ form{
.white-font {
color:white;
}
+
+.form-heading {
+
+ margin-bottom: 20px;
+
+}
+
+.roboto-font {
+
+ font-family: Roboto, Helvetica Neue, Helvetica, sanserif;
+}
\ No newline at end of file
diff --git a/nosystemd/static/nosystemd/img/bg-price.png b/nosystemd/static/nosystemd/img/bg-price.png
new file mode 100644
index 00000000..91c3f0b8
Binary files /dev/null and b/nosystemd/static/nosystemd/img/bg-price.png differ
diff --git a/nosystemd/templates/nosystemd/base.html b/nosystemd/templates/nosystemd/base.html
index 802694ab..7fc16ec9 100644
--- a/nosystemd/templates/nosystemd/base.html
+++ b/nosystemd/templates/nosystemd/base.html
@@ -50,7 +50,7 @@
Toggle navigation Menu
- I'm already a member!
-To book you need to be logged in.
-Log in
-
Register
-
+ no more systemd
diff --git a/nosystemd/templates/nosystemd/donation.html b/nosystemd/templates/nosystemd/donation.html
index 0156db4d..fc478aa0 100644
--- a/nosystemd/templates/nosystemd/donation.html
+++ b/nosystemd/templates/nosystemd/donation.html
@@ -3,8 +3,8 @@
{% block content %}
-
+
+
- {% trans "Forgot your password ? "%} + {% trans "Forgot your password ? "%}
diff --git a/nosystemd/templates/nosystemd/reset_password.html b/nosystemd/templates/nosystemd/reset_password.html
index 315ea78a..abffb2da 100644
--- a/nosystemd/templates/nosystemd/reset_password.html
+++ b/nosystemd/templates/nosystemd/reset_password.html
@@ -26,7 +26,7 @@
{% endbuttons %}
- {% trans "Already have an account ?"%} {% trans "Login"%}
+ {% trans "Already have an account ?"%} {% trans "Login"%}
diff --git a/nosystemd/templates/nosystemd/signup.html b/nosystemd/templates/nosystemd/signup.html
index 0a6a9dec..870e496b 100644
--- a/nosystemd/templates/nosystemd/signup.html
+++ b/nosystemd/templates/nosystemd/signup.html
@@ -14,7 +14,7 @@
@@ -17,10 +17,8 @@
@@ -55,7 +53,7 @@
diff --git a/nosystemd/templates/nosystemd/login.html b/nosystemd/templates/nosystemd/login.html
index e24e6f62..059f261d 100644
--- a/nosystemd/templates/nosystemd/login.html
+++ b/nosystemd/templates/nosystemd/login.html
@@ -27,7 +27,7 @@
-
+
-
{% bootstrap_field form.donation_amount show_label=False type='fields'%}
-
-
+
{% trans "Log in "%}
- {% trans "Don't have an account yet ? "%}{% trans "Sign up"%} + {% trans "Don't have an account yet ? "%}{% trans "Sign up"%}- {% trans "Forgot your password ? "%} + {% trans "Forgot your password ? "%}
diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css
index 45a682b0..7e94523f 100755
--- a/ungleich_page/static/ungleich_page/css/agency.css
+++ b/ungleich_page/static/ungleich_page/css/agency.css
@@ -949,7 +949,7 @@ h6 intro-smallcap {
.carousel-text {
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-weight : 100;
lign-heignt: 2px;