Merge branch 'master' into develop

cms_templates/djangocms_blog/_header_post_detail.html

@@ -4,6 +4,8 @@
 <header class="intro-header"
 	{% if post.main_image_id  %}
 	style="background-image: url('{{ post.main_image.url }}');"
+	{% else %}
+	style="background-image: url('{% static 'blog.ungleich.ch/img/home-bg.jpg'  %}');"
 	{% endif %}
 	>
   <div class="container">

cms_templates/djangocms_blog/base.html

@@ -0,0 +1,19 @@
+{% extends 'base_glarus.html' %}
+
+{% block meta %}
+    {%  if meta %}
+        {% include "meta_mixin/meta.html" %}
+    {% endif %}
+{% endblock meta %}
+
+<div class="container">
+  {% block content %}
+  <div class="app app-blog span8">
+    <div class="row">
+      <div class="box">
+	{% block content_blog %}{% endblock %}
+      </div>
+    </div>
+  </div>
+  {% endblock content %}
+</div>

cms_templates/djangocms_blog/post_detail.html

@@ -0,0 +1,35 @@
+{% extends "djangocms_blog/base.html" %}
+{% load i18n thumbnail cms_tags %}
+
+{% block meta_description %}{{ post.meta_description }}{% endblock meta_description %}
+{% block meta_keywords %}{{ post.meta_keywords }}{% endblock meta_keywords %}
+{% block canonical_url %}<link rel="canonical" href="{{ SITE.domain }}{{ view.get_view_url }}"/>{% endblock canonical_url %}
+{% block title %}{{ post.get_title }}{% endblock %}
+
+{% block content_blog %}{% spaceless %}
+<article id="post-{{ post.slug }}" class="post-item post-detail">
+  {% if post.main_image_id %}
+  <div class="blog-visual">
+    {% thumbnail post.main_image post.full_image_options.size crop=post.full_image_options.crop upscale=post.full_image_options.upscale subject_location=post.main_image.subject_location as thumb %}
+    <img src="{{ post.main_image.url }}" alt="{{ post.main_image.default_alt_text }}"  class="img-responsive img-full" />
+  </div>
+  {% endif %}
+  <header class="text-center">
+    <hr></hr>
+    <h2 class="text-center intro-text">
+      <a href="{% url 'digitalglarus:blog-detail' post.slug %}" class="post-title center-block">
+	<b>{{ post.title }}</b>
+      </a>
+      <small>
+	{{ post.date_created }}
+      </small>
+    </h2>
+    <hr></hr>
+    {% block blog_meta %}
+    {# include "glarus_blog/includes/blog_meta.html" #}
+    {% endblock %}
+    </header>
+    {% endspaceless %}
+    <div class="digitalglarus-blog-content">{% render_placeholder post.content %}</div>
+</article>
+{% endblock content_blog %}

cms_templates/djangocms_blog/post_list.html

@@ -0,0 +1,47 @@
+{% extends "djangocms_blog/base.html" %}
+{% load i18n thumbnail %}{% spaceless %}
+
+{% block canonical_url %}<link rel="canonical" href="{{ SITE.domain }}{{ view.get_view_url }}"/>{% endblock canonical_url %}
+
+{% block content_blog %}
+<section class="blog-list">
+  {% block blog_title %}
+  <header>
+    <h2>
+      {% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
+      {% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
+      {% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }}
+      {% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %}
+    </h2>
+  </header>
+  {% endblock %}
+  {% for post in post_list %}
+  {% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+  {% empty %}
+  <p class="blog-empty">{% trans "No article found." %}</p>
+  {% endfor %}
+  {% if author or archive_date or tagged_entries %}
+  <p class="blog-back"><a href="{% url 'djangocms_blog:posts-latest' %}">{% trans "Back" %}</a></p>
+  {% endif %}
+  {% if is_paginated %}
+  <!-- Pager -->
+  <ul class="pager">
+    {% if page_obj.has_previous %}
+    <li class="previous">
+      <a href="?{{ view.page_kwarg }}={{ page_obj.previous_page_number }}">
+	&laquo; {% trans "Newer Posts" %}
+      </a>
+    </li>
+    {% endif %}
+    {% if page_obj.has_next %}
+    <li class="next">
+      <a href="?{{ view.page_kwarg }}={{ page_obj.next_page_number }}">
+	{% trans "Older Posts" %} &rarr;
+      </a>
+    </li>
+    {% endif %}
+  </ul>
+  {% endif %}
+</section>
+{% endblock %}
+{% endspaceless %}

cms_templates/includes/blog_item.html

@@ -0,0 +1,33 @@
+{% load i18n thumbnail %}
+{% get_current_language as LANGUAGE_CODE %}
+<article id="post-{{ post.slug }}" class="post-item col-lg-12 text-center">
+  {% if post.main_image %}
+  <div class="blog-visual">
+    {% thumbnail post.main_image post.full_image_options.size crop=post.full_image_options.crop upscale=post.full_image_options.upscale subject_location=post.main_image.subject_location as thumb %}
+    <img src="{{ post.main_image.url }}" alt="{{ post.main_image.default_alt_text }}"  class="img-responsive img-full" />
+  </div>
+  {% endif %}
+  <header>
+    <hr></hr>
+    <h2 class="text-center intro-text">
+      <a href="{% url 'djangocms_blog:post-detail' post.slug LANGUAGE_CODE %}" class="post-title center-block">
+	<b>{{ post.title }}</b>
+      </a>
+      <small>
+	{{ post.date_created }}
+      </small>
+    </h2>
+    <hr></hr>
+    {% block blog_meta %}
+    {# include "glarus_blog/includes/blog_meta.html" #}
+    {% endblock %}
+  </header>
+  <div class="blog-lead text-center blog-abstract center-block">
+    <p>
+      {{ post.abstract| safe }}
+    </p>
+  </div>
+  <div class="read-more">
+    <a class="lead" href="{% url 'djangocms_blog:post-detail' post.slug %}">{% trans "read more" %} &raquo;</a>
+  </div>
+</article>

cms_templates/includes/blog_meta.html

@@ -0,0 +1,23 @@
+{% load i18n thumbnail %}
+
+<ul class="post-detail list-inline">
+    {% if post.author %}
+    <li>
+	{% trans "by" %} <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}">{% if post.author.get_full_name %}{{ post.author.get_full_name }}{% else %}{{ post.author }}{% endif %}</a>
+    </li>
+    {% endif %}
+</ul>
+<ul class="post-detail tags list-inline">
+    {% if post.categories.exists %}
+	{% for category in post.categories.all %}
+	    {% if category.slug %}
+		<li class="category_{{ forloop.counter }}"><a href="{% url 'djangocms_blog:posts-category' category=category.slug %}" class="blog-categories-{{ category.count }}">{{ category.name }}</a>{% if not forloop.last %}, {% endif %}</li>
+	    {% endif %}
+	{% endfor %}
+    {% endif %}
+    {% if post.tags.exists %}
+	{% for tag in post.tags.all %}
+	    <li class="tag_{{ forloop.counter }}"><a href="{% url 'djangocms_blog:posts-tagged' tag=tag.slug %}" class="blog-tag blog-tag-{{ tag.count }}">{{ tag.name }}</a>{% if not forloop.last %}, {% endif %}</li>
+	{% endfor %}
+    {% endif %}
+</ul>

cms_templates/letscowork.html

@@ -1,4 +1,4 @@
-{% extends "digitalglarus/base.html" %}
+{% extends "base_glarus.html" %}
 {% load staticfiles cms_tags %}
 {% block title %}crowdfunding{% endblock %}
 

cms_templates/one_column.html

@@ -1,4 +1,4 @@
-{% extends "digitalglarus/base.html" %}
+{% extends "base_glarus.html" %}
 {% load staticfiles cms_tags %}
 {% block title %}About{% endblock %}
 

cms_templates/two_columns.html

@@ -1,4 +1,4 @@
-{% extends "cms/digitalglarus/base.html" %}
+{% extends "base_glarus.html" %}
 {% load staticfiles cms_tags %}
 {% block title %}About{% endblock %}
 

digitalglarus/admin.py

@@ -1,12 +1,12 @@
 from django.contrib import admin
-# from .models import Message, Supporter, DGGallery, DGPicture
+from .models import Message, Supporter, DGGallery, DGPicture
+#
+class DGPictureInline(admin.StackedInline):
+    model = DGPicture
 
-# class DGPictureInline(admin.StackedInline):
+class DGGalleryAdmin(admin.ModelAdmin):
-#     model = DGPicture
+    inlines = [DGPictureInline]
-#
+
-# class DGGalleryAdmin(admin.ModelAdmin):
+admin.site.register(DGGallery, DGGalleryAdmin)
-#     inlines = [DGPictureInline]
+admin.site.register(Message)
-#
+admin.site.register(Supporter)
-# admin.site.register(DGGallery, DGGalleryAdmin)
-# admin.site.register(Message)
-# admin.site.register(Supporter)

digitalglarus/cms_plugins.py

@@ -1,36 +1,36 @@
-# from cms.plugin_base import CMSPluginBase
+from cms.plugin_base import CMSPluginBase
-# from cms.plugin_pool import plugin_pool
+from cms.plugin_pool import plugin_pool
-# from cms.wizards import wizard_base
+from cms.wizards import wizard_base
-# from .models import DGGalleryPlugin, DGSupportersPlugin, Supporter
+from .models import DGGalleryPlugin, DGSupportersPlugin, Supporter
-# from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext as _
-
-# class CMSGalleryPlugin(CMSPluginBase):
-#     model = DGGalleryPlugin
-#     name = _("Digital Glarus Gallery")
-#     render_template = "digitalglarus/gallery.html"
 #
-#     def render(self, context, instance, placeholder):
+class CMSGalleryPlugin(CMSPluginBase):
-#         context.update({
+    model = DGGalleryPlugin
-#             'gallery':instance.dgGallery,
+    name = _("Digital Glarus Gallery")
-#             'object':instance,
+    render_template = "gallery.html"
-#             'placeholder':placeholder
+
-#         })
+    def render(self, context, instance, placeholder):
-#         return context
+        context.update({
+            'gallery':instance.dgGallery,
+            'object':instance,
+            'placeholder':placeholder
+        })
+        return context
+
+class CMSSupportersPlugin(CMSPluginBase):
+    name = _("Digital Glarus Supporters")
+    model = DGSupportersPlugin
+    render_template = "supporters_plugin.html"
+
+    def render(self, context, instance, placeholder):
+        context.update({
+            'supporters': Supporter.objects.all().order_by('name'),
+            'object': instance,
+            'placeholder':placeholder
+        })
+        return context
 #
-# class CMSSupportersPlugin(CMSPluginBase):
-#     name = _("Digital Glarus Supporters")
-#     model = DGSupportersPlugin
-#     render_template = "digitalglarus/supporters_plugin.html"
 #
-#     def render(self, context, instance, placeholder):
+#
-#         context.update({
+plugin_pool.register_plugin(CMSGalleryPlugin)
-#             'supporters': Supporter.objects.all().order_by('name'),
+plugin_pool.register_plugin(CMSSupportersPlugin)
-#             'object': instance,
-#             'placeholder':placeholder
-#         })
-#         return context
-
-
-
-# plugin_pool.register_plugin(CMSGalleryPlugin)
-# plugin_pool.register_plugin(CMSSupportersPlugin)

digitalglarus/migrations/0004_dggallery_dggalleryplugin_dgpicture_dgsupportersplugin_supporter.py

@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-03-30 22:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import filer.fields.image
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0013_urlconfrevision'),
+        ('filer', '0002_auto_20150606_2003'),
+        ('digitalglarus', '0003_auto_20160325_1659'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DGGallery',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=30)),
+                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.DGGallery')),
+            ],
+            options={
+                'verbose_name_plural': 'dgGallery',
+            },
+        ),
+        migrations.CreateModel(
+            name='DGGalleryPlugin',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
+                ('dgGallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.DGGallery')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+        migrations.CreateModel(
+            name='DGPicture',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('description', models.CharField(max_length=60)),
+                ('gallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.DGGallery')),
+                ('image', filer.fields.image.FilerImageField(on_delete=django.db.models.deletion.CASCADE, related_name='dg_gallery', to='filer.Image')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='DGSupportersPlugin',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+        migrations.CreateModel(
+            name='Supporter',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=200)),
+                ('description', models.TextField(blank=True, null=True)),
+            ],
+        ),
+    ]

