diff --git a/.gitignore b/.gitignore index 245c60a3..63b7ba8f 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/digitalglarus/static/digitalglarus/img/price_1.jpg b/digitalglarus/static/digitalglarus/img/price_1.jpg new file mode 100644 index 00000000..ba53b28d Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/price_1.jpg differ diff --git a/digitalglarus/templates/digitalglarus/about.html b/digitalglarus/templates/digitalglarus/about.html index 23a24e66..6aa4a185 100755 --- a/digitalglarus/templates/digitalglarus/about.html +++ b/digitalglarus/templates/digitalglarus/about.html @@ -1,59 +1,72 @@ {% extends "digitalglarus/base.html" %} -{% load staticfiles %} +{% load staticfiles %} {% block title %}About{% endblock %} -{% block content %} -
-
-
-
-

why - Us? -

-
-
-
- -
-
-

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.

-
-
-
-
- -
-
-
-
-

why - glarus? -

-
-
-
- -

BEAUTIFUL - landscape -

-
-
- -

AFFORDABLE - price

-
-
- -

direct - connection to zurich -

-
-
-
-
- +{% block content %} +
+
+
+
+

why + Us? +

+
- +
+ +
+
+

+ 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. +

+
+
+
+
-{% endblock %} +
+
+
+
+

why + glarus? +

+
+
+
+ +

BEAUTIFUL + landscape +

+
+
+ +

AFFORDABLE + price

+
+
+ +

direct + connection to zurich +

+
+
+
+
+ + + + +{% endblock %} diff --git a/digitalglarus/templates/digitalglarus/base.html b/digitalglarus/templates/digitalglarus/base.html index 6dd4dc19..c67fa324 100644 --- a/digitalglarus/templates/digitalglarus/base.html +++ b/digitalglarus/templates/digitalglarus/base.html @@ -20,14 +20,14 @@ - - + + diff --git a/digitalglarus/templates/digitalglarus/contact.html b/digitalglarus/templates/digitalglarus/contact.html index 919ba0a0..75c0d906 100755 --- a/digitalglarus/templates/digitalglarus/contact.html +++ b/digitalglarus/templates/digitalglarus/contact.html @@ -21,13 +21,7 @@ +41 (0) 44 534 66 22

Email: -<<<<<<< HEAD digitalglarus@ungleich.ch -||||||| merged common ancestors - digital.glarus@ungleich.ch -======= - join@digitalglarus.ch ->>>>>>> 23bc25b6ee56d94ac519920513a8766dbb9a9ff4

Address: Hauptstrasse 14, 8775 Luchsingen
diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/digitalglarus/index.html index 5aea7e4f..22d6a2a6 100644 --- a/digitalglarus/templates/digitalglarus/index.html +++ b/digitalglarus/templates/digitalglarus/index.html @@ -30,13 +30,7 @@

WELCOME TO

-<<<<<<< HEAD

Digital Glarus

-||||||| merged common ancestors -

digital.Glarus

-======= -

DIGITAL GLARUS

->>>>>>> 23bc25b6ee56d94ac519920513a8766dbb9a9ff4

By @@ -94,17 +88,14 @@

Wherewe are

+

At the moment we at ungleich are talking to authorities and  sponsors. It is crucial to build up some basic infrastructure and  attract early adopters. Building a community (meetup alike)  can be helpful, but competitive pricing as well as superior infrastructure are crucial for success.

The great first step we (ungleich) 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.

Have you become interested in the project?

Contact us at

-<<<<<<< HEAD - digitalglarus@ungleich.ch // +41 (0) 44 534 66 22 -||||||| merged common ancestors - digital.glarus@ungleich.ch // +41 (0) 44 534 66 22 -======= - digitalglarus@ungleich.ch // +41 (0) 44 534 66 22 ->>>>>>> 23bc25b6ee56d94ac519920513a8766dbb9a9ff4 + + digitalglarus@ungleich.ch + // +41 (0) 44 534 66 22

 

diff --git a/digitalglarus/templates/digitalglarus/landing.html b/digitalglarus/templates/digitalglarus/landing.html new file mode 100644 index 00000000..89bbdaa0 --- /dev/null +++ b/digitalglarus/templates/digitalglarus/landing.html @@ -0,0 +1,44 @@ +{% extends "digitalglarus/base.html" %} +{% load staticfiles %} +{% block title %}crowdfounding{% endblock %} + +{% block content %} +
+
+
+

Our crowdfunding campaign launches on the 18th of Septmeber 2015!

+
+
+
+
+
+
+
+
+

why + glarus? +

+
+
+
+ +

BEAUTIFUL + landscape +

+
+
+ +

AFFORDABLE + price

+
+
+ +

direct + connection to zurich +

+
+
+
+
+ +{% endblock %} diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index c1ef0c5e..ecca23b4 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -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'), ] diff --git a/digitalglarus/views.py b/digitalglarus/views.py index c9d3feec..f915d800 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -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, } diff --git a/requirements.txt b/requirements.txt index 3257026f..f43f1e69 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,6 +55,5 @@ gevent>=1.1a2 # djangocms-page-meta djangocms-page-meta - # memcache pylibmc