Merge branch 'master' into feature/notifybymail

This commit is contained in:
Nico Schottelius 2015-08-09 22:15:29 +02:00
commit 51a398927f
6 changed files with 14 additions and 247 deletions

View file

@ -11,7 +11,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<title>Digital.Glarus - {% block title %}Welcome{% endblock %}</title> <title>Digital Glarus - {% block title %}Welcome{% endblock %}</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
@ -43,7 +43,7 @@
<body> <body>
<div class="brand">Digital.Glarus</div> <div class="brand">Digital Glarus</div>
<div class="address-bar">#1 IT Valley of Switzerland | Luchsingen, 8775 GL Switzerland | From 2015.12.25</div> <div class="address-bar">#1 IT Valley of Switzerland | Luchsingen, 8775 GL Switzerland | From 2015.12.25</div>
<!-- Navigation --> <!-- Navigation -->
@ -58,7 +58,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<!-- navbar-brand is hidden on larger screens, but visible when the menu is collapsed --> <!-- navbar-brand is hidden on larger screens, but visible when the menu is collapsed -->
<a class="navbar-brand" href="index.html">digital.Glarus</a> <a class="navbar-brand" href="index.html">Digital Glarus</a>
</div> </div>
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

View file

@ -8,7 +8,7 @@
<div class="col-lg-12"> <div class="col-lg-12">
<hr> <hr>
<h2 class="intro-text text-center">Contact <h2 class="intro-text text-center">Contact
<strong>DIGITAL.GLARUS</strong> <strong>DIGITAL GLARUS</strong>
</h2> </h2>
<hr> <hr>
</div> </div>
@ -21,7 +21,7 @@
<strong>+41 (0) 44 534 66 22</strong> <strong>+41 (0) 44 534 66 22</strong>
</p> </p>
<p>Email: <p>Email:
<strong><a href="mailto:digital.glarus@ungleich.ch">digital.glarus@ungleich.ch</a></strong> <strong><a href="mailto:digitalglarus@ungleich.ch">digitalglarus@ungleich.ch</a></strong>
</p> </p>
<p>Address: <p>Address:
<strong>Hauptstrasse 14, 8775 Luchsingen<br> <strong>Hauptstrasse 14, 8775 Luchsingen<br>

View file