digitalglarus/models.py

@@ -15,40 +15,40 @@ class Message(models.Model):
         return "%s - %s - %s" % (self.name, self.email, self.received_date)
 
 
-# class Supporter(models.Model):
+class Supporter(models.Model):
-#     name = models.CharField(max_length=200)
+    name = models.CharField(max_length=200)
-#     description = models.TextField(null=True, blank=True)
+    description = models.TextField(null=True, blank=True)
-#
-#     def __str__(self):
-#         return "%s" % (self.name)
-#
-#     def get_absolute_url(self):
-#         return reverse('dgSupporters_view', args=[self.pk])
-#
-#
-# class DGGallery(models.Model):
-#     parent = models.ForeignKey('self', blank=True, null=True)
-#     name = models.CharField(max_length=30)
-#
-#     def __str__(self):
-#         return "%s" % (self.name)
-#
-#     def get_absolute_url(self):
-#         return reverse('dgGallery_view', args=[self.pk])
-#
-#     class Meta:
-#         verbose_name_plural = 'dgGallery'
 
-# class DGPicture(models.Model):
+    def __str__(self):
-#     gallery = models.ForeignKey(DGGallery)
+        return "%s" % (self.name)
-#     image =  FilerImageField(related_name='dg_gallery')
+
-#     description = models.CharField(max_length=60)
+    def get_absolute_url(self):
+        return reverse('dgSupporters_view', args=[self.pk])
+
+
+class DGGallery(models.Model):
+    parent = models.ForeignKey('self', blank=True, null=True)
+    name = models.CharField(max_length=30)
+
+    def __str__(self):
+        return "%s" % (self.name)
+
+    def get_absolute_url(self):
+        return reverse('dgGallery_view', args=[self.pk])
+
+    class Meta:
+        verbose_name_plural = 'dgGallery'
 #
