Merge branch 'master' of git.ungleich.ch:dynamicweb into develop
Conflicts: .gitignore dynamicweb/settings.py requirements.txt
This commit is contained in:
commit
acca06a11d
10 changed files with 170 additions and 120 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -13,7 +13,6 @@ local_settings.py
|
|||
|
||||
media/*
|
||||
!media/keep
|
||||
|
||||
/CACHE/
|
||||
/static/
|
||||
|
||||
|
|
@ -21,8 +20,11 @@ media/*
|
|||
.\#*
|
||||
*~
|
||||
|
||||
static/
|
||||
secret-key
|
||||
|
||||
node_modules/
|
||||
*.db
|
||||
ungleich.db
|
||||
*~*
|
||||
|
||||
secret-key
|
||||
|
|
|
|||
BIN
digitalglarus/static/digitalglarus/img/price_1.jpg
Normal file
BIN
digitalglarus/static/digitalglarus/img/price_1.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 191 KiB |
|
|
@ -1,59 +1,72 @@
|
|||
{% extends "digitalglarus/base.html" %}
|
||||
{% load staticfiles %}
|
||||
{% load staticfiles %}
|
||||
{% block title %}About{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="box">
|
||||
<div class="col-lg-12">
|
||||
<hr>
|
||||
<h2 class="intro-text text-center">why
|
||||
<strong>Us?</strong>
|
||||
</h2>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<img class="img-responsive img-border-left" src="{% static 'digitalglarus/img/img_4.png' %}" alt="">
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<p>We, the ungleich GmbH, were founded 2013 in Switzerland - however our first incarnation in Germany dates back to 2000.
|
||||
We have long knowledge in tech industry, and have extensive networks with small to medium tech companies in Switzerland, because we are one of them. We have been working at coworking spaces with these small to medium sized IT companies ; tech-savvy and flexible, tech companies have open culture in work environment, and very often experience difficulty in letting their employees be as creative as possible. We understand and share their needs and problems. This is how we came up with a solution of our own, of finding and providing an attractive working space for technology companies in Switzerland. </p>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="box">
|
||||
<div class="col-lg-12">
|
||||
<hr>
|
||||
<h2 class="intro-text text-center">why
|
||||
<strong>glarus?</strong>
|
||||
</h2>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="col-sm-4 text-center">
|
||||
<img class="img-responsive" src="{% static 'digitalglarus/img/img_1.jpg' %}" alt="">
|
||||
<h3>BEAUTIFUL
|
||||
<small> landscape</small>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="col-sm-4 text-center">
|
||||
<img class="img-responsive" src="{% static 'digitalglarus/img/price.jpg' %}" alt="">
|
||||
<h3>AFFORDABLE
|
||||
<small>price</small></h3>
|
||||
</div>
|
||||
<div class="col-sm-4 text-center">
|
||||
<img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
|
||||
<h3>direct
|
||||
<small> connection to zurich</small>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="box">
|
||||
<div class="col-lg-12">
|
||||
<hr>
|
||||
<h2 class="intro-text text-center">why
|
||||
<strong>Us?</strong>
|
||||
</h2>
|
||||
<hr>
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
<div class="col-md-6">
|
||||
<img class="img-responsive img-border-left" src="{% static 'digitalglarus/img/img_4.png' %}" alt="">
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<p>
|
||||
We, the ungleich GmbH, were founded 2013 in Switzerland -
|
||||
however our first incarnation in Germany dates back to 2000.
|
||||
We have long knowledge in tech industry, and have extensive
|
||||
networks with small to medium tech companies in Switzerland,
|
||||
because we are one of them. We have been working at coworking
|
||||
spaces with these small to medium sized IT companies ;
|
||||
tech-savvy and flexible, tech companies have open culture in
|
||||
work environment, and very often experience difficulty in
|
||||
letting their employees be as creative as possible. We
|
||||
understand and share their needs and problems. This is how we
|
||||
came up with a solution of our own, of finding and providing
|
||||
an attractive working space for technology companies
|
||||
in Switzerland.
|
||||
</p>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
<div class="row">
|
||||
<div class="box">
|
||||
<div class="col-lg-12">
|
||||
<hr>
|
||||
<h2 class="intro-text text-center">why
|
||||
<strong>glarus?</strong>
|
||||
</h2>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="col-sm-4 text-center">
|
||||
<img class="img-responsive" src="{% static 'digitalglarus/img/img_1.jpg' %}" alt="">
|
||||
<h3>BEAUTIFUL
|
||||
<small> landscape</small>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="col-sm-4 text-center">
|
||||
<img class="img-responsive" src="{% static 'digitalglarus/img/price_1.jpg' %}" alt="">
|
||||
<h3>AFFORDABLE
|
||||
<small>price</small></h3>
|
||||
</div>
|
||||
<div class="col-sm-4 text-center">
|
||||
<img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
|
||||
<h3>direct
|
||||
<small> connection to zurich</small>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
<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">
|
||||
<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
|
||||
<link href="//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>
|
||||
<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(){
|
||||
|
|
@ -43,40 +43,43 @@
|
|||
|
||||
<body>
|
||||
|
||||
<div class="brand">DIGITAL GLARUS</div>
|
||||
<div class="address-bar">The Swiss IT Valley | Schwanden, 8762 GL Switzerland | From 2015.10.13</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>
|
||||
|
||||
<!-- 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:about' %}">About</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:contact' %}">Contact</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /.navbar-collapse -->
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
<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:about' %}">About</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:contact' %}">Contact</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:landing' %}">Crowdfounding</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /.navbar-collapse -->
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
</nav>
|
||||
|
||||
<div class="container">
|
||||
|
|
@ -85,13 +88,13 @@
|
|||
<!-- /.container -->
|
||||
|
||||
<footer>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-lg-12 text-center">
|
||||
<p>Copyright © <a href="http://www.ungleich.ch">ungleich GmbH 2015</a></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-lg-12 text-center">
|
||||
<p>Copyright © <a href="http://www.ungleich.ch">ungleich GmbH 2015</a></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<!-- jQuery -->
|
||||
|
|
@ -103,7 +106,7 @@
|
|||
<!-- Script to Activate the Carousel -->
|
||||
<script>
|
||||
$('.carousel').carousel({
|
||||
interval: 5000 //changes the speed
|
||||
interval: 5000 //changes the speed
|
||||
})
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,13 +21,7 @@
|
|||
<strong>+41 (0) 44 534 66 22</strong>
|
||||
</p>
|
||||
<p>Email:
|
||||
<<<<<<< HEAD
|
||||
<strong><a href="mailto:digitalglarus@ungleich.ch">digitalglarus@ungleich.ch</a></strong>
|
||||
||||||| merged common ancestors
|
||||
<strong><a href="mailto:digital.glarus@ungleich.ch">digital.glarus@ungleich.ch</a></strong>
|
||||
=======
|
||||
<strong><a href="mailto:join@digitalglarus.ch">join@digitalglarus.ch</a></strong>
|
||||
>>>>>>> 23bc25b6ee56d94ac519920513a8766dbb9a9ff4
|
||||
</p>
|
||||
<p>Address:
|
||||
<strong>Hauptstrasse 14, 8775 Luchsingen<br>
|
||||
|
|
|
|||
|
|
@ -30,13 +30,7 @@
|
|||
<h2 class="brand-before">
|
||||
<small>WELCOME TO</small>
|
||||
</h2>
|
||||
<<<<<<< HEAD
|
||||
<h1 class="brand-name">Digital Glarus</h1>
|
||||
||||||| merged common ancestors
|
||||
<h1 class="brand-name">digital.Glarus</h1>
|
||||
=======
|
||||
<h1 class="brand-name">DIGITAL GLARUS</h1>
|
||||
>>>>>>> 23bc25b6ee56d94ac519920513a8766dbb9a9ff4
|
||||
<hr class="tagline-divider">
|
||||
<h2>
|
||||
<small>By
|
||||
|
|
@ -94,17 +88,14 @@
|
|||
<hr>
|
||||
<h2 class="intro-text text-center"><strong>Where</strong>we are</h2>
|
||||
<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=http://www.meetup.ch>meetup</a> alike) can be helpful, but competitive pricing as well as superior infrastructure are crucial for success.</p>
|
||||
<p>The great first step we (<a href="http://www.ungleich.ch">ungleich</a>) took is purchasing a charming old house in Schwanden, Glarus. This is our prototype for reviving Glarus and bringing in talents here. We plan to open this place up for Tech companies as a co-working space. We are working tightly with local authorities and supporters. It is crucial to build up some basic infrastructure, and also welcome early adopters. We want Glarus and the IT communities in Switzerland to get on this train, to a great journey we plan through the beautiful valley of Glarus.</p>
|
||||
<p>Have you become interested in the project?
|
||||
<p>Contact us at<br>
|
||||
<br>
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
||||||| merged common ancestors
|
||||
<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:join@digitalglarus.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>
|
||||
>>>>>>> 23bc25b6ee56d94ac519920513a8766dbb9a9ff4
|
||||
<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>
|
||||
|
|
|
|||
44
digitalglarus/templates/digitalglarus/landing.html
Normal file
44
digitalglarus/templates/digitalglarus/landing.html
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{% extends "digitalglarus/base.html" %}
|
||||
{% load staticfiles %}
|
||||
{% block title %}crowdfounding{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="box">
|
||||
<div class="col-lg-12 text-center">
|
||||
<h1>Our crowdfunding campaign launches on the 18th of Septmeber 2015!</h1>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="box">
|
||||
<div class="col-lg-12">
|
||||
<hr>
|
||||
<h2 class="intro-text text-center">why
|
||||
<strong>glarus?</strong>
|
||||
</h2>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="col-sm-4 text-center">
|
||||
<img class="img-responsive" src="{% static 'digitalglarus/img/img_1.jpg' %}" alt="">
|
||||
<h3>BEAUTIFUL
|
||||
<small> landscape</small>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="col-sm-4 text-center">
|
||||
<img class="img-responsive" src="{% static 'digitalglarus/img/price_1.jpg' %}" alt="">
|
||||
<h3>AFFORDABLE
|
||||
<small>price</small></h3>
|
||||
</div>
|
||||
<div class="col-sm-4 text-center">
|
||||
<img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
|
||||
<h3>direct
|
||||
<small> connection to zurich</small>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
{% endblock %}
|
||||
|
|
@ -6,4 +6,5 @@ urlpatterns = [
|
|||
url(r'^$', views.index, name='index'),
|
||||
url(r'about$', views.about, name='about'),
|
||||
url(r'contact$', views.contact, name='contact'),
|
||||
url(r'landing$', views.landing, name='landing'),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -26,6 +26,9 @@ def about(request):
|
|||
def index(request):
|
||||
return render(request, 'digitalglarus/index.html')
|
||||
|
||||
def landing(request):
|
||||
return render(request, 'digitalglarus/landing.html')
|
||||
|
||||
def contact(request):
|
||||
message = Message(received_date=datetime.datetime.now())
|
||||
form = MessageForm(request.POST, instance=message)
|
||||
|
|
@ -38,7 +41,7 @@ def contact(request):
|
|||
|
||||
# form = MessageForm()
|
||||
|
||||
context = {
|
||||
context = {
|
||||
'form': form,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,6 +55,5 @@ gevent>=1.1a2
|
|||
|
||||
# djangocms-page-meta
|
||||
djangocms-page-meta
|
||||
|
||||
# memcache
|
||||
pylibmc
|
||||
|
|
|
|||
Loading…
Reference in a new issue