Merge pull request #116 from levivm/feature/nosystemd

Feature/nosystemd
Fixed Sign up H2 margin , Added Login Headline, Added Header Background, Changed ungleich logo, Fixed Landing title style, Fixed billing form goes out of background image, Fixed billing address page amount field seems broken, Changed authentication page fonts
2016-08-15 22:19:23 -05:00 · 2016-08-15 20:45:08 -05:00 · 2016-08-11 01:07:12 -05:00 · 2016-08-09 23:53:49 -05:00 · 2016-08-09 01:07:39 -05:00 · 2016-08-09 01:07:08 -05:00
19 changed files with 8470 additions and 484 deletions
--- a/digitalglarus/static/digitalglarus/css/agency.css
+++ b/digitalglarus/static/digitalglarus/css/agency.css
@ -1074,7 +1074,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;
--- a/digitalglarus/static/digitalglarus/css/history.css
+++ b/digitalglarus/static/digitalglarus/css/history.css
@ -1,7 +1,7 @@
@charset "UTF-8";
 /* CSS Document */

-header {
+header.history {
    text-align: center;
    color: #fff;
    background-attachment: scroll;
@ -13,6 +13,7 @@ header {
    background-size: cover;
    -o-background-size: cover;
 }
+
 .supporter {
    font-size:18px;
    font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif;
--- a/digitalglarus/templates/digitalglarus/history.html
+++ b/digitalglarus/templates/digitalglarus/history.html
@ -5,357 +5,86 @@
 {% block content %}

 <!-- Header -->
-    <header>
-      <div class="container">
-      <div class="intro-text">
-        <p>
-         </p>
-           <div class="intro-headline">
-             <span class="intro-headline">
-                Where great minds work
-             </span>
-           </div>
-           </div>
-        </div>  
+    <header class="history">
+      <div class="container header-history">
+        <div class="intro-text">
+          <p>
+           </p>
+             <div class="intro-headline">
+               <span class="intro-headline">
+                  Where great minds work
+               </span>
+             </div>
+        </div>
+      </div>  
     </div>
-     </header>
+    </header>
 <!-- form section ends-->
    <!-- Services Section -->
    <section id="history">
      <div class="container-fluid">
-  <div class="row-fluid">
-    <div class="col-lg-12 col-md-12 text-center wow fadeInDown">
-      <span class="glyphicon glyphicon-star glyphicon-inverse"></span>
-      <h2 class="section-heading">the story of Digital Glarus</h2>
-       
-        <p class="carousel-text text-center supporter-black">
-        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... 
-         </p> 
-        <span class="glyphicon glyphicon-heart glyphicon-inverse"></span>
-         <h2 class="section-heading">we fell in love</h2>
-        
-        <p class="carousel-text text-center supporter-black">
-        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.</p>
-         <span class="glyphicon glyphicon-home glyphicon-inverse"></span>
-         <h2 class="section-heading">Our crowdfunding success</h2>
-        
-         <p class="carousel-text text-center supporter-black">
-        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.
-        </p>
-        <img src="{% static 'digitalglarus/img/100days.png' %}" width="220" height="330">
-        <span class="glyphicon glyphicon-road glyphicon-inverse"></span>
-        <h2 class="section-heading">And the story continues..!</h2>
-        <p class="carousel-text text-center supporter-black">
-        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!
-        </p>
-        <hr class="primary">
-    </div>
-  </div>
-    <!--dropdown icons-->
-<!--<div class="row text-center">
-    <div class="col-xs-6 col-sm-3">
-      <div class="team-member wow fadeInDown" data-wow-delay="0.3s">
-        <img src="img/services/sleep.svg" class="img-responsive img-toggle" alt="">
-      </div>
-    </div>
-    <div class="col-xs-6 col-sm-3">
-      <div class="team-member wow fadeInDown" data-wow-delay="0.5s">
-        <img src="img/services/eat.svg" class="img-responsive img-toggle" alt="">
-      </div>
-    </div>
-    <div class="col-xs-6 col-sm-3">
-      <div class="team-member wow fadeInDown" data-wow-delay="0.7s">
-        <img src="img/services/freshenup.svg" class="img-responsive img-toggle cursor-pointer" alt="">
-      </div>
-    </div>
-      <div class="col-xs-6 col-sm-3">
-      <div class="team-member wow fadeInDown" data-wow-delay="0.8s">
-        <img src="img/services/work.svg" class="img-responsive img-toggle" alt="">
-    </div>
-      </div>
-      <div class="row text-center" style="margin-left: 0px; margin-right: 0px;">
-    <div class="col-xs-6 col-sm-3">
-      <div class="team-member wow fadeInDown" data-wow-delay="0.9s">
-        <img src="img/services/enjoy.svg" class="img-responsive img-toggle" alt="">
-      </div>
-    </div>
-    <div class="col-xs-6 col-sm-3">
-      <div class="team-member wow fadeInDown" data-wow-delay="1s">
-        <img src="img/services/network.svg" class="img-responsive img-toggle" alt=""> 
-      </div>
-    </div>
-    <div class="col-xs-6 col-sm-3">
-      <div class="team-member wow fadeInDown" data-wow-delay="1.1s">
-        <img src="img/services/lightbulb.svg" class="img-responsive img-toggle cursor-pointer" alt="">
-      </div>
-    </div>
-      <div class="col-xs-6 col-sm-3">
-      <div class="team-member wow fadeInDown" data-wow-delay="1.2s">
-        <img src="img/services/beinspired.svg" class="img-responsive img-toggle" alt="">
-      </div>
-    </div>
-  </div>
-    -->
-      <!-- start:recommendationSlider -->
-   <!--    <hr class="primary">
-      <div id="carousel-recommendation-ungleich" class="carousel slide ungleich ungleich-gallery ungleich-gallery-text-carousel" data-ride="carousel" data-interval="false">-->
-        <!-- 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>-->
+        <div class="row-fluid">
+          <div class="col-lg-12 col-md-12 text-center wow fadeInDown">
+            <span class="glyphicon glyphicon-star glyphicon-inverse"></span>
+            <h2 class="section-heading">the story of Digital Glarus</h2>
+             
+              <p class="carousel-text text-center supporter-black">
+              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... 
+               </p> 
+              <span class="glyphicon glyphicon-heart glyphicon-inverse"></span>
+               <h2 class="section-heading">we fell in love</h2>
+              
+              <p class="carousel-text text-center supporter-black">
+              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.</p>
+               <span class="glyphicon glyphicon-home glyphicon-inverse"></span>
+               <h2 class="section-heading">Our crowdfunding success</h2>
+              
+               <p class="carousel-text text-center supporter-black">
+              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.
+              </p>

-        <!-- Wrapper for slides -->
-      <!--  <div class="carousel-inner" role="listbox">
-    <div class="item active">
-      <p class="carousel-text text-muted text-center">
-        When we first moved our company HQ to Glarus, 
-            we couldn't believe how beautiful and peaceful 
-            a workplace could be. Then we thought, we can't be 
-            the only ones appreciating it, more people should 
-            know about this.
-      </p>
-      <p class="text-center">
-        <strong>- Nico Schottelius</strong>, CEO at ungleich GmbH
-      </p>
-    </div>
-    <div class="item">
-      <p class="carousel-text text-muted text-center">
-        something something
-      </p>
-      <p class="text-center">
-        <strong> - Alain Lafon </strong>, Co-founder of 200ok
-      </p>
-    </div>
-    <div class="item">
-      <p class="carousel-text text-muted text-center">
-        We have this beautiful nature like on a holiday, 
-            but it is still a working environment and you can 
-            really focus and be productive.
-      <p class="text-center">
-        <strong>- Gregor Martius,</strong>
-        Swiss Federal Institute for Forest, Snow and Landscape Research WSL
-      </p>
-    </div>
+
+              <div><iframe class="center-block" frameborder="0" height="330" scrolling="no" src="//www.100-days.net/de/projekt/start-digital-glarus/widget/v2" width="220"></iframe></div>
+              <span class="glyphicon glyphicon-road glyphicon-inverse"></span>
+              <h2 class="section-heading text-cente">And the story continues..!</h2>
+              <p class="carousel-text text-center supporter-black">
+              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!
+              </p>
+              <hr class="primary">
+          </div>
        </div>
-      </div>-->
-      <!-- end:recommendationSlider -->
-    </div></section>
-
-    <!-- Portfolio Grid Section -->
-    <!--
-    <section id="portfolio" class="no-padding">
-      <div class="container-fluid">
-  <!--<div class="row">
-    <div class="col-lg-12 text-center wow fadeInDown">
-      <h2 class="section-heading">here you can</h2>
-      <h3 class="section-subheading text-muted">Join our community. Inspire and be inspired.</h3>
-    </div>
-  </div>
-  <div class="row no-gutter popup-gallery">
-    <div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="0.5s">
-        <img src="img/portfolio/excursion.png" class="img-responsive inline-block" alt=""> 
-        <div class="caption portfolio-caption-white">excursions</div>
-    </div><div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="0.8s">
-      <img src="img/portfolio/ski.png" class="img-responsive inline-block" alt="">
-        <div class="caption portfolio-caption-white">enjoy the great outdoors</div>
-    </div>
-    <div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="1.1s">
-      <img src="img/portfolio/concert.png" class="img-responsive inline-block" alt="">
-        <div class="caption portfolio-caption-white">cultural events</div>
-    </div>
-      <div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="1.2s">
-      <img src="img/portfolio/inspire.png" class="img-responsive inline-block" alt="">
-        <div class="caption portfolio-caption-white">be inspired</div>
-    </div>
-    <div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="1.3s">
-      <img src="img/portfolio/workshop.png" class="img-responsive inline-block" alt="">
-        <div class="caption portfolio-caption-white">workshops</div>
-    </div>
-    <div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="1.4s">
-      <img src="img/portfolio/recharge.png" class="img-responsive inline-block" alt="">
-        <div class="caption portfolio-caption-white">recharge</div>
-    </div>
-   </div>
- 
-
-    </section>-->
-    <!--aside-->
-   <!-- <aside class="bg-dark">
-        <div class="container text-center">
-            <div class="call-to-action aside-caption-white">
-                 Join our community. Be our member now!
-                <br>
-                <br>
-                <a href="http://startbootstrap.com/template-overviews/creative/" class="btn btn-default btn-primary sr-button">    Sign Up    </a>
-            </div>
-        </div>
-    </aside>-->
-    <!-- Half Page Image Background Carousel -->
-    <div id="myCarousel" class="carousel slide">
-        <!-- Indicators -->
-        <ol class="carousel-indicators">
-            <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-            <li data-target="#myCarousel" data-slide-to="1"></li>
-            <li data-target="#myCarousel" data-slide-to="2"></li>
-            <li data-target="#myCarousel" data-slide-to="3"></li>
-        </ol>
-
-        <!-- Wrapper for Slides -->
-        <div class="carousel-inner">
-            <div class="item active">
-                <!-- Set the first background image using inline CSS below. -->
-                <div class="fill" style="background-image:url({% static 'digitalglarus/img/history/livingroom-1.jpg' %})"></div>
-                <div class="carousel-caption carousel-caption-text">
-                    OpenNebula workshop : <br> 
-                    push your geeky boundary with us at Digital Chalet
-                </div>
-            </div>
-            <div class="item">
-                <!-- Set the second background image using inline CSS below. -->
-                <div class="fill" style="background-image:url({% static 'digitalglarus/img/history/livingroom-2.jpg' %})"></div>
-                <div class="carousel-caption carousel-caption-text">
-                   Lorawan meetup :  <br>
-                   connect with like-minded people and discuss your latest tech obsession.
-                </div>
-            </div>
-            <div class="item">
-                <!-- Set the third background image using inline CSS below. -->  
-                <div class="fill" style="background-image:url({% static 'digitalglarus/img/portfolio/slider_3.png' %})"></div>
-                <div class="carousel-caption carousel-caption-text">
-                   Cooking and Hacking at Digital Chalet Schwanden
-                </div>
-            </div>
-            <div class="item">
-                <!-- Set the third background image using inline CSS below. -->
-                <div class="fill" style="background-image:url({% static 'digitalglarus/img/portfolio/slider_4.png' %})"></div>
-                <div class="carousel-caption carousel-caption-text">
-                  Dive into the beautiful nature around you anytime you want
-                </div>
-            </div>
-        </div>
-
-        <!-- Controls -->
-        <a class="left carousel-control" href="#myCarousel" data-slide="prev">
-            <span class="glyphicon glyphicon-chevron-left"></span>
-        </a>
-        <a class="right carousel-control" href="#myCarousel" data-slide="next">
-            <span class="glyphicon glyphicon-chevron-right"></span>
-        </a>
+      </div>
    </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>
+    <!-- Half Page Image Background Carousel -->
+    <section>
+      <div>
+        <iframe frameborder="0" width="100%" height="650" src="//cdn.knightlab.com/libs/timeline3/latest/embed/index.html?source=15clFd1fjnVScVziBlF-X7j5M7V6uNFt9jt9QZVylaYI&amp;font=Default&amp;lang=en&amp;initial_zoom=2&amp;height=650" width="100%"></iframe>
+      </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 -->
    <section id="supporters">
@ -366,7 +95,7 @@
        <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 
        is going to have a new look!</p>
-    <p class="supporter">
+    <p class="supporter" style="text-transform: uppercase;">

    {% for supporter in supporters %}
        {{ supporter.name }}
@ -383,23 +112,27 @@
      </div>
    </section>

+
    <section id="contact">
      <div class="fill">
-        <div class="row" class="wow fadeInDown">
-          <div class="col-lg-12 text-center wow fadeInDown">
-            <h2 class="section-heading">Contact Us</h2>
+       <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>
+              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>
+             <p>&nbsp;</p>
          </div>
        </div>
      </div>
    </section>
+
+
 {% endblock %}
--- a/digitalglarus/templates/new_base_glarus.html
+++ b/digitalglarus/templates/new_base_glarus.html
@ -23,10 +23,11 @@
      type="text/css">

    <link href="{% static 'digitalglarus/css/agency.css' %}" rel="stylesheet">
-    <link href="{% static 'digitalglarus/css/history.css' %}" rel="stylesheet">
    <link href="{% static 'digitalglarus/css/ungleich.css' %}" rel="stylesheet">
+    <link href="{% static 'digitalglarus/css/history.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"> -->



@ -67,7 +68,7 @@
        <span class="icon-bar"></span>
        <span class="icon-bar"></span>
      </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>

    <!-- Collect the nav links, forms, and other content for toggling -->
@ -80,7 +81,7 @@
          <a class="page-scroll" href="#portfolio">booking & price</a>
        </li>
        <li>
-          <a class="page-scroll" href="#team">history</a>
+          <a class="page-scroll" href="{% url 'digitalglarus:history' %}">history</a>
        </li>
        <li>
          <a class="page-scroll" href="http://blog.ungleich.ch">BLOG</a>
@ -89,10 +90,10 @@
          <a class="page-scroll" href="#contact">Contact</a>
        </li>
        <li>
-          <a class="page-scroll" href="#contact">Log In</a>
+          <a class="page-scroll" href="{% url 'digitalglarus:login' %}">Log In</a>
        </li>
         <li>
-          <a class="page-scroll" href="#contact">Sign Up</a>
+          <a class="page-scroll" href="{% url 'digitalglarus:login' %}">Sign Up</a>
        </li>
      </ul>
    </div>
@ -111,6 +112,8 @@
      </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>
@ -129,6 +132,8 @@
      </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>

@ -142,7 +147,9 @@

 <!-- 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/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>
--- a/digitalglarus/urls.py
+++ b/digitalglarus/urls.py
@ -3,10 +3,12 @@ from django.utils.translation import ugettext_lazy as _

 from . import views
 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<month>\d+)/(?P<year>\d+)?$', views.CalendarApi.as_view(),name='calendar_api_1'),
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@ -25,7 +25,7 @@ urlpatterns = [   url(r'^index.html$', LandingView.as_view()),
 urlpatterns += i18n_patterns('',
                             url(r'^/?$', LandingView.as_view()),
                             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',
                                                             namespace="digitalglarus")),
                             #url(r'^blog/', include('ungleich.urls', namespace='ungleich')),
--- a/membership/forms.py
+++ b/membership/forms.py
@ -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:
--- a/membership/static/css/membership.css
+++ b/membership/static/css/membership.css
--- a/membership/templates/login.html
+++ b/membership/templates/login.html
@ -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 %}
--- 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):
--- 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 {
--- 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;
+}
--- a/nosystemd/static/nosystemd/img/bg-price.png
+++ b/nosystemd/static/nosystemd/img/bg-price.png
--- a/nosystemd/templates/nosystemd/base.html
+++ b/nosystemd/templates/nosystemd/base.html
@ -50,7 +50,7 @@
                    <span class="sr-only">Toggle navigation</span> Menu <i class="fa fa-bars"></i>
                </button>
                
