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

new cchanges and the other changes

Browse source
This commit is contained in:
Natacha Quintero 2016-11-27 00:35:15 -04:30
commit 0a63917eac
23 changed files with 2030 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,7 @@
<br>
{% endfor %}
<br>
<a href="http://startbootstrap.com/template-overviews/creative/" class="btn btn-default btn-primary sr-button">Become a supporter</a>
<a href="{% url 'digitalglarus:supportus' %}" class="btn btn-default btn-primary sr-button">Become a supporter</a>
<br>
<br>
<br>
@ -118,7 +118,8 @@
<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>
<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

8
digitalglarus/templates/digitalglarus/membership_payment.html
View file

@ -18,6 +18,7 @@
padding: .5em;
padding-right: 1.5em
}
</style>
<section id="price">
@ -97,9 +98,10 @@
<span class="custom-control-indicator"></span>
<span class="custom-control-description">I accept the Digital Glarus <a href="{% url 'digitalglarus:TermsAndConditions' %}" target="_blank">Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span>
</label>
<div class="col-xs-12">
<button class="btn btn-primary btn-md btn-blck submit-payment" type="submit">Purchase membership</button>
<div class="row">
<div class="col-xs-6 col-md-12">
<button class="btn btn-primary btn-md btn-blck submit-payment" type="submit">Purchase membership</button>
</div>
</div>
</div>
<div class="row" style="display:none;">

178
digitalglarus/templates/digitalglarus/supportus.html Normal file
View file