-#     def __str__(self):
+class DGPicture(models.Model):
-#         return "%s" % (self.image.name)
+    gallery = models.ForeignKey(DGGallery)
-#
+    image =  FilerImageField(related_name='dg_gallery')
-# class DGGalleryPlugin(CMSPlugin):
+    description = models.CharField(max_length=60)
-#     dgGallery = models.ForeignKey(DGGallery)
+
-#
+    def __str__(self):
-# class DGSupportersPlugin(CMSPlugin):
+        return "%s" % (self.image.name)
-#     pass
+
+class DGGalleryPlugin(CMSPlugin):
+    dgGallery = models.ForeignKey(DGGallery)
+
+class DGSupportersPlugin(CMSPlugin):
+    pass

digitalglarus/templates/about.html

@@ -1,4 +1,4 @@
-{% extends "digitalglarus/base.html" %}
+{% extends "base_glarus.html" %}
 {% load staticfiles cms_tags %}
 {% block title %}About{% endblock %}
 

digitalglarus/templates/cms/digitalglarus/__init__.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.utils.translation import ugettext_lazy as _
-TEMPLATES = {
-    'about.html': _('DG.About'),
-    'contact.html': _('DG.Contact'),
-    'index.html': _('DG.Home'),
-    'letscowork.html': _('DG.CoWork'),
-    'detail.html': _('DG.Detail'),
-    'one_column.html': _('DG.OneColumn'),
-}

digitalglarus/templates/cms/digitalglarus/base.html