-                <a class="navbar-brand page-scroll" href="{% url 'nosystemd:landing' %}"><img src="{% static 'hosting/img/logo_black.svg' %}"></a>
+                 <a class="navbar-brand page-scroll" href="{% url 'nosystemd:landing' %}">no more systemd</a>
            </div>

            <!-- Collect the nav links, forms, and other content for toggling -->
--- a/nosystemd/templates/nosystemd/donation.html
+++ b/nosystemd/templates/nosystemd/donation.html
@ -3,8 +3,8 @@
 {% block content %} 
 <!-- Credit card form -->

-    <header>
-        <div class="header-content donation-container">
+    <header class="donation-container">
+        <div class="header-content ">
        	<div class="header-content-inner ">

 				<div class="container">
@ -17,10 +17,8 @@
 			                        <div class="row">
 			                            <div class="col-xs-9 col-md-4 col-md-offset-4">
 											<div class="form-group">
-												<div class="input-group">
 													{% bootstrap_field form.donation_amount show_label=False type='fields'%}
 													<!-- <input  type="number" class="form-control" placeholder="Amount to donate"  name="donation" /> -->
-												</div>
 											</div>
 										</div>
 									</div>
@ -55,7 +53,7 @@
 				                                <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-credit-card"></i></span>
+				                                        <span class="input-group-addon"><i class="fa fa-user" aria-hidden="true"></i></span>
 				                                    </div>
 				                                </div>                            
 				                            </div>
