From 46ce08909da02fa2b309c9581b1de8d7266c8bcf Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@wurzel.schottelius.org>
Date: Wed, 10 Jun 2015 21:16:08 +0200
Subject: [PATCH 1/5] mount cms below cms - easier for nginx mapping

Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
---
 dynamicweb/settings.py | 2 +-
 dynamicweb/urls.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dynamicweb/settings.py b/dynamicweb/settings.py
index c202900b..5ecb56b5 100644
--- a/dynamicweb/settings.py
+++ b/dynamicweb/settings.py
@@ -1,5 +1,5 @@
 """
-Copyright 2015 Ungleich.
+Copyright 2015 ungleich.
 """
 
 # -*- coding: utf-8 -*-
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index cac02678..82b4c6f6 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -10,7 +10,7 @@ urlpatterns = [
                                      namespace="digital_glarus")),
     url(r'^railshosting/', include('railshosting.urls',
                                    namespace="railshosting")),
-    url(r'^', include('cms.urls')),
+    url(r'^cms/', include('cms.urls')),
     url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 

From 71823b12c8c8dad07819cb67eb66394da03156c1 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@wurzel.schottelius.org>
Date: Wed, 10 Jun 2015 23:13:12 +0200
Subject: [PATCH 2/5] move djangocms-text-ckeditor to 2.5.2 to work with
 migrations

Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
---
 stable_requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stable_requirements.txt b/stable_requirements.txt
index 9b5ff470..09813a68 100644
--- a/stable_requirements.txt
+++ b/stable_requirements.txt
@@ -25,7 +25,7 @@ django-cms==3.1.0
 
 # django-cms-plugins
 djangocms-admin-style==0.2.5
-djangocms-text-ckeditor==2.4.3
+djangocms-text-ckeditor==2.5.2
 djangocms-blog==0.4.0
 
 djangocms-flash==0.2.0

From c93b044bf072a8dc2cd412759a457153170d66c6 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@wurzel.schottelius.org>
Date: Wed, 10 Jun 2015 23:28:24 +0200
Subject: [PATCH 3/5] remove duplicate django entry

Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
---
 stable_requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stable_requirements.txt b/stable_requirements.txt
index 09813a68..970a30ef 100644
--- a/stable_requirements.txt
+++ b/stable_requirements.txt
@@ -55,7 +55,6 @@ aldryn-common==0.1.3
 aldryn-search==0.2.7
 anyjson==0.3.3
 cssselect==0.9.1
-Django==1.7.8
 django-admin-enhancer==1.0.0
 django-appconf==1.0.1
 django-appdata==0.1.4