@@ -1,96 +0,0 @@
-{% load staticfiles cms_tags menu_tags sekizai_tags  menu_tags %}
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <title>
-      {% page_attribute "page_title" %}
-    </title>
-
-
-    <!-- Favicon -->
-    <link rel="shortcut icon" href="{% static 'digitalglarus/img/favicon.ico' %}"/>
-
-    <!-- Bootstrap Core CSS -->
-    <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
-
-    <!-- Custom CSS -->
-    <link href="{% static 'digitalglarus/css/business-casual.css' %}" rel="stylesheet">
-    <!-- Fonts -->
-    <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>
-	<![endif]-->
-    {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
-    {% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-62285904-2', 'auto');
-  ga('send', 'pageview');
-
-</script>
-</head>
-
-<body>
-  {% cms_toolbar %}
-    <div class="brand">Digital Glarus</div>
-    <div class="address-bar">
-{#      {% placeholder 'digital_glarus_legend' %}#}
-    </div>
-    <div class="center-block">
-      <ul class="list-inline center-block language-chooser-list">
-	{% language_chooser "cms/digitalglarus/partials/language-chooser.html" %}
-      </ul>
-    </div>
-
-    <!-- Navigation -->
-    {% include "cms/digitalglarus/partials/menu.html" %}
-
-    <div class="container">
-    {% block content %} {% endblock %}
-    </div>
-    <!-- /.container -->
-
-    <footer>
-	<div class="container">
-	    <div class="row">
-		<div class="col-lg-12 text-center">
-		  <p class="text-center">Copyright &copy; <a href="http://www.ungleich.ch">ungleich GmbH 2015</a></p>
-		</div>
-	    </div>
-	</div>
-    </footer>
-
-    <!-- jQuery -->
-    <script src="{% static 'digitalglarus/js/jquery.js' %}"></script>
-
-    <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'digitalglarus/js/bootstrap.min.js' %}"></script>
-    <script src="{% static 'digitalglarus/js/digital.glarus.js' %}"></script>
-
-    <!-- Script to Activate the Carousel -->
-    <script>
-    $('.carousel').carousel({
-	interval: 5000 //changes the speed
-    })
-    </script>
-
-</body>
-
-</html>

digitalglarus/templates/cms/digitalglarus/index.html

@@ -1,106 +0,0 @@
-{% extends "digitalglarus/base.html" %}
-{% load staticfiles %}
-
-{% block content %}
-        <div class="row">
-            <div class="box">
-                <div class="col-lg-12 text-center">
-                    <div id="carousel-example-generic" class="carousel slide">
-                        <!-- Indicators --><!-- Wrapper for slides -->
-                        <div class="carousel-inner">
-                            <div class="item active">
-                                <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 'digitalglarus/img/slide-2.jpg' %}" alt="">
-                            </div>
-                            <div class="item">
-                                <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
-                            </div>
-                        </div>
-
-                        <!-- Controls -->
-                        <a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
-                            <span class="icon-prev"></span>
-                        </a>
-                        <a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
-                            <span class="icon-next"></span>
-                        </a>
-                    </div>
-                    <h2 class="brand-before">
-                        <small>WELCOME TO</small>
-                    </h2>
-                    <h1 class="brand-name">Digital Glarus</h1>
-                    <hr class="tagline-divider">
-                    <h2>
-                        <small>By
-                            <strong><a href="http://ungleich.ch">ungleich gmbh</a></strong>
-                        </small>
-                    </h2>
-                </div>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="box">
-                <div class="col-lg-12">
-                    <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 '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>
-                    <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 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>
-        </div>
-
-        <div class="row">
-            <div class="box">
-                <div class="col-lg-12">
-                    <hr>
-                    <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 running anymore, their heritage suits exactly what the tech society of Switzerland requires: Great and affordable place for computer scientists.</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>
-        </div>
-
-<div class="row">
-            <div class="box">
-              <div class="col-lg-12">
-                    <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.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>
-                </div>
-            </div>
-        </div>
-<div class="row">
-            <div class="box">
-              <div class="col-lg-12">
-                    <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>
-                        <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>
-              </div>
-            </div>
-        </div>
-
-{% endblock %}

digitalglarus/templates/cms/digitalglarus/partials/language-chooser.html

@@ -1,9 +0,0 @@
-{% load i18n menu_tags %}
-
-{% if languages|length > 1 %}
-{% for language in languages %}
-<li class="lang{% if current_language == language.0 %} active{% endif %}">
-  <a href="{% page_language_url language.0 %}" title="{% trans "Change to language:" %} {{ language.1 }}">{{ language.1 }}</a>
-</li>
-{% endfor %}
-{% endif %}

digitalglarus/templates/cms/digitalglarus/partials/menu.html

@@ -1,26 +0,0 @@
-{% load menu_tags staticfiles cms_tags %}
-<!-- 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">
-	{% show_menu 0 0 0 1 %}
-	{% show_menu_below_id "digital-glarus-page" 0 %}
-      </ul>
-    </div>
-    <!-- /.navbar-collapse -->
-  </div>
-  <!-- /.container -->
-</nav>

digitalglarus/templates/contact.html

@@ -1,4 +1,4 @@
-{% extends "digitalglarus/base.html" %}
+{% extends "base_glarus.html" %}
 {% load cms_tags %}
 {% block title %}Contact{% endblock %}
 

digitalglarus/templates/digitalglarus/about.html

@@ -1,72 +0,0 @@
-{% extends "digitalglarus/base.html" %}
-{% 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_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 %}

digitalglarus/templates/digitalglarus/contact.html

@@ -1,76 +0,0 @@
-{% extends "digitalglarus/base.html" %}
-
-{% block title %}Contact{% endblock %}
-
-{% block content %}
-        <div class="row">
-            <div class="box">
-                <div class="col-lg-12">
-                    <hr>
-                    <h2 class="intro-text text-center">Contact
-                        <strong>DIGITAL GLARUS</strong>
-                    </h2>
-                    <hr>
-                </div>
-                <div class="col-md-8">
-                    <!-- Embedded Google Map using an iframe - to select your location find it on Google maps and paste the link as the iframe src. If you want to use the Google Maps API instead then have at it! -->
-                    <iframe width="100%" height="400" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.com/maps?hl=en&amp;ie=UTF8&amp;ll=46.969959,9.039001&amp;spn=56.506174,79.013672&amp;t=m&amp;z=12&amp;output=embed"></iframe>
-                </div>
-                <div class="col-md-4">
-                    <p>Phone:
-                        <strong>+41 (0) 44 534 66 22</strong>
-                    </p>
-                    <p>Email:
-                        <strong><a href="mailto:digitalglarus@ungleich.ch">digitalglarus@ungleich.ch</a></strong>
-                    </p>
-                    <p>Address:
-                      <strong>Hauptstrasse 14, 8775 Luchsingen<br>
-                      </strong></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">Contact
-                        <strong>form</strong>
-                    </h2>
-                    <hr>
-                    <p>If you want further information on Digital Glarus, please send us a message using the form below.</p>
-                    <form action="{% url 'digitalglarus:contact' %}" method="post" role="form">
-                        {% csrf_token %}
-                        <div class="row">
-                            <div class="form-group col-lg-4">
-                                <label>Name</label>
-                                <input type="text" class="form-control" name="name">
-                            </div>
-                            <div class="form-group col-lg-4">
-                                <label>Email Address</label>
-                                <input type="email" class="form-control" name="email">
-                            </div>
-                            <div class="form-group col-lg-4">
-                                <label>Phone Number</label>
-                                <input type="tel" class="form-control" name="phone_number">
-                            </div>
-                            <div class="clearfix"></div>
-                            <div class="form-group col-lg-12">
-                                <label>Message</label>
-                                <textarea class="form-control" rows="6" name="message"></textarea>
-                            </div>
-                            <div class="form-group col-lg-12">
-                                <input type="hidden" name="save" value="contact">
-                                <button type="submit" class="btn btn-default">Submit</button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-
-    </div>
-    <!-- /.container -->
-
-{% endblock %}

digitalglarus/templates/digitalglarus/detail.html

@@ -1,11 +0,0 @@
-<h1>{{ message }}</h1>
-
-<ul>
-    <li>{{ message.name }}
-    <li>{{ message.email }}
-    <li>{{ message.phone_number }}
-    <li>{{ message.message }}
-    <li>{{ message.received_date }}
-</ul>
-
-<p><a href="{% url 'digitalglarus:index' %}">Back to Main</a>

digitalglarus/templates/digitalglarus/index.html

@@ -1,106 +0,0 @@
-{% extends "digitalglarus/base.html" %}
-{% load staticfiles %}
-
-{% block content %}
-        <div class="row">
-            <div class="box">
-                <div class="col-lg-12 text-center">
-                    <div id="carousel-example-generic" class="carousel slide">
-                        <!-- Indicators --><!-- Wrapper for slides -->
-                        <div class="carousel-inner">
-                            <div class="item active">
-                                <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 'digitalglarus/img/slide-2.jpg' %}" alt="">
-                            </div>
-                            <div class="item">
-                                <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
-                            </div>
-                        </div>
-
-                        <!-- Controls -->
-                        <a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
-                            <span class="icon-prev"></span>
-                        </a>
-                        <a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
-                            <span class="icon-next"></span>
-                        </a>
-                    </div>
-                    <h2 class="brand-before">
-                        <small>WELCOME TO</small>
-                    </h2>
-                    <h1 class="brand-name">Digital Glarus</h1>
-                    <hr class="tagline-divider">
-                    <h2>
-                        <small>By
-                            <strong><a href="http://ungleich.ch">ungleich gmbh</a></strong>
-                        </small>
-                    </h2>
-                </div>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="box">
-                <div class="col-lg-12">
-                    <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 '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>
-                    <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 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>
-        </div>
-
-        <div class="row">
-            <div class="box">
-                <div class="col-lg-12">
-                    <hr>
-                    <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 running anymore, their heritage suits exactly what the tech society of Switzerland requires: Great and affordable place for computer scientists.</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>
-        </div>
-
-<div class="row">
-            <div class="box">
-              <div class="col-lg-12">
-                    <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.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>
-                </div>
-            </div>
-        </div>
-<div class="row">
-            <div class="box">
-              <div class="col-lg-12">
-                    <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>
-                        <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>
-              </div>
-            </div>
-        </div>
-
-{% endblock %}