--- a/nosystemd/templates/nosystemd/login.html
+++ b/nosystemd/templates/nosystemd/login.html
@ -27,7 +27,7 @@



-
+                    <h2  class="section-heading form-heading">{% trans "Log in "%}</h2>
                    <form action="{% url 'nosystemd:login' %}" method="post" class="form" novalidate>
                        {% csrf_token %}
                        <input type="hidden" name="" value="{{ request.GET.next }}">
@ -41,9 +41,9 @@
                            </button>
                        {% endbuttons %}
                    </form>
-                    <span>{% trans "Don't have an account yet ? "%}<a class="unlink" href="{% url 'nosystemd:signup' %}">{% trans "Sign up"%}</a></span>
+                    <span class="roboto-font">{% trans "Don't have an account yet ? "%}<a class="unlink" href="{% url 'nosystemd:signup' %}">{% trans "Sign up"%}</a></span>
                    <br/>
-                    <span> <a class="unlink" href="{% url 'nosystemd:reset_password' %}">{% trans "Forgot your password ? "%}</a></span>
+                    <span> <a class="unlink roboto-font" href="{% url 'nosystemd:reset_password' %}">{% trans "Forgot your password ? "%}</a></span>


                </div>
--- a/nosystemd/templates/nosystemd/reset_password.html
+++ b/nosystemd/templates/nosystemd/reset_password.html
@ -26,7 +26,7 @@
                                            </button>
                                        {% endbuttons %}
                                    </form>