@ -0,0 +1,178 @@
{% extends "new_base_glarus.html" %}
{% load staticfiles cms_tags %}
{% block extra_css %}
<style type="text/css">
.supportus-posts .post-preview {
background-color: white;
padding-right: 3%;
}
.supportus-posts img {
margin:6% !important;
}
.supportus-posts p {
/*font-size: 0.5em !important;*/
}
.supportus-posts .post-meta {
font-size: 0.4em !important;
}
.supporter-white {
color: white;
}
#waystohelp .wow{
background-color: white;
}
.whatwedowith {
margin-top: 0px;
}
</style>
{% endblock %}
{% block content %}
<!-- Header -->
<section>
<div class="supportus">
<div class="container">
<div class="intro-text">
<p>
</p>
<div class="intro-headline-big">
<span class="intro-headline-big">
Become Our Supporter
</span>
</div>
</div>
</div>
</div>
</section>
<!-- form section ends-->
<!-- Services Section -->
<section id="waystohelp">
<div class="col-md-12 col-lg-12 text-center wow fadeInDown">
<div class="help-wrap">
<h2 class="section-heading">3 Ways to Help</h2>
<p class="text-center supporter-lead">The First Coworking Space of Glarus was not possible without our
supporters. <br>
Be our supporter today and help us realize our dream coworking space!</p>
</div>
<div class="help-box-group row">
<div class="col-md-4 col-sm-6 portfolio-item text-center wow fadeInDown">
<div class="supportus-box">
<!-- <a href="#"> -->
<img class="img-responsive img-centered" src="{% static 'digitalglarus/img/supportus/2.png' %}" alt="">
<!-- </a> -->
<h3 class="donate">Get our news</h3>
<div class="help-box">
<hr class="primary">
<p>Subscribe to our mailing list and stay informed on our news at Digital Glarus!
We'll keep you up to date to our events and send you special invitations!</p>
<!-- <div class="submit-box">
<button type="submit" class="btn btn-primary btn-blue">Subscribe</button>
</div>-->
</div>
</div>
</div>
<div class="col-md-4 col-sm-6 text-center wow fadeInDown">
<div class="supportus-box">
<!-- <a href="#"> -->
<img class="img-responsive img-centered image-blog " src="{% static 'digitalglarus/img/supportus/3.png' %}" alt="">
<!-- </a> -->
<h3 class="donate">Connect and Share</h3>
<div class="help-box">
<hr class="primary">
<p>Share your experience at Digital Glarus with your friends and collegues, let the other discover our coworking space!</p>
<!-- <div class="submit-box">
<ul class="list-inline social-buttons">
<li><a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a>
</li>
<li><a href="https://www.facebook.com/digitalglarus/"><i class="fa fa-facebook"></i></a>
</li> </ul>
</div> -->
</div>
</div>
</div>
<div class="col-md-4 col-sm-6 text-center wow fadeInDown">
<div class="supportus-box">
<!-- <a href="#"> -->
<img class="img-responsive img-centered" src="{% static 'digitalglarus/img/supportus/1.png' %}" alt="">
<!-- </a> -->
<h3 class="donate">
Donate now
</h3>
<div class="help-box">
<hr class="primary">
<p>Your donation helps us renovate our 100+years old coworking space! This very old house needs a lot of love.</p>
</div>
</div>
</div>
</div>
</div>
</section>
<section id="whatwedowith">
<div class="col-md-12 col-lg-12 text-center wow fadeInDown whatwedowith">
<div class="whatwe-wrap">
<h2 class="whatwedo">What we do with your support</h2>
<p class="carousel-text text-center supporter-white">Discover how your donation is being used in renovating our coworking space!</p>
<div class="row">
<div class="col-md-6 col-md-offset-3 supportus-posts">
<div class="blog-list">
{% for post in post_list %}
{% include "ungleich/djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
{% endfor %}
</div>
</div>
</div>
</div>
</div>
</section>
<section id="contact">
<div class="row">
<div class="fill wow fadeInDown">
<div class="col-lg-12 text-center wow fadeInDown">
<div class="col-md-4 map-title">
Digital Glarus<br>
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
<p>&nbsp;</p>
</span>
</div>
<p>&nbsp;</p>
</div>
</div>
</div>
</section>
{% endblock %}

74
digitalglarus/templates/new_base_glarus.html
View file

@ -7,7 +7,8 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1"> -->
<meta name="viewport" content="width=device-width" />
<meta name="description" content="">
<meta name="author" content="">
@ -80,14 +81,50 @@
color:white;
}
html,body{
width: 100%;
height: 100%;
margin: 0px;
padding: 0px;
overflow-x: hidden;
}
width: 100%;
height: 100%;
margin: 0px;
padding: 0px;
overflow-x: hidden;
}
@media only screen and (min-width: 769px){
.dropdown.home-dropdown-mobile {
display: none;
}
.dropdown.home-dropdown {
display: block;
}
}
@media only screen and (max-width: 768px){
.dropdown.home-dropdown-mobile {
display: block;
background-color:
}
.dropdown.home-dropdown-mobile .dropdown-menu{
display: block;
background-color: #0f1221;
}
.dropdown.home-dropdown-mobile .dropdown-menu li a {
color:white;
}
.dropdown.home-dropdown-mobile .dropdown-menu li a:hover {
color: #0f1221;
}
.dropdown.home-dropdown {
display: none;
}
}
>>>>>>> upstream/feature/new_digitalglarus
</style>
{% block extra_css %} {% endblock %}
</head>
@ -128,6 +165,29 @@
</li>
{% if request.user.is_authenticated %}
<li class="dropdown home-dropdown-mobile open">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
<i class="glyphicon glyphicon-user"></i>{{request.user.name}} <span class="caret"></span>
</a>
<ul id="g-account-menu" class="dropdown-menu" role="menu">
<li>
<a href="{% url 'digitalglarus:booking_orders_list' %}">
<i class="fa fa-home" aria-hidden="true"></i> {% trans "Bookings"%}
</a>
</li>
<li>
<a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%}
</a>
</li>
<li>
<a href="{% url 'digitalglarus:logout' %}">
<i class="fa fa-lock" aria-hidden="true"></i>
{% trans "Logout"%}
</a>
</li>
</ul>
</li>
<li class="dropdown home-dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
<i class="glyphicon glyphicon-user"></i>{{request.user.name}} <span class="caret"></span>