digitalglarus/templates/glarus_blog/base.html

@@ -1,4 +1,4 @@
-{% extends "digitalglarus/base.html" %}
+{% extends "base_glarus.html" %}
 
 {% block meta %}
 {%  if meta %}

digitalglarus/templates/glarus_blog/post_detail.html

@@ -1,4 +1,4 @@
-{% extends "glarus_blog/base.html" %}
+{% extends "base_glarus.html" %}
 {% load i18n thumbnail cms_tags %}
 
 {% block meta_description %}{{ post.meta_description }}{% endblock meta_description %}
@@ -7,7 +7,6 @@
 {% block title %}{{ post.get_title }}{% endblock %}
 
 {% block content_blog %}{% spaceless %}
-    {% debug %}
 <article id="post-{{ post.slug }}" class="post-item post-detail">
   {% if post.main_image_id %}
   <div class="blog-visual">
@@ -18,7 +17,7 @@
   <header class="text-center">
     <hr></hr>
     <h2 class="text-center intro-text">
-      <a href="{% url 'djangocms_blog:post-detail' post.slug %}" class="post-title center-block">
+      <a href="{% url 'digitalglarus:blog-detail' post.slug %}" class="post-title center-block">
 	<b>{{ post.title }}</b>
       </a>
       <small>
@@ -27,7 +26,7 @@
     </h2>
     <hr></hr>
     {% block blog_meta %}
-     include "glarus_blog/includes/blog_meta.html"
+    {# include "glarus_blog/includes/blog_meta.html" #}
     {% endblock %}
     </header>
     {% endspaceless %}

digitalglarus/templates/glarus_blog/post_list.html

@@ -1,4 +1,4 @@
-{% extends "glarus_blog/base.html" %}
+{% extends "base.html" %}
 {% load i18n thumbnail %}{% spaceless %}
 
 {% block canonical_url %}<link rel="canonical" href="{{ SITE.domain }}{{ view.get_view_url }}"/>{% endblock canonical_url %}

digitalglarus/templates/index.html

@@ -0,0 +1,99 @@
+{% extends "base_glarus.html" %}
+{% load staticfiles cms_tags %}
+
+{% block content %}
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12 text-center">
+      <div id="carousel-example-generic" class="carousel slide">
+	<!-- Indicators --><!-- Wrapper for slides -->
+	<div class="carousel-inner">
+	  <div class="item active">
+	    <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 'digitalglarus/img/slide-2.jpg' %}" alt="">
+	  </div>
+	  <div class="item">
+	    <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
+	  </div>
+	</div>
+
+	<!-- Controls -->
+	<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
+	  <span class="icon-prev"></span>
+	</a>
+	<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
+	  <span class="icon-next"></span>
+	</a>
+      </div>
+      <h2 class="brand-before">
+	<small>WELCOME TO</small>
+      </h2>
+      <h1 class="brand-name">Digital Glarus</h1>
+      <hr class="tagline-divider">
+      <h2>
+	<small>By
+	  <strong><a href="http://ungleich.ch">ungleich gmbh</a></strong>
+	</small>
+      </h2>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digital_glarus_build_a_tech_valley' %}
+      </h2>
+      <hr>
+      <img class="img-responsive img-border img-left" src="{% static 'digitalglarus/img/intro-pic.jpg' %}" alt="">
+      <hr class="visible-xs">
+      {% placeholder 'digital_glarus_build_a_tech_valley_content' %}
+      <p>&nbsp;</p>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digital_glarus_a_new_area' %}
+      </h2>
+      <hr>
+      {% placeholder 'digital_glarus_a_new_area_content' %}
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digital_glarus_why_be_interested' %}
+      </h2>
+      <hr>
+      {% placeholder 'digital_glarus_why_be_interested_content' %}
+    </div>
+  </div>
+</div>
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digital_glarus_where_we_are' %}
+      </h2>
+      <hr>
+      {% placeholder 'digital_glarus_where_we_are_content'  %}
+      <p>&nbsp;</p>
+    </div>
+  </div>
+</div>
+
+{% endblock %}

digitalglarus/templates/letscowork.html

@@ -1,5 +1,5 @@
-{% extends "digitalglarus/base.html" %}
+{% extends "base_glarus.html" %}
-{% load staticfiles %}
+{% load staticfiles cms_tags %}
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
@@ -18,34 +18,36 @@
     </div>
   </div>
 </div>
+
+
 <div class="row">
   <div class="box">
     <div class="col-lg-12">
       <hr>
-      <h2 class="intro-text text-center">why
+      <h2 class="intro-text text-center">
-	<strong>glarus?</strong>
+	{% placeholder 'digitalglarus_why_glarus' %}
       </h2>
       <hr>
     </div>
     <div class="col-sm-4 text-center">
       <img class="img-responsive" src="{% static 'digitalglarus/img/img_1.jpg' %}" alt="">
-      <h3>BEAUTIFUL
+      <h3>
-	<small> landscape</small>
+	{% placeholder 'digitalglarus_why_glarus_beautiful_landscape' %}
       </h3>
     </div>
     <div class="col-sm-4 text-center">
       <img class="img-responsive" src="{% static 'digitalglarus/img/price_1.jpg' %}" alt="">
-      <h3>AFFORDABLE
+	{% placeholder 'digitalglarus_why_glarus_affordable_price' %}
-	<small>price</small></h3>
+      </h3>
     </div>
     <div class="col-sm-4 text-center">
       <img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
-      <h3>direct
+      {% placeholder 'digitalglarus_why_glarus_direct_connection_zurich' %}
-	<small> connection to zurich</small>
       </h3>
     </div>
     <div class="clearfix"></div>
   </div>
 </div>
+
 <!-- /.container -->
 {% endblock %}

digitalglarus/templates/supporters.html

@@ -1,4 +1,4 @@
-{% extends "digitalglarus/base.html" %}
+{% extends "base_glarus.html" %}
 {% load staticfiles %}
 {% block title %}About{% endblock %}
 

digitalglarus/urls.py

@@ -3,13 +3,9 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
-    url(r'old^$', views.index, name='index'),
-    url(r'old_about$', views.about, name='about'),
     url(r'old_contact$', views.contact, name='contact'),
-    url(r'old_letscowork$', views.letscowork, name='letscowork'),
-    url(r'old_home$', views.home, name='home'),
     url(r'supporters/$', views.supporters, name='supporters'),
-    url(r'', views.index, name='index'),
+    # url(r'', views.index, name='index'),
     url(r'blog/',views.blog,name='blog'),
     url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
 ]