@ -30,11 +30,11 @@
<h2 class="brand-before"> <h2 class="brand-before">
<small>Welcome to</small> <small>Welcome to</small>
</h2> </h2>
<h1 class="brand-name">digital.Glarus</h1> <h1 class="brand-name">Digital Glarus</h1>
<hr class="tagline-divider"> <hr class="tagline-divider">
<h2> <h2>
<small>By <small>By
<strong>ungleich gmbh</strong> <strong><a href="http://ungleich.ch">ungleich gmbh</a></strong>
</small> </small>
</h2> </h2>
</div> </div>
@ -90,11 +90,11 @@
<hr> <hr>
<h2 class="intro-text text-center">how to <strong>realize</strong></h2> <h2 class="intro-text text-center">how to <strong>realize</strong></h2>
<hr> <hr>
<p>At the moment we at <a href="http://www.ungleich.ch"> ungleich</a> are talking to authorities and  sponsors. It is crucial to build up some basic infrastructure and  attract early adopters. Building a community (<a href=meetup.ch>meetup</a> alike)  can be helpful, but competitive pricing as well as superior infrastructure are crucial for success.</p> <p>At the moment we at <a href="http://www.ungleich.ch"> ungleich</a> are talking to authorities and  sponsors. It is crucial to build up some basic infrastructure and  attract early adopters. Building a community (<a href=http://www.meetup.ch>meetup</a> alike)  can be helpful, but competitive pricing as well as superior infrastructure are crucial for success.</p>
<p>Have you become interested in the project? <p>Have you become interested in the project?
<p>Contact us at<br> <p>Contact us at<br>
<br> <br>
<a href="mailto:digital.glarus@ungleich.ch">digital.glarus@ungleich.ch</a> // <a href="tel:%2B41%20%280%29%2044%20534%2066%2022" value="+41445346622">+41 (0) 44 534 66 22</a> <a href="mailto:digitalglarus@ungleich.ch">digitalglarus@ungleich.ch</a> // <a href="tel:%2B41%20%280%29%2044%20534%2066%2022" value="+41445346622">+41 (0) 44 534 66 22</a>
</p> </p>
</p> </p>
<p>&nbsp;</p> <p>&nbsp;</p>

View file

@ -1,214 +0,0 @@
{% load staticfiles %}
<!DOCTYPE html>
<html lang="en">
<head>
<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="description" content="">
<meta name="author" content="">
<title>Digital.Glarus - {% block title %}Welcome{% endblock %}</title>
<!-- Bootstrap Core CSS -->
<link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
<!-- Custom CSS -->
<link href="{% static 'digitalglarus/css/business-casual.css' %}" rel="stylesheet">
<!-- Fonts -->
<link href="http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Josefin+Slab:100,300,400,600,700,100italic,300italic,400italic,600italic,700italic" rel="stylesheet" type="text/css">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-62285904-2', 'auto');
ga('send', 'pageview');
</script>
</head>
<body>
<div class="brand">Digital.Glarus</div>
<div class="address-bar">#1 IT Valley of Switzerland | Luchsingen, 8775 GL Switzerland | From 2015.12.25</div>
<!-- Navigation -->
<nav class="navbar navbar-default" role="navigation">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- navbar-brand is hidden on larger screens, but visible when the menu is collapsed -->
<a class="navbar-brand" href="index.html">digital.Glarus</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li>
<a href="{% url 'digitalglarus:index' %}">Home</a>
</li>
<li>
<a href="{% url 'digitalglarus:index' %}">About</a>
</li>
<li>
<a href="{% url 'digitalglarus:index' %}">Contact</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav>
<div class="container">
<div class="row">
<div class="box">
<div class="col-lg-12 text-center">
<div id="carousel-example-generic" class="carousel slide">
<!-- Indicators --><!-- Wrapper for slides -->
<div class="carousel-inner">
<div class="item active">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-1.jpg' %}" alt="">
</div>
<div class="item">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-2.jpg' %}" alt="">
</div>
<div class="item">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
</div>
</div>
<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
<span class="icon-next"></span>
</a>
</div>
<h2 class="brand-before">
<small>Welcome to</small>
</h2>
<h1 class="brand-name">digital.Glarus</h1>
<hr class="tagline-divider">
<h2>
<small>By
<strong>ungleich gmbh</strong>
</small>
</h2>
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">Build a tech valley <strong>in the heart of switzerland</strong></h2>
<hr>
<img class="img-responsive img-border img-left" src="{% static 'digitalglarus/img/intro-pic.jpg' %}" alt="">
<hr class="visible-xs">
<p>Digital Glarus, this is how we call the new home for high tech companies. Located south of Zurich, it has unique features you can not find anywhere else in Switzerland.</p>
<p> The combination of beautiful landscape, recreational areas as well as having high speed Internet connections and huge variety of great food offers forms what we call "Digital Glarus".</p>
<p>The valley also knows as "Glarnerland" is featured by many gorgeous, eye-catching buildings from former industrial area.</p>
<p>In fact, Glarnerland may be the valley to contain most well preserved antique houses equipped with fitting high quality old age furniture (those you always look at in expensive shops, but never buy - this is how people live here).</p>
<p>&nbsp;</p>
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">a new <strong>area</strong>
</h2>
<hr>
<p>While you can imagine that the old factories, many of them being weaving mills, are not business anymore, their heritage suits exactly what the tech society of Switzerland requires: Great and affordable place for computer scientists.</p>
<p>Instead of having the old falling apart, we are thinking of building the new tech centre of Switzerland by converting old, abandoned factory halls into attractive working places.</p>
<p>But what is attractive to a computer scientist? Pizza, Coke and fast Internet? The latter is a still true, though computer scientists in Switzerland are more orientated on living healthy, which is exactly what Glarnerland can provide.</p>
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">Why would anyone be <strong>interested</strong> in it?</h2>
<hr>
<p>The current de-facto tech centre of Switzerland, Zurich, is overpopulated with an average of less than 0.1% free apartments. Furthermore it is expensive and loud. Although the high concentration of people may be helpful to find customers, most tech companies are making their business in the Internet and are not affected by the change. While you can imagine that the old factories, many of them being weaving mills, are not business anymore, their heritage suits exactly what the tech society of Switzerland requires: Great and affordable place for computer scientists.</p>
<p>In fact development is hampered by the costs companies and developers have to carry, distracting them from the real work they plan to do.</p>
<p>While some investment is required to be attractive to tech companies, given the potential of reuse of infrastructure, the costs are estimated to be low and can be a key factor in the development of the Canton Glarus.</p>
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">how to <strong>realize</strong></h2>
<hr>
<p>At the moment we at <a href="www.ungleich.ch"> ungleich</a> are talking to authorities and  sponsors. It is crucial to build up some basic infrastructure and  attract early adopters. Building a community (<a href=meetup.ch>meetup</a> alike)  can be helpful, but competitive pricing as well as superior infrastructure are crucial for success.</p>
<p>Have you become interested in the project?
<p>Contact us at<br>
<br>
<a href="mailto:digital.glarus@ungleich.ch">digital.glarus@ungleich.ch</a> // <a href="tel:%2B41%20%280%29%2044%20534%2066%2022" value="+41445346622">+41 (0) 44 534 66 22</a>
</p>
</p>
<p>&nbsp;</p>
</div>
</div>
</div>
</div>
<!-- /.container -->
<footer>
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<p>Copyright &copy; <a href="http://www.ungleich.ch">ungleich GmbH 2015</a></p>
</div>
</div>
</div>
</footer>
<!-- jQuery -->
<script src="js/jquery.js"></script>
<!-- Bootstrap Core JavaScript -->
<script src="js/bootstrap.min.js"></script>
<!-- Script to Activate the Carousel -->
<script>
$('.carousel').carousel({
interval: 5000 //changes the speed
})
</script>
</body>
</html>

View file

@ -1,23 +0,0 @@
{% extends "base.html" %}
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
<form action="{% url 'digitalglarus:index' %}" method="post">
{% csrf_token %}
{{ form }}
<input type="submit" value="Send Message" />
</form>
{% if message_list %}
<ul>
{% for message in message_list %}
<li><a href="/digital.glarus/{{ message.id }}/">{{ message }}</a></li>
{% endfor %}
</ul>
{% else %}
<p>No messages are available.</p>
{% endif %}

View file

@ -43,7 +43,11 @@ DEBUG = False
ALLOWED_HOSTS = [ ALLOWED_HOSTS = [
".ungleich.ch", ".ungleich.ch",
"digital.glarus.ungleich.ch" ] "digital.glarus.ungleich.ch" ,
"rails-hosting.ch",
"django-hosting.ch",
"node-hosting.ch"
]
# Application definition # Application definition