From da0ece6d63993f32751cf864c63f58d32598f8c7 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@wurzel.schottelius.org>
Date: Wed, 10 Jun 2015 23:34:33 +0200
Subject: [PATCH 4/5] digital_glarus -> digitalglarus

Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
---
 {digital_glarus => digitalglarus}/__init__.py |   0
 {digital_glarus => digitalglarus}/admin.py    |   0
 .../migrations/0001_initial.py                |   0
 .../migrations/0002_auto_20150522_0450.py     |   2 +-
 .../migrations/0002_auto_20150527_1023.py     |   2 +-
 .../migrations/0003_merge.py                  |   4 ++--
 .../migrations/__init__.py                    |   0
 {digital_glarus => digitalglarus}/models.py   |   0
 .../static/digitalglarus}/css/bootstrap.css   |   0
 .../digitalglarus}/css/bootstrap.min.css      |   0
 .../digitalglarus}/css/business-casual.css    |   0
 .../static/digitalglarus}/img/bg.jpg          | Bin
 .../static/digitalglarus}/img/img_1.jpg       | Bin
 .../static/digitalglarus}/img/img_2.jpg       | Bin
 .../static/digitalglarus}/img/img_3.jpg       | Bin
 .../static/digitalglarus}/img/img_4.png       | Bin
 .../static/digitalglarus}/img/intro-pic.jpg   | Bin
 .../static/digitalglarus}/img/slide-1.jpg     | Bin
 .../static/digitalglarus}/img/slide-2.jpg     | Bin
 .../static/digitalglarus}/img/slide-3.jpg     | Bin
 .../static/digitalglarus}/js/bootstrap.js     |   0
 .../static/digitalglarus}/js/bootstrap.min.js |   0
 .../static/digitalglarus}/js/jquery.js        |   0
 .../templates/digitalglarus}/about.html       |  10 +++++-----
 .../templates/digitalglarus}/base.html        |  14 +++++++-------
 .../templates/digitalglarus}/contact.html     |   4 ++--
 .../templates/digitalglarus}/detail.html      |   2 +-
 .../templates/digitalglarus}/index.html       |  10 +++++-----
 .../index.html-full-index-plus-template       |  18 +++++++++---------
 .../templates/digitalglarus}/index.html-orig  |   2 +-
 {digital_glarus => digitalglarus}/tests.py    |   0
 {digital_glarus => digitalglarus}/urls.py     |   0
 {digital_glarus => digitalglarus}/views.py    |  10 +++++-----
 dynamicweb/settings.py                        |   2 +-
 dynamicweb/urls.py                            |   4 ++--
 35 files changed, 42 insertions(+), 42 deletions(-)
 rename {digital_glarus => digitalglarus}/__init__.py (100%)
 rename {digital_glarus => digitalglarus}/admin.py (100%)
 rename {digital_glarus => digitalglarus}/migrations/0001_initial.py (100%)
 rename {digital_glarus => digitalglarus}/migrations/0002_auto_20150522_0450.py (89%)
 rename {digital_glarus => digitalglarus}/migrations/0002_auto_20150527_1023.py (88%)
 rename {digital_glarus => digitalglarus}/migrations/0003_merge.py (64%)
 rename {digital_glarus => digitalglarus}/migrations/__init__.py (100%)
 rename {digital_glarus => digitalglarus}/models.py (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/css/bootstrap.css (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/css/bootstrap.min.css (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/css/business-casual.css (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/img/bg.jpg (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/img/img_1.jpg (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/img/img_2.jpg (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/img/img_3.jpg (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/img/img_4.png (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/img/intro-pic.jpg (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/img/slide-1.jpg (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/img/slide-2.jpg (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/img/slide-3.jpg (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/js/bootstrap.js (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/js/bootstrap.min.js (100%)
 rename {digital_glarus/static/digital_glarus => digitalglarus/static/digitalglarus}/js/jquery.js (100%)
 rename {digital_glarus/templates/digital_glarus => digitalglarus/templates/digitalglarus}/about.html (92%)
 rename {digital_glarus/templates/digital_glarus => digitalglarus/templates/digitalglarus}/base.html (86%)
 rename {digital_glarus/templates/digital_glarus => digitalglarus/templates/digitalglarus}/contact.html (96%)
 rename {digital_glarus/templates/digital_glarus => digitalglarus/templates/digitalglarus}/detail.html (75%)
 rename {digital_glarus/templates/digital_glarus => digitalglarus/templates/digitalglarus}/index.html (95%)
 rename {digital_glarus/templates/digital_glarus => digitalglarus/templates/digitalglarus}/index.html-full-index-plus-template (93%)
 rename {digital_glarus/templates/digital_glarus => digitalglarus/templates/digitalglarus}/index.html-orig (87%)
 rename {digital_glarus => digitalglarus}/tests.py (100%)
 rename {digital_glarus => digitalglarus}/urls.py (100%)
 rename {digital_glarus => digitalglarus}/views.py (73%)

diff --git a/digital_glarus/__init__.py b/digitalglarus/__init__.py
similarity index 100%
rename from digital_glarus/__init__.py
rename to digitalglarus/__init__.py
diff --git a/digital_glarus/admin.py b/digitalglarus/admin.py
similarity index 100%
rename from digital_glarus/admin.py
rename to digitalglarus/admin.py
diff --git a/digital_glarus/migrations/0001_initial.py b/digitalglarus/migrations/0001_initial.py
similarity index 100%
rename from digital_glarus/migrations/0001_initial.py
rename to digitalglarus/migrations/0001_initial.py
diff --git a/digital_glarus/migrations/0002_auto_20150522_0450.py b/digitalglarus/migrations/0002_auto_20150522_0450.py
similarity index 89%
rename from digital_glarus/migrations/0002_auto_20150522_0450.py
rename to digitalglarus/migrations/0002_auto_20150522_0450.py
index 29c9bfae..2a46f0fa 100644
--- a/digital_glarus/migrations/0002_auto_20150522_0450.py
+++ b/digitalglarus/migrations/0002_auto_20150522_0450.py
@@ -7,7 +7,7 @@ from django.db import models, migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('digital_glarus', '0001_initial'),
+        ('digitalglarus', '0001_initial'),
     ]
 
     operations = [
diff --git a/digital_glarus/migrations/0002_auto_20150527_1023.py b/digitalglarus/migrations/0002_auto_20150527_1023.py
similarity index 88%
rename from digital_glarus/migrations/0002_auto_20150527_1023.py
rename to digitalglarus/migrations/0002_auto_20150527_1023.py
index 79a8f653..dcda5b44 100644
--- a/digital_glarus/migrations/0002_auto_20150527_1023.py
+++ b/digitalglarus/migrations/0002_auto_20150527_1023.py
@@ -7,7 +7,7 @@ from django.db import models, migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('digital_glarus', '0001_initial'),
+        ('digitalglarus', '0001_initial'),
     ]
 
     operations = [
diff --git a/digital_glarus/migrations/0003_merge.py b/digitalglarus/migrations/0003_merge.py
similarity index 64%
rename from digital_glarus/migrations/0003_merge.py
rename to digitalglarus/migrations/0003_merge.py
index 49e26d1c..994a03ea 100644
--- a/digital_glarus/migrations/0003_merge.py
+++ b/digitalglarus/migrations/0003_merge.py
@@ -7,8 +7,8 @@ from django.db import models, migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('digital_glarus', '0002_auto_20150522_0450'),
-        ('digital_glarus', '0002_auto_20150527_1023'),
+        ('digitalglarus', '0002_auto_20150522_0450'),
+        ('digitalglarus', '0002_auto_20150527_1023'),
     ]
 
     operations = [
diff --git a/digital_glarus/migrations/__init__.py b/digitalglarus/migrations/__init__.py
similarity index 100%
rename from digital_glarus/migrations/__init__.py
rename to digitalglarus/migrations/__init__.py
diff --git a/digital_glarus/models.py b/digitalglarus/models.py
similarity index 100%
rename from digital_glarus/models.py
rename to digitalglarus/models.py
diff --git a/digital_glarus/static/digital_glarus/css/bootstrap.css b/digitalglarus/static/digitalglarus/css/bootstrap.css
similarity index 100%
rename from digital_glarus/static/digital_glarus/css/bootstrap.css
rename to digitalglarus/static/digitalglarus/css/bootstrap.css
diff --git a/digital_glarus/static/digital_glarus/css/bootstrap.min.css b/digitalglarus/static/digitalglarus/css/bootstrap.min.css
similarity index 100%
rename from digital_glarus/static/digital_glarus/css/bootstrap.min.css
rename to digitalglarus/static/digitalglarus/css/bootstrap.min.css
diff --git a/digital_glarus/static/digital_glarus/css/business-casual.css b/digitalglarus/static/digitalglarus/css/business-casual.css
similarity index 100%
rename from digital_glarus/static/digital_glarus/css/business-casual.css
rename to digitalglarus/static/digitalglarus/css/business-casual.css
diff --git a/digital_glarus/static/digital_glarus/img/bg.jpg b/digitalglarus/static/digitalglarus/img/bg.jpg
similarity index 100%
rename from digital_glarus/static/digital_glarus/img/bg.jpg
rename to digitalglarus/static/digitalglarus/img/bg.jpg
diff --git a/digital_glarus/static/digital_glarus/img/img_1.jpg b/digitalglarus/static/digitalglarus/img/img_1.jpg
similarity index 100%
rename from digital_glarus/static/digital_glarus/img/img_1.jpg
rename to digitalglarus/static/digitalglarus/img/img_1.jpg
diff --git a/digital_glarus/static/digital_glarus/img/img_2.jpg b/digitalglarus/static/digitalglarus/img/img_2.jpg
similarity index 100%
rename from digital_glarus/static/digital_glarus/img/img_2.jpg
rename to digitalglarus/static/digitalglarus/img/img_2.jpg
diff --git a/digital_glarus/static/digital_glarus/img/img_3.jpg b/digitalglarus/static/digitalglarus/img/img_3.jpg
similarity index 100%
rename from digital_glarus/static/digital_glarus/img/img_3.jpg
rename to digitalglarus/static/digitalglarus/img/img_3.jpg
diff --git a/digital_glarus/static/digital_glarus/img/img_4.png b/digitalglarus/static/digitalglarus/img/img_4.png
similarity index 100%
rename from digital_glarus/static/digital_glarus/img/img_4.png
rename to digitalglarus/static/digitalglarus/img/img_4.png
diff --git a/digital_glarus/static/digital_glarus/img/intro-pic.jpg b/digitalglarus/static/digitalglarus/img/intro-pic.jpg
similarity index 100%
rename from digital_glarus/static/digital_glarus/img/intro-pic.jpg
rename to digitalglarus/static/digitalglarus/img/intro-pic.jpg
diff --git a/digital_glarus/static/digital_glarus/img/slide-1.jpg b/digitalglarus/static/digitalglarus/img/slide-1.jpg
similarity index 100%
rename from digital_glarus/static/digital_glarus/img/slide-1.jpg
rename to digitalglarus/static/digitalglarus/img/slide-1.jpg
diff --git a/digital_glarus/static/digital_glarus/img/slide-2.jpg b/digitalglarus/static/digitalglarus/img/slide-2.jpg
similarity index 100%
rename from digital_glarus/static/digital_glarus/img/slide-2.jpg
rename to digitalglarus/static/digitalglarus/img/slide-2.jpg
diff --git a/digital_glarus/static/digital_glarus/img/slide-3.jpg b/digitalglarus/static/digitalglarus/img/slide-3.jpg
similarity index 100%
rename from digital_glarus/static/digital_glarus/img/slide-3.jpg
rename to digitalglarus/static/digitalglarus/img/slide-3.jpg
diff --git a/digital_glarus/static/digital_glarus/js/bootstrap.js b/digitalglarus/static/digitalglarus/js/bootstrap.js
similarity index 100%
rename from digital_glarus/static/digital_glarus/js/bootstrap.js
rename to digitalglarus/static/digitalglarus/js/bootstrap.js
diff --git a/digital_glarus/static/digital_glarus/js/bootstrap.min.js b/digitalglarus/static/digitalglarus/js/bootstrap.min.js
similarity index 100%
rename from digital_glarus/static/digital_glarus/js/bootstrap.min.js
rename to digitalglarus/static/digitalglarus/js/bootstrap.min.js
diff --git a/digital_glarus/static/digital_glarus/js/jquery.js b/digitalglarus/static/digitalglarus/js/jquery.js
similarity index 100%
rename from digital_glarus/static/digital_glarus/js/jquery.js
rename to digitalglarus/static/digitalglarus/js/jquery.js
diff --git a/digital_glarus/templates/digital_glarus/about.html b/digitalglarus/templates/digitalglarus/about.html
similarity index 92%
rename from digital_glarus/templates/digital_glarus/about.html
rename to digitalglarus/templates/digitalglarus/about.html
index 08a8494e..b485a903 100755
--- a/digital_glarus/templates/digital_glarus/about.html
+++ b/digitalglarus/templates/digitalglarus/about.html
@@ -1,4 +1,4 @@
-{% extends "digital_glarus/base.html" %}
+{% extends "digitalglarus/base.html" %}
 {% load staticfiles %}      
 {% block title %}About{% endblock %}
 
@@ -13,7 +13,7 @@
                     <hr>
                 </div>
                 <div class="col-md-6">
-                    <img class="img-responsive img-border-left" src="{% static 'digital_glarus/img/img_4.png' %}" alt="">
+                    <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.
@@ -33,18 +33,18 @@
                     <hr>
                 </div>
                 <div class="col-sm-4 text-center">
-                    <img class="img-responsive" src="{% static 'digital_glarus/img/img_1.jpg' %}" alt="">
+                    <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 'digital_glarus/img/img_2.jpg' %}" alt="">
+                    <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 'digital_glarus/img/img_3.jpg' %}" alt="">
+                    <img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
                     <h3>direct
                         <small> connection to zurich</small>
                     </h3>
diff --git a/digital_glarus/templates/digital_glarus/base.html b/digitalglarus/templates/digitalglarus/base.html
similarity index 86%
rename from digital_glarus/templates/digital_glarus/base.html
rename to digitalglarus/templates/digitalglarus/base.html
index c31838b0..94e0748b 100644
--- a/digital_glarus/templates/digital_glarus/base.html
+++ b/digitalglarus/templates/digitalglarus/base.html
@@ -14,10 +14,10 @@
     <title>Digital.Glarus - {% block title %}Welcome{% endblock %}</title>
 
     <!-- Bootstrap Core CSS -->
-    <link href="{% static 'digital_glarus/css/bootstrap.min.css' %}" rel="stylesheet">
+    <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
 
     <!-- Custom CSS -->
-    <link href="{% static 'digital_glarus/css/business-casual.css' %}" rel="stylesheet">
+    <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">
@@ -64,13 +64,13 @@
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav">
                     <li>
-                        <a href="{% url 'digital_glarus:index' %}">Home</a>
+                        <a href="{% url 'digitalglarus:index' %}">Home</a>
                     </li>
                     <li>
-                        <a href="{% url 'digital_glarus:about' %}">About</a>
+                        <a href="{% url 'digitalglarus:about' %}">About</a>
                     </li>
                     <li>
-                        <a href="{% url 'digital_glarus:contact' %}">Contact</a>
+                        <a href="{% url 'digitalglarus:contact' %}">Contact</a>
                     </li>
                 </ul>
             </div>
@@ -95,10 +95,10 @@
     </footer>
 
     <!-- jQuery -->
-    <script src="{% static 'digital_glarus/js/jquery.js' %}"></script>
+    <script src="{% static 'digitalglarus/js/jquery.js' %}"></script>
 
     <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'digital_glarus/js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'digitalglarus/js/bootstrap.min.js' %}"></script>
 
     <!-- Script to Activate the Carousel -->
     <script>
diff --git a/digital_glarus/templates/digital_glarus/contact.html b/digitalglarus/templates/digitalglarus/contact.html
similarity index 96%
rename from digital_glarus/templates/digital_glarus/contact.html
rename to digitalglarus/templates/digitalglarus/contact.html
index d13157a1..9e920db0 100755
--- a/digital_glarus/templates/digital_glarus/contact.html
+++ b/digitalglarus/templates/digitalglarus/contact.html
@@ -1,4 +1,4 @@
-{% extends "digital_glarus/base.html" %}
+{% extends "digitalglarus/base.html" %}
 
 {% block title %}Contact{% endblock %}
 
@@ -40,7 +40,7 @@
                     </h2>
                     <hr>
                     <p>If you want further information on Digital Glarus, please send us a message using the form below.</p>
-                    <form action="{% url 'digital_glarus:contact' %}" method="post" role="form">
+                    <form action="{% url 'digitalglarus:contact' %}" method="post" role="form">
                         {% csrf_token %}
                         <div class="row">
                             <div class="form-group col-lg-4">
diff --git a/digital_glarus/templates/digital_glarus/detail.html b/digitalglarus/templates/digitalglarus/detail.html
similarity index 75%
rename from digital_glarus/templates/digital_glarus/detail.html
rename to digitalglarus/templates/digitalglarus/detail.html
index 77d404ce..412a6b91 100644
--- a/digital_glarus/templates/digital_glarus/detail.html
+++ b/digitalglarus/templates/digitalglarus/detail.html
@@ -8,4 +8,4 @@
     <li>{{ message.received_date }}
 </ul>
 
-<p><a href="{% url 'digital_glarus:index' %}">Back to Main</a>
+<p><a href="{% url 'digitalglarus:index' %}">Back to Main</a>
diff --git a/digital_glarus/templates/digital_glarus/index.html b/digitalglarus/templates/digitalglarus/index.html
similarity index 95%
rename from digital_glarus/templates/digital_glarus/index.html
rename to digitalglarus/templates/digitalglarus/index.html
index 8bb584cd..acd7376d 100644
--- a/digital_glarus/templates/digital_glarus/index.html
+++ b/digitalglarus/templates/digitalglarus/index.html
@@ -1,4 +1,4 @@
-{% extends "digital_glarus/base.html" %}
+{% extends "digitalglarus/base.html" %}
 {% load staticfiles %}
 
 {% block content %}
@@ -9,13 +9,13 @@
                         <!-- Indicators --><!-- Wrapper for slides -->
                         <div class="carousel-inner">
                             <div class="item active">
-                                <img class="img-responsive img-full" src="{% static 'digital_glarus/img/slide-1.jpg' %}" alt="">
+                                <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 'digital_glarus/img/slide-2.jpg' %}" alt="">
+                                <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 'digital_glarus/img/slide-3.jpg' %}" alt="">
+                                <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
                             </div>
                         </div>
 
@@ -47,7 +47,7 @@
                     <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 'digital_glarus/img/intro-pic.jpg' %}" alt="">
+                    <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>
diff --git a/digital_glarus/templates/digital_glarus/index.html-full-index-plus-template b/digitalglarus/templates/digitalglarus/index.html-full-index-plus-template
similarity index 93%
rename from digital_glarus/templates/digital_glarus/index.html-full-index-plus-template
rename to digitalglarus/templates/digitalglarus/index.html-full-index-plus-template
index 5212d3dc..15628d07 100644
--- a/digital_glarus/templates/digital_glarus/index.html-full-index-plus-template
+++ b/digitalglarus/templates/digitalglarus/index.html-full-index-plus-template
@@ -16,10 +16,10 @@
     <title>Digital.Glarus - {% block title %}Welcome{% endblock %}</title>
 
     <!-- Bootstrap Core CSS -->
-    <link href="{% static 'digital_glarus/css/bootstrap.min.css' %}" rel="stylesheet">
+    <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
 
     <!-- Custom CSS -->
-    <link href="{% static 'digital_glarus/css/business-casual.css' %}" rel="stylesheet">
+    <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">
@@ -66,13 +66,13 @@
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav">
                     <li>
-                        <a href="{% url 'digital_glarus:index' %}">Home</a>
+                        <a href="{% url 'digitalglarus:index' %}">Home</a>
                     </li>
                     <li>
-                        <a href="{% url 'digital_glarus:index' %}">About</a>
+                        <a href="{% url 'digitalglarus:index' %}">About</a>
                     </li>
                     <li>
-                        <a href="{% url 'digital_glarus:index' %}">Contact</a>
+                        <a href="{% url 'digitalglarus:index' %}">Contact</a>
                     </li>
                 </ul>
             </div>
@@ -90,13 +90,13 @@
                         <!-- Indicators --><!-- Wrapper for slides -->
                         <div class="carousel-inner">
                             <div class="item active">
-                                <img class="img-responsive img-full" src="{% static 'digital_glarus/img/slide-1.jpg' %}" alt="">
+                                <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 'digital_glarus/img/slide-2.jpg' %}" alt="">
+                                <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 'digital_glarus/img/slide-3.jpg' %}" alt="">
+                                <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
                             </div>
                         </div>
 
@@ -128,7 +128,7 @@
                     <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 'digital_glarus/img/intro-pic.jpg' %}" alt="">
+                    <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>
diff --git a/digital_glarus/templates/digital_glarus/index.html-orig b/digitalglarus/templates/digitalglarus/index.html-orig
similarity index 87%
rename from digital_glarus/templates/digital_glarus/index.html-orig
rename to digitalglarus/templates/digitalglarus/index.html-orig
index 784a36de..85bd3198 100644
--- a/digital_glarus/templates/digital_glarus/index.html-orig
+++ b/digitalglarus/templates/digitalglarus/index.html-orig
@@ -4,7 +4,7 @@
 
 {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
 
-<form action="{% url 'digital_glarus:index' %}" method="post">
+<form action="{% url 'digitalglarus:index' %}" method="post">
     {% csrf_token %}
     {{ form }}
     <input type="submit" value="Send Message" />
diff --git a/digital_glarus/tests.py b/digitalglarus/tests.py
similarity index 100%
rename from digital_glarus/tests.py
rename to digitalglarus/tests.py
diff --git a/digital_glarus/urls.py b/digitalglarus/urls.py
similarity index 100%
rename from digital_glarus/urls.py
rename to digitalglarus/urls.py
diff --git a/digital_glarus/views.py b/digitalglarus/views.py
similarity index 73%
rename from digital_glarus/views.py
rename to digitalglarus/views.py
index fd1f2117..c9d3feec 100644
--- a/digital_glarus/views.py
+++ b/digitalglarus/views.py
@@ -18,13 +18,13 @@ def detail(request, message_id):
     p = get_object_or_404(Message, pk=message_id)
 
     context = { 'message': p, }
-    return render(request, 'digital_glarus/detail.html', context)
+    return render(request, 'digitalglarus/detail.html', context)
 
 def about(request):
-    return render(request, 'digital_glarus/about.html')
+    return render(request, 'digitalglarus/about.html')
 
 def index(request):
-    return render(request, 'digital_glarus/index.html')
+    return render(request, 'digitalglarus/index.html')
 
 def contact(request):
     message = Message(received_date=datetime.datetime.now())
@@ -34,7 +34,7 @@ def contact(request):
 
         if form.is_valid():
             form.save()
-            return HttpResponseRedirect(reverse("digital_glarus:contact"))
+            return HttpResponseRedirect(reverse("digitalglarus:contact"))
 
     # form = MessageForm()
 
@@ -42,4 +42,4 @@ def contact(request):
         'form': form,
     }
 
-    return render(request, 'digital_glarus/contact.html', context)
+    return render(request, 'digitalglarus/contact.html', context)
diff --git a/dynamicweb/settings.py b/dynamicweb/settings.py
index 5ecb56b5..9f127984 100644
--- a/dynamicweb/settings.py
+++ b/dynamicweb/settings.py
@@ -50,7 +50,6 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'cms',  # django CMS itself
-    'digital_glarus',
     'treebeard',  # utilities for implementing a tree
     'menus',  # helper for model independent hierarchical website navigation
     'sekizai',  # for javascript and css management
@@ -88,6 +87,7 @@ INSTALLED_APPS = (
     # ungleich
     'ungleich',
     'railshosting',
+    'digitalglarus',
 )
 
 MIDDLEWARE_CLASSES = (
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 82b4c6f6..f941f063 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -6,8 +6,8 @@ from dynamicweb import settings
 
 urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^digital.glarus/', include('digital_glarus.urls',
-                                     namespace="digital_glarus")),
+    url(r'^digitalglarus/', include('digitalglarus.urls',
+                                     namespace="digitalglarus")),
     url(r'^railshosting/', include('railshosting.urls',
                                    namespace="railshosting")),
     url(r'^cms/', include('cms.urls')),

From 83cbebd4153ff22f114c6a5c4e2cda063619d763 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@wurzel.schottelius.org>
Date: Wed, 10 Jun 2015 23:37:39 +0200
Subject: [PATCH 5/5] use django-select2-py3 from github

Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
---
 stable_requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stable_requirements.txt b/stable_requirements.txt
index 970a30ef..14fbc716 100644
--- a/stable_requirements.txt
+++ b/stable_requirements.txt
@@ -26,6 +26,7 @@ django-cms==3.1.0
 # django-cms-plugins
 djangocms-admin-style==0.2.5
 djangocms-text-ckeditor==2.5.2
+-e git+git@github.com:applegrew/django-select2.git#egg=django-select2-py3
 djangocms-blog==0.4.0
 
 djangocms-flash==0.2.0