digitalglarus/views.py

@@ -8,7 +8,7 @@ from django.utils.translation import get_language
 from djangocms_blog.models import Post
 from django.core.urlresolvers import resolve
 
-from .models import Message#, Supporter
+from .models import Message, Supporter
 
 class MessageForm(ModelForm):
     required_css_class = 'form-control'
@@ -36,7 +36,7 @@ def index(request):
     return home(request)
 
 def home(request):
-    return render(request, 'digitalglarus/index.html')
+    return render(request, 'index.html')
 
 def letscowork(request):
     return render(request, 'digitalglarus/letscowork.html')
@@ -62,7 +62,7 @@ def contact(request):
 
 def blog(request):
     tags = ["digitalglarus"]
-    posts = Post.objects.filter(tags__name__in=tags)
+    posts = Post.objects.filter_by_language(get_language()).filter(tags__name__in=tags)
     context = {
         'post_list': posts,
     }
@@ -70,16 +70,15 @@ def blog(request):
 
 
 def blog_detail(request, slug):
-    language = get_language()
+    post = Post.objects.filter_by_language(get_language()).filter(slug=slug).first()
-    post = Post.objects.translated('en-us', slug=slug).get()
     context = {
         'post': post,
     }
-    return render(request, 'glarus_blog/post_detail.html', context)
+    return render(request, 'post_detail.html', context)
 
 
 def supporters(request):
     context = {
         'supporters': Supporter.objects.order_by('name')
     }
-    return render(request, 'digitalglarus/supporters.html', context)
+    return render(request, 'supporters.html', context)

dynamicweb/settings/base.py