-                                    <span>{% trans "Already have an account ?"%} <a class="unlink" href="{% url 'nosystemd:login' %}">{% trans "Login"%} </a></span>
+                                    <span class="roboto-font">{% trans "Already have an account ?"%} <a class="unlink" href="{% url 'nosystemd:login' %}">{% trans "Login"%} </a></span>
                                    <ul class="list-inline intro-social-buttons">
                                    </ul>
                              </div>
--- a/nosystemd/templates/nosystemd/signup.html
+++ b/nosystemd/templates/nosystemd/signup.html
@ -14,7 +14,7 @@
                        <div class="col-md-3 col-sm-4 col-xs-4">&nbsp;</div>
                        <div class="col-md-4 col-sm-6 col-xs-6">
                            <div class="intro-message">
-                                <h2  class="section-heading">{% trans "Sign up"%}</h2>
+                                <h2  class="section-heading form-heading">{% trans "Sign up"%}</h2>

                                <form action="{% url 'nosystemd:signup' %}" method="post" class="form" novalidate>
                                    {% if request.GET.next %}
@ -30,7 +30,7 @@
                                        </button>
                                    {% endbuttons %}
                                </form>
-                                <span>{% trans "Already have an account ?"%} <a class="unlink" href="{% url 'nosystemd:login' %}">{% trans "Login"%}</a></span>
+                                <span class="roboto-font">{% trans "Already have an account ?"%} <a class="unlink" href="{% url 'nosystemd:login' %}">{% trans "Login"%}</a></span>
                                <ul class="list-inline intro-social-buttons">
                                </ul>
                          </div>
--- 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;