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

Conflicts:
	digitalglarus/templates/digitalglarus/base.html
	digitalglarus/templates/digitalglarus/index.html

.gitignore

@@ -15,10 +15,15 @@ media/*
 !media/keep
 
 CACHE/
-static/
 
 \#*#
 .\#*
 *~
 
 static/
+
+node_modules/
+ungleich.db
+*~*
+
+secret-key

README.rst

@@ -1,7 +1,7 @@
-Ungleich
+ungleich
 ========
 
-Website for Ungleich GMBH
-
 dynamicweb
 ----------
+
+Website for ungleich GmbH

digitalglarus/templates/digitalglarus/about.html

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

digitalglarus/templates/digitalglarus/base.html

@@ -20,8 +20,8 @@
     <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="//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 -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -72,6 +72,9 @@
 		    <li>
 			<a href="{% url 'digitalglarus:contact' %}">Contact</a>
 		    </li>
+		    <li>
+		      <a href="{% url 'digitalglarus:landing' %}">Crowdfounding</a>
+		    </li>
 		</ul>
 	    </div>
 	    <!-- /.navbar-collapse -->

digitalglarus/templates/digitalglarus/contact.html

@@ -21,7 +21,13 @@
                         <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>

digitalglarus/templates/digitalglarus/index.html

@@ -28,7 +28,7 @@
                         </a>
                     </div>
                     <h2 class="brand-before">
-                        <small>Welcome to</small>
+                        <small>WELCOME TO</small>
                     </h2>
                     <h1 class="brand-name">Digital Glarus</h1>
                     <hr class="tagline-divider">
@@ -51,8 +51,8 @@
                     <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>The valley also known as "Glarnerland" has 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>In fact, Glarnerland may be the valley to contain most well preserved antique houses equipped with high quality old age furniture (those you always look at in expensive stores, but never buy - this is how people live here).</p>
                     <p>&nbsp;</p>
                 </div>
             </div>
@@ -65,8 +65,8 @@
                     <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>While you can imagine that the old factories, many of them being weaving mills, are not running 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>We are building the new tech centre of Switzerland by converting old, abandoned buidings into attractive co-working spaces.</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>
@@ -78,9 +78,7 @@
                     <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>The current de-facto tech centre of Switzerland, Zurich, is overpopulated with an average of less than 0.1% free apartments.Crowded, expensive and loud, to be exact.. Although the density of population is helpful for businesses in finding customers, most tech companies are making their business on the Internet and are flexible in change of location. Why not start from beautiful, empty buildings so many available in Glarus? We are aware of the fact that some investment of time, money and passion will be required to be actually attractive for tech companies to come here. Nonetheless, the overall cost required will be significantly lower than staying in an already overcrowded city. </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>
@@ -88,13 +86,16 @@
             <div class="box">
               <div class="col-lg-12">
                     <hr>
-                    <h2 class="intro-text text-center">how to <strong>realize</strong></h2>
+                    <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>
-                      <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>
+                        <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>&nbsp;</p>

digitalglarus/templates/digitalglarus/landing.html

@@ -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/img_2.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 %}

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'),
 ]

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)

dynamicweb/settings.py

@@ -255,8 +255,8 @@ CMS_PLACEHOLDER_CONF = {
 
 CACHES = {
     'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
-        'LOCATION': 'unix:/tmp/memcached.sock',
+        'LOCATION': '127.0.0.1:11211',
     }
 }
 

requirements.txt

@@ -26,7 +26,7 @@ django-cms
 # django-cms-plugins
 djangocms-admin-style==0.2.5
 djangocms-text-ckeditor>=2.4
--e git+git@github.com:applegrew/django-select2.git#egg=django-select2-py3
+django-select2>=4.3.1
 djangocms-blog>=0.4.0
 
 djangocms-flash
@@ -49,7 +49,10 @@ cmsplugin-filer==0.10.1
 circus-web
 chaussette
 meinheld
-gevent
+
+# python3 support
+gevent>=1.1a2
 
 # djangocms-page-meta
 djangocms-page-meta
+pylibmc