@@ -131,12 +131,13 @@ ROOT_URLCONF = 'dynamicweb.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
+        'DIRS': [os.path.join(PROJECT_DIR,'cms_templates/'),
-            os.path.join(PROJECT_DIR, 'membership/'),  # membership template
+                 os.path.join(PROJECT_DIR,'cms_templates/djangocms_blog/'),
-            os.path.join(PROJECT_DIR, 'templates/'),
+                 os.path.join(PROJECT_DIR,'membership'),
-            os.path.join(PROJECT_DIR, 'templates/digitalglarus/partials'),
+                 os.path.join(PROJECT_DIR,'ungleich/templates/djangocms_blog/'),
-            os.path.join(PROJECT_DIR, 'templates/cms'),
+                 os.path.join(PROJECT_DIR,'ungleich/templates/cms/ungleichch'),
-            os.path.join(PROJECT_DIR, 'templates/digitalglarus'),
+                 os.path.join(PROJECT_DIR,'ungleich/templates/ungleich')
+
                   ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -158,11 +159,20 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'dynamicweb.wsgi.application'
 
-TDIR = os.path.join(PROJECT_DIR, 'templates')
+CMS_TEMPLATES = (
-
+    ('base_glarus.html', gettext('default')),
-CMS_TEMPLATES_DIR = {
+    ('one_column.html', gettext('2 Column')),
-    1: os.path.join(TDIR, '')
+    ('two_columns.html', gettext('3 Column')),
-}
+    ('about.html', gettext('DG.About')),
+    ('contact.html', gettext('DG.Contact')),
+    ('index.html', gettext('DG.Home')),
+    ('letscowork.html', gettext('DG.CoWork')),
+    # ('detail.html', gettext('DG.Detail')),
+    ('one_column.html', gettext('DG.OneColumn')),
+    #ungleich
+    ('blog_ungleich.html', gettext('Blog')),
+    ('page.html', gettext('Page')),
+)
 
 DATABASES = {
     'default': {

dynamicweb/urls.py

@@ -18,6 +18,8 @@ urlpatterns = [
 
 # note the django CMS URLs included via i18n_patterns
 urlpatterns += i18n_patterns('',
+                             url(r'^$',include('ungleich.urls')),
+                             url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
                              url(r'^login/',include(membership_urls)),
                              url(r'^admin/', include(admin.site.urls)),
                              url(r'^digitalglarus/', include('digitalglarus.urls',

membership/models.py

@@ -101,7 +101,6 @@ class CustomUser(AbstractBaseUser):
         return self.email
 
     def has_perm(self, perm, obj=None):
-        print(perm)
         "Does the user have a specific permission?"
         # Simplest possible answer: Yes, always
         return True

templates/__init__.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-from django.utils.translation import ugettext_lazy as _
+# from django.utils.translation import ugettext_lazy as _
-TEMPLATES = {
+# TEMPLATES = {
-    'digitalglarus/about.html': _('DG.About'),
+#     'digitalglarus/about.html': _('DG.About'),
-    'digitalglarus/contact.html': _('DG.Contact'),
+#     'digitalglarus/contact.html': _('DG.Contact'),
-    'digitalglarus/index.html': _('DG.Home'),
+#     'digitalglarus/index.html': _('DG.Home'),
-    'digitalglarus/letscowork.html': _('DG.CoWork'),
+#     'digitalglarus/letscowork.html': _('DG.CoWork'),
-    'digitalglarus/one_column.html': _('DG.OneColumn'),
+#     'digitalglarus/one_column.html': _('DG.OneColumn'),
-    'ungleichch/blog.html': _('Blog'),
+#     'ungleichch/blog.html': _('Blog'),
-    'ungleichch/page.html': _('Page'),
+#     'ungleichch/page.html': _('Page'),
-}
+# }

templates/djangocms_blog/post_detail.html

@@ -1,37 +0,0 @@
-{% extends "glarus_blog/base.html" %}
-{% load i18n thumbnail cms_tags %}
-
-{% block meta_description %}{{ post.meta_description }}{% endblock meta_description %}
-{% block meta_keywords %}{{ post.meta_keywords }}{% endblock meta_keywords %}
-{% block canonical_url %}
-    <link rel="canonical" href="{{ SITE.domain }}{{ view.get_view_url }}"/>{% endblock canonical_url %}
-{% block title %}{{ post.get_title }}{% endblock %}
-
-{% block content_blog %}{% spaceless %}
-    <article id="post-{{ post.slug }}" class="post-item post-detail">
-    {% if post.main_image_id %}
-        <div class="blog-visual">
-            {% thumbnail post.main_image post.full_image_options.size crop=post.full_image_options.crop upscale=post.full_image_options.upscale subject_location=post.main_image.subject_location as thumb %}
-            <img src="{{ post.main_image.url }}" alt="{{ post.main_image.default_alt_text }}"
-                 class="img-responsive img-full"/>
-        </div>
-    {% endif %}
-    <header class="text-center">
-        <hr></hr>
-        <h2 class="text-center intro-text">
-            <a href="{% url 'djangocms_blog:post-detail' post.slug %}" class="post-title center-block">
-                <b>{{ post.title }}</b>
-            </a>
-            <small>
-                {{ post.date_created }}
-            </small>
-        </h2>
-        <hr></hr>
-{#        {% block blog_meta %}#}
-{#             include "glarus_blog/includes/blog_meta.html"#}
-{#        {% endblock %}#}
-    </header>
-{% endspaceless %}
-<div class="digitalglarus-blog-content">{% render_placeholder post.content %}</div>
-</article>
-{% endblock content_blog %}

templates/djangocms_blog/post_list.html

@@ -1,35 +0,0 @@
-{% extends "glarus_blog/base.html" %}
-{% load i18n thumbnail %}{% spaceless %}
-
-{% block canonical_url %}<link rel="canonical" href="{{ SITE.domain }}{{ view.get_view_url }}"/>{% endblock canonical_url %}
-
-{% block content_blog %}
-<section class="blog-list">
-    {% block blog_title %}
-    <header>
-    </header>
-    {% endblock %}
-    {% for post in post_list %}
-	{% include "glarus_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
-    {% empty %}
-    <p class="blog-empty text-center lead">{% trans "No article found." %}</p>
-    {% endfor %}
-    {% if author or archive_date or tagged_entries %}
-    <p class="blog-back"><a href="{% url 'djangocms_blog:posts-latest' %}">{% trans "Back" %}</a></p>
-    {% endif %}
-    {% if is_paginated %}
-    <nav class="{% firstof css_grid instance.css_grid %} pagination">
-	{% if page_obj.has_previous %}
-	    <a href="?{{ view.page_kwarg }}={{ page_obj.previous_page_number }}">&laquo; {% trans "previous" %}</a>
-	{% endif %}
-	<span class="current">
-	    {% trans "Page" %} {{ page_obj.number }} {% trans "of" %} {{ paginator.num_pages }}
-	</span>
-	{% if page_obj.has_next %}
-	    <a href="?{{ view.page_kwarg }}={{ page_obj.next_page_number }}">{% trans "next" %} &raquo;</a>
-	{% endif %}
-    </nav>
-    {% endif %}
-</section>
-{% endblock %}
-{% endspaceless %}

ungleich/templates/cms/ungleichch/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.utils.translation import ugettext_lazy as _
-TEMPLATES = {
+# TEMPLATES = {
-    'blog.html': _('Blog'),
+#     'blog_u.html': _('Blog'),
-    'page.html': _('Page'),
+#     'page.html': _('Page'),
-}
+# }

ungleich/templates/cms/ungleichch/_header_base.html

@@ -2,8 +2,8 @@
 <!-- Page Header -->
 <!-- Set your background image for this header on the line below. -->
 <header class="intro-header"
-	{% if request.current_page.ungleichpage %}
+	{% if request.current_page.pagemeta.image.url %}
-	style="background-image: url('{{ request.current_page.ungleichpage.image.url }}');"
+	style="background-image: url('{{ request.current_page.pagemeta.image.url }}');"
 	{% else %}
 	style="background-image: url('{% static 'blog.ungleich.ch/img/home-bg.jpg'  %}');"
 	{% endif %}

ungleich/templates/cms/ungleichch/blog_ungleich.html

@@ -1,4 +1,4 @@
-{% extends "ungleichch/base.html" %}
+{% extends "base_ungleich.html" %}
 {% block base_content %}
 {% block content %}
 {% endblock %}

ungleich/templates/cms/ungleichch/index.html

@@ -1,3 +1,3 @@
-{% extends "cms/ungleichch/base.html" %}
+{% extends "base_ungleich.html" %}
 {% block base_content %}
 {% endblock %}

ungleich/templates/cms/ungleichch/page.html

@@ -1,4 +1,4 @@
-{% extends "ungleichch/base.html" %}
+{% extends "base_ungleich.html" %}
 {% load cms_tags %}
 {% block base_content %}
 {% placeholder "page_content" %}

ungleich/templates/ungleich/djangocms_blog/base.html

@@ -1,4 +1,5 @@
-{% extends CMS_TEMPLATE %}
+{% extends  'cms/ungleichch/blog_ungleich.html' %}
+{#{% extends CMS_TEMPLATE %}#}
 {% block meta %}
     {%  if meta %}
 	{% include "meta_mixin/meta.html" %}

ungleich/templates/ungleich/djangocms_blog/post_detail.html

@@ -0,0 +1,49 @@
+{% extends "ungleich/djangocms_blog/base.html" %}
+{% load i18n thumbnail cms_tags %}
+{% block meta_description %}{{ post.meta_description }}{% endblock meta_description %}
+{% block meta_keywords %}{{ post.meta_keywords }}{% endblock meta_keywords %}
+{% block canonical_url %}<link rel="canonical" href="{{ SITE.domain }}{{ view.get_view_url }}"/>{% endblock canonical_url %}
+{% block title %}{% page_attribute "page_title" %} - {{ post.get_title }}{% endblock %}
+<!-- page header -->
+{% block base_header %}
+{% include "_header_post_detail.html"  %}
+{% endblock %}
+<!-- page header  -->
+{% block content_blog %}
+<article>
+  {% if post.app_config.use_placeholder %}
+  <div class="blog-content">{% render_placeholder post.content  %}</div>
+  {% else %}
+  <div class="blog-content">{% render_model post "post_text" "post_text" %}</div>
+  {% endif %}
+</article>
+{% endblock content_blog %}
+{#{% load i18n thumbnail cms_tags %}#}
+{##}
+{#{% block meta_description %}{{ post.meta_description }}{% endblock meta_description %}#}
+{#{% block meta_keywords %}{{ post.meta_keywords }}{% endblock meta_keywords %}#}
+{#{% block canonical_url %}<link rel="canonical" href="{{ meta.url }}"/>{% endblock canonical_url %}#}
+{#{% block title %}{{ post.get_title }}{% endblock %}#}
+{##}
+{#{% block content_blog %}{% spaceless %}#}
+{#<article id="post-{{ post.slug }}" class="post-item post-detail">#}
+{#    <header>#}
+{#        <h2>{% render_model post "title" %}</h2>#}
+{#        {% block blog_meta %}#}
+{#            {% include "djangocms_blog/includes/blog_meta.html" %}#}
+{#        {% endblock %}#}
+{#    </header>#}
+{#    {% if post.main_image_id %}#}
+{#    <div class="blog-visual">#}
+{#        {% thumbnail post.main_image post.full_image_options.size crop=post.full_image_options.crop upscale=post.full_image_options.upscale subject_location=post.main_image.subject_location  as thumb %}#}
+{#        <img src="{{ thumb.url }}" alt="{{ post.main_image.default_alt_text }}" width="{{ thumb.width }}" height="{{ thumb.height }}" />#}
+{#    </div>#}
+{#    {% endif %}#}
+{#    {% endspaceless %}#}
+{#    {% if post.app_config.use_placeholder %}#}
+{#        <div class="blog-content">{% render_placeholder post.content %}</div>#}
+{#    {% else %}#}
+{#        <div class="blog-content">{% render_model post "post_text" "post_text" %}</div>#}
+{#    {% endif %}#}
+{#</article>#}
+{#{% endblock content_blog %}#}

ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html

@@ -0,0 +1,90 @@
+{% extends "ungleich/djangocms_blog/base.html" %}
+{% load i18n thumbnail %}{% spaceless %}
+
+{% block canonical_url %}<link rel="canonical" href="{{ SITE.domain }}{{ view.get_view_url }}"/>{% endblock canonical_url %}
+
+{% block content_blog %}
+<section class="blog-list">
+  {% block blog_title %}
+  <header>
+    <h2>
+      {% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
+      {% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
+      {% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }}
+      {% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %}
+    </h2>
+  </header>
+
+  {% endblock %}
+  {% for post in post_list %}
+  {% include "ungleich/djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+  {% empty %}
+  <p class="blog-empty">{% trans "No article found." %}</p>
+  {% endfor %}
+  {% if author or archive_date or tagged_entries %}
+  <p class="blog-back"><a href="{% url 'djangocms_blog:posts-latest' %}">{% trans "Back" %}</a></p>
+  {% endif %}
+  {% if is_paginated %}
+  <!-- Pager -->
+  <ul class="pager">
+    {% if page_obj.has_previous %}
+    <li class="previous">
+      <a href="?{{ view.page_kwarg }}={{ page_obj.previous_page_number }}">
+	&laquo; {% trans "Newer Posts" %}
+      </a>
+    </li>
+    {% endif %}
+    {% if page_obj.has_next %}
+    <li class="next">
+      <a href="?{{ view.page_kwarg }}={{ page_obj.next_page_number }}">
+	{% trans "Older Posts" %} &rarr;
+      </a>
+    </li>
+    {% endif %}
+  </ul>
+  {% endif %}
+</section>
+{% endblock %}
+{% endspaceless %}
+
+
+{#{% load i18n thumbnail %}{% spaceless %}#}
+{##}
+{#{% block canonical_url %}<link rel="canonical" href="{{ view.get_view_url }}"/>{% endblock canonical_url %}#}
+{##}
+{#{% block content_blog %}#}
+{#<section class="blog-list">#}
+{#    {% block blog_title %}#}
+{#    <header>#}
+{#        <h2>#}
+{#        {% if author %}{% trans "Articles by" %} {{ author.get_full_name }}#}
+{#        {% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}#}
+{#        {% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }}#}
+{#        {% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %}#}
+{#        </h2>#}
+{#    </header>#}
+{#    {% endblock %}#}
+{#    {% for post in post_list %}#}
+{#        {% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}#}
+{#    {% empty %}#}
+{#    <p class="blog-empty">{% trans "No article found." %}</p>#}
+{#    {% endfor %}#}
+{#    {% if author or archive_date or tagged_entries %}#}
+{#    <p class="blog-back"><a href="{% url 'djangocms_blog:posts-latest' %}">{% trans "Back" %}</a></p>#}
+{#    {% endif %}#}
+{#    {% if is_paginated %}#}
+{#    <nav class="{% firstof css_grid instance.css_grid %} pagination">#}
+{#        {% if page_obj.has_previous %}#}
+{#            <a href="?{{ view.page_kwarg }}={{ page_obj.previous_page_number }}">&laquo; {% trans "previous" %}</a>#}
+{#        {% endif %}#}
+{#        <span class="current">#}
+{#            {% trans "Page" %} {{ page_obj.number }} {% trans "of" %} {{ paginator.num_pages }}#}
+{#        </span>#}
+{#        {% if page_obj.has_next %}#}
+{#            <a href="?{{ view.page_kwarg }}={{ page_obj.next_page_number }}">{% trans "next" %} &raquo;</a>#}
+{#        {% endif %}#}
+{#    </nav>#}
+{#    {% endif %}#}
+{#</section>#}
+{#{% endblock %}#}
+{#{% endspaceless %}#}

ungleich/urls.py

@@ -0,0 +1,8 @@
+from django.conf.urls import url
+from . import views
+
+urlpatterns = [
+    url(r'^$',views.PostListViewUngleich.as_view()),
+    # url(r'^$',views.PostListView.as_view()),
+    url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>\w[-\w]*)/$',views.details)
+]

ungleich/views.py

@@ -1,3 +1,47 @@
 from django.shortcuts import render
+from django.utils.translation import get_language
+from djangocms_blog.models import Post
+from django.views.generic import ListView
+from djangocms_blog.views import PostListView,BaseBlogView
+from django.core.paginator import Paginator
+from django.core.paginator import PageNotAnInteger
+from django.core.paginator import EmptyPage
+from djangocms_blog.settings import get_setting
 
-# Create your views here.
+
+def blog(request):
+    posts = Post.objects.all()
+    print(posts)
+    context = {
+        'post_list': posts
+    }
+
+    # PostListView.base_template_name='post_list.html'
+    return render(request, 'ungleich/djangocms_blog/post_list_ungleich.html', context=context)
+
+
+class PostListViewUngleich(PostListView):
+    model = Post
+    context_object_name = 'post_list'
+    base_template_name = 'post_list_ungleich.html'
+    paginate_by = 5
+
+    def get_context_data(self, **kwargs):
+        context = super(PostListView, self).get_context_data(**kwargs)
+        context['TRUNCWORDS_COUNT'] = get_setting('POSTS_LIST_TRUNCWORDS_COUNT')
+        return context
+
+    def get_paginate_by(self, queryset):
+        return get_setting('PAGINATION')
+
+    def get_queryset(self):
+        language = get_language()
+        queryset = self.model.objects.translated(language)
+        setattr(self.request, get_setting('CURRENT_NAMESPACE'), self.config)
+        return queryset
+
+
+def details(request, year, month, day, slug):
+    post = Post.objects.translated(get_language(), slug=slug).first()
+    context = {'post': post}
+    return render(request, 'ungleich/djangocms_blog/post_detail.html', context=context)