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

Merge branch 'master' of git.ungleich.ch:dynamicweb into develop

Browse source 
Conflicts:
	.gitignore
	dynamicweb/settings.py
	requirements.txt
This commit is contained in:
rascencio 2015-09-19 17:02:36 +02:00
commit acca06a11d
10 changed files with 170 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -13,7 +13,6 @@ local_settings.py
media/* media/*
!media/keep !media/keep
/CACHE/ /CACHE/
/static/ /static/
@ -21,8 +20,11 @@ media/*
.\#* .\#*
*~ *~
static/
secret-key secret-key
node_modules/ node_modules/
*.db *.db
ungleich.db
*~*
secret-key

BIN
digitalglarus/static/digitalglarus/img/price_1.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 191 KiB

31
digitalglarus/templates/digitalglarus/about.html
View file

@ -3,7 +3,7 @@
{% block title %}About{% endblock %} {% block title %}About{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="box"> <div class="box">
<div class="col-lg-12"> <div class="col-lg-12">
<hr> <hr>
@ -16,14 +16,27 @@
<img class="img-responsive img-border-left" src="{% static 'digitalglarus/img/img_4.png' %}" alt=""> <img class="img-responsive img-border-left" src="{% static 'digitalglarus/img/img_4.png' %}" alt="">
</div> </div>
<div class="col-md-6"> <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. <p>
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> 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>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="box"> <div class="box">
<div class="col-lg-12"> <div class="col-lg-12">
<hr> <hr>
@ -39,7 +52,7 @@
</h3> </h3>
</div> </div>
<div class="col-sm-4 text-center"> <div class="col-sm-4 text-center">
<img class="img-responsive" src="{% static 'digitalglarus/img/price.jpg' %}" alt=""> <img class="img-responsive" src="{% static 'digitalglarus/img/price_1.jpg' %}" alt="">
<h3>AFFORDABLE <h3>AFFORDABLE
<small>price</small></h3> <small>price</small></h3>
</div> </div>
@ -51,9 +64,9 @@
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
</div> </div>
<!-- /.container --> <!-- /.container -->
{% endblock %} {% endblock %}

11
digitalglarus/templates/digitalglarus/base.html
View file

@ -20,8 +20,8 @@
<link href="{% static 'digitalglarus/css/business-casual.css' %}" rel="stylesheet"> <link href="{% static 'digitalglarus/css/business-casual.css' %}" rel="stylesheet">
<!-- Fonts --> <!-- 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="//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=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 --> <!-- 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:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@ -43,8 +43,8 @@
<body> <body>
<div class="brand">DIGITAL GLARUS</div> <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="address-bar">#1 IT Valley of Switzerland | Luchsingen, 8775 GL Switzerland | From 2015.12.25</div>
<!-- Navigation --> <!-- Navigation -->
<nav class="navbar navbar-default" role="navigation"> <nav class="navbar navbar-default" role="navigation">
@ -72,6 +72,9 @@
<li> <li>
<a href="{% url 'digitalglarus:contact' %}">Contact</a> <a href="{% url 'digitalglarus:contact' %}">Contact</a>
</li> </li>
<li>
<a href="{% url 'digitalglarus:landing' %}">Crowdfounding</a>
</li>
</ul> </ul>
</div> </div>
<!-- /.navbar-collapse --> <!-- /.navbar-collapse -->

6
digitalglarus/templates/digitalglarus/contact.html
View file

@ -21,13 +21,7 @@
<strong>+41 (0) 44 534 66 22</strong> <strong>+41 (0) 44 534 66 22</strong>
</p> </p>
<p>Email: <p>Email:
<<<<<<< HEAD
<strong><a href="mailto:digitalglarus@ungleich.ch">digitalglarus@ungleich.ch</a></strong> <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>
<p>Address: <p>Address:
<strong>Hauptstrasse 14, 8775 Luchsingen<br> <strong>Hauptstrasse 14, 8775 Luchsingen<br>

17
digitalglarus/templates/digitalglarus/index.html
View file

@ -30,13 +30,7 @@
<h2 class="brand-before"> <h2 class="brand-before">
<small>WELCOME TO</small> <small>WELCOME TO</small>
</h2> </h2>
<<<<<<< HEAD
<h1 class="brand-name">Digital Glarus</h1> <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"> <hr class="tagline-divider">
<h2> <h2>
<small>By <small>By
@ -94,17 +88,14 @@
<hr> <hr>
<h2 class="intro-text text-center"><strong>Where</strong>we are</h2> <h2 class="intro-text text-center"><strong>Where</strong>we are</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=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>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>Have you become interested in the project?
<p>Contact us at<br> <p>Contact us at<br>
<br> <br>
<<<<<<< HEAD <a href="mailto:digitalglarus@ungleich.ch">
<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> digitalglarus@ungleich.ch
||||||| merged common ancestors </a> // <a href="tel:%2B41%20%280%29%2044%20534%2066%2022" value="+41445346622">+41 (0) 44 534 66 22</a>
<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
</p> </p>
</p> </p>
<p>&nbsp;</p> <p>&nbsp;</p>

44
digitalglarus/templates/digitalglarus/landing.html Normal file
View 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 %}

1
digitalglarus/urls.py
View file

@ -6,4 +6,5 @@ urlpatterns = [
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
url(r'about$', views.about, name='about'), url(r'about$', views.about, name='about'),
url(r'contact$', views.contact, name='contact'), url(r'contact$', views.contact, name='contact'),
url(r'landing$', views.landing, name='landing'),
] ]

3
digitalglarus/views.py
View file

@ -26,6 +26,9 @@ def about(request):
def index(request): def index(request):
return render(request, 'digitalglarus/index.html') return render(request, 'digitalglarus/index.html')
def landing(request):
return render(request, 'digitalglarus/landing.html')
def contact(request): def contact(request):
message = Message(received_date=datetime.datetime.now()) message = Message(received_date=datetime.datetime.now())
form = MessageForm(request.POST, instance=message) form = MessageForm(request.POST, instance=message)

1
requirements.txt
View file

@ -55,6 +55,5 @@ gevent>=1.1a2
# djangocms-page-meta # djangocms-page-meta
djangocms-page-meta djangocms-page-meta
# memcache # memcache
pylibmc pylibmc