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

Deleted old carousel history.html, Added new carousel to history.html, previously on crowdfunding page. Linked 100days/startdigitalglarus to history.html, Fixed contact issue in history.html, Changed index.html background, Changed history.html backend, Delete contact us from history.html, Added Facebook icon on footer

Browse source
This commit is contained in:
Levi 2016-08-09 23:53:49 -05:00
commit d567bd257f
3 changed files with 79 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

3
digitalglarus/static/digitalglarus/css/history.css
View file

@ -1,7 +1,7 @@
@charset "UTF-8"; @charset "UTF-8";
/* CSS Document */ /* CSS Document */
header { header.history {
text-align: center; text-align: center;
color: #fff; color: #fff;
background-attachment: scroll; background-attachment: scroll;
@ -13,6 +13,7 @@ header {
background-size: cover; background-size: cover;
-o-background-size: cover; -o-background-size: cover;
} }
.supporter { .supporter {
font-size:18px; font-size:18px;
font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif; font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif;

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

@ -5,8 +5,8 @@
{% block content %} {% block content %}
<!-- Header --> <!-- Header -->
<header> <header class="history">
<div class="container"> <div class="container header-history">
<div class="intro-text"> <div class="intro-text">
<p> <p>
</p> </p>
@ -60,9 +60,11 @@
were on the cover of newspaper. We were on TV. We became the talk were on the cover of newspaper. We were on TV. We became the talk
of the town. of the town.
</p> </p>
<img src="{% static 'digitalglarus/img/100days.png' %}" width="220" height="330">
<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> <span class="glyphicon glyphicon-road glyphicon-inverse"></span>
<h2 class="section-heading">And the story continues..!</h2> <h2 class="section-heading text-cente">And the story continues..!</h2>
<p class="carousel-text text-center supporter-black"> <p class="carousel-text text-center supporter-black">
With the money we raised from our crowdfunding campaign, we With the money we raised from our crowdfunding campaign, we
started renovating the hourse, ripping floors off and fixing started renovating the hourse, ripping floors off and fixing
@ -74,199 +76,17 @@
<hr class="primary"> <hr class="primary">
</div> </div>
</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>
<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>-->
<!-- 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>
</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>
</section> </section>
<!-- 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>
</section>
<!--carousel--> <!--carousel-->
<!-- Team Section --> <!-- Team Section -->
@ -382,24 +202,4 @@
</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">
<h2 class="section-heading">Contact Us</h2>
<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 %}

4
digitalglarus/templates/new_base_glarus.html
View file

@ -23,8 +23,8 @@
type="text/css"> type="text/css">
<link href="{% static 'digitalglarus/css/agency.css' %}" rel="stylesheet"> <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/ungleich.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">
@ -111,6 +111,8 @@
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<ul class="list-inline social-buttons"> <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><a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a>
</li> </li>
<li><a href="https://github.com/ungleich"><i class="fa fa-github"></i></a> <li><a href="https://github.com/ungleich"><i class="fa fa-github"></i></a>