Merge remote-tracking branch 'refs/remotes/origin/master'

mmit.

DEPLOY.rst

@@ -41,7 +41,7 @@ configure the values for the ssh host, user, port and target directory.
    Run:
 
    $ python manage.py makemigratoins
-   $ python manage.py syncdb
+   $ python manage.py migrate
 
 7. Setup a circus configuration.
 

digitalglarus/admin.py

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

digitalglarus/cms_plugins.py

@@ -0,0 +1,33 @@
+from cms.plugin_base import CMSPluginBase
+from cms.plugin_pool import plugin_pool
+from .models import DGGalleryPlugin, DGSupportersPlugin, Supporter
+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):
+        context.update({
+            'gallery':instance.dgGallery,
+            '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({
+            'supporters': Supporter.objects.all().order_by('name'),
+            'object': instance,
+            'placeholder':placeholder
+        })
+        return context
+
+plugin_pool.register_plugin(CMSGalleryPlugin)
+plugin_pool.register_plugin(CMSSupportersPlugin)

digitalglarus/migrations/0004_supporter.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('digitalglarus', '0003_merge'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Supporter',
+            fields=[
+                ('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
+                ('name', models.CharField(max_length=200)),
+                ('description', models.CharField(max_length=500)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

digitalglarus/migrations/0005_auto_20160208_0218.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('digitalglarus', '0004_supporter'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='supporter',
+            name='description',
+            field=models.TextField(),
+            preserve_default=True,
+        ),
+    ]

digitalglarus/migrations/0006_dggallery_dggalleryplugin_dgpicture.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import filer.fields.image
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0012_auto_20150607_2207'),
+        ('digitalglarus', '0005_auto_20160208_0218'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DGGallery',
+            fields=[
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
+                ('name', models.CharField(max_length=30)),
+                ('parent', models.ForeignKey(blank=True, to='digitalglarus.DGGallery', null=True)),
+            ],
+            options={
+                'verbose_name_plural': 'dgGallery',
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='DGGalleryPlugin',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)),
+                ('dgGallery', models.ForeignKey(to='digitalglarus.DGGallery')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+        migrations.CreateModel(
+            name='DGPicture',
+            fields=[
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
+                ('description', models.CharField(max_length=60)),
+                ('gallery', models.ForeignKey(to='digitalglarus.DGGallery')),
+                ('image', filer.fields.image.FilerImageField(related_name='dg_gallery', to='filer.Image')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

digitalglarus/migrations/0007_auto_20160208_1031.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('digitalglarus', '0006_dggallery_dggalleryplugin_dgpicture'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='supporter',
+            name='description',
+            field=models.TextField(blank=True, null=True),
+            preserve_default=True,
+        ),
+    ]

digitalglarus/migrations/0008_dgsupportersplugin.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0012_auto_20150607_2207'),
+        ('digitalglarus', '0007_auto_20160208_1031'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DGSupportersPlugin',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(primary_key=True, auto_created=True, parent_link=True, to='cms.CMSPlugin', serialize=False)),
+                ('dgSupporters', models.ManyToManyField(to='digitalglarus.Supporter')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+    ]

digitalglarus/migrations/0009_remove_dgsupportersplugin_dgsupporters.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('digitalglarus', '0008_dgsupportersplugin'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dgsupportersplugin',
+            name='dgSupporters',
+        ),
+    ]

digitalglarus/migrations/0010_auto_20160229_2106.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('digitalglarus', '0009_remove_dgsupportersplugin_dgsupporters'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='email',
+            field=models.EmailField(max_length=254),
+        ),
+    ]

digitalglarus/models.py

@@ -1,6 +1,7 @@
 from django.db import models
+from cms.models import CMSPlugin
+from filer.fields.image import FilerImageField
 
-# Create your models here.
 
 class Message(models.Model):
     name = models.CharField(max_length=200)
@@ -12,3 +13,42 @@ class Message(models.Model):
 
     def __str__(self):
         return "%s - %s - %s" % (self.name, self.email, self.received_date)
+
+
+class Supporter(models.Model):
+    name = models.CharField(max_length=200)
+    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):
+    gallery = models.ForeignKey(DGGallery)
+    image =  FilerImageField(related_name='dg_gallery')
+    description = models.CharField(max_length=60)
+
+    def __str__(self):
+        return "%s" % (self.image.name)
+
+class DGGalleryPlugin(CMSPlugin):
+    dgGallery = models.ForeignKey(DGGallery)
+
+class DGSupportersPlugin(CMSPlugin):
+    pass

digitalglarus/templates/digitalglarus/base.html

@@ -1,4 +1,4 @@
-{% load menu_tags staticfiles cms_tags %}
+{% load staticfiles cms_tags menu_tags sekizai_tags  menu_tags %}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -26,6 +26,9 @@
     <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">
 
+    {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
+    {% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}
+
     <!-- 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]>
@@ -45,7 +48,7 @@
 </head>
 
 <body>
-
+  {% cms_toolbar %}
     <div class="brand">Digital Glarus</div>
     <div class="address-bar">The Swiss IT Valley | Schwanden, 8762 GL Switzerland | From 2015.10.13</div>
 
@@ -68,6 +71,9 @@
 	      <ul class="nav navbar-nav">
 		{% show_menu 0 0 0 1 %}
 		{% show_menu_below_id "digital-glarus-page" 0 %}
+        <li>
+            <a href="{% url 'digitalglarus:supporters' %}">Supporters</a>
+        </li>
 		    <li>
 			<a href="{% url 'digitalglarus:blog' %}">Blog</a>
 		    </li>

digitalglarus/templates/digitalglarus/gallery.html

@@ -0,0 +1,19 @@
+{% load  thumbnail %}
+<div id="dg-gallery-{{gallery.name}}" class="carousel slide">
+  <!-- Indicators --><!-- Wrapper for slides -->
+  <div class="carousel-inner">
+  {% for image in gallery.dgpicture_set.all %}
+    <div class="item {% if forloop.first %} active {% endif %} ">
+      <img class="img-responsive img-full"  src="{{ image.image.url }}"  alt="{{ image.description  }}">
+    </div>
+  {% endfor  %}
+  </div>
+
+  <!-- Controls -->
+  <a class="left carousel-control" href="#dg-gallery-{{gallery.name}}" data-slide="prev">
+    <span class="icon-prev"></span>
+  </a>
+  <a class="right carousel-control" href="#dg-gallery-{{gallery.name}}" data-slide="next">
+    <span class="icon-next"></span>
+  </a>
+</div>

digitalglarus/templates/digitalglarus/supporters.html

@@ -0,0 +1,32 @@
+{% 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">
+                Supporters
+            </h2>
+            <hr>
+        </div>
+        <div class="col-md-12">
+          {% for supporter in supporters %}
+          <div class="col-md-6">
+            <div class="thumbnail">
+              <div class="caption">
+                <h3>{{supporter.name}}</h3>
+                <p>{{supporter.description}}</p>
+              </div>
+            </div>
+          </div>
+            {% endfor %}
+        </div>
+        <div class="clearfix"></div>
+    </div>
+</div>
+<!-- /.container -->
+
+{% endblock %}

digitalglarus/templates/digitalglarus/supporters_plugin.html

@@ -0,0 +1,8 @@
+<div class="row">
+   {% for supporter in supporters.all %}
+    <div class="col-md-12">
+        <h3 class="text-center">{{supporter.name}}</h3>
+        <p class="text-center">{{supporter.description}}</p>
+    </div>
+   {% endfor %}
+</div>

digitalglarus/urls.py

@@ -8,6 +8,7 @@ urlpatterns = [
     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'blog/$', views.blog, name='blog'),
     url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
 ]

digitalglarus/views.py

@@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse
 from django.utils.translation import get_language
 from djangocms_blog.models import Post
 
-from .models import Message
+from .models import Message, Supporter
 
 class MessageForm(ModelForm):
     required_css_class = 'form-control'
@@ -75,3 +75,10 @@ def blog_detail(request, slug):
         'post': post,
     }
     return render(request, 'glarus_blog/post_detail.html', context)
+
+
+def supporters(request):
+    context = {
+        'supporters': Supporter.objects.order_by('name')
+    }
+    return render(request, 'digitalglarus/supporters.html', context)

dynamicweb/settings/base.py

@@ -5,7 +5,9 @@ Copyright 2015 ungleich.
 # -*- coding: utf-8 -*-
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+
 from django.utils.translation import ugettext_lazy as _
+
 # dotenv
 import dotenv
 
@@ -15,6 +17,7 @@ gettext = lambda s: s
 def env(env_name):
     return os.environ.get(env_name)
 
+
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 PROJECT_DIR = os.path.abspath(
@@ -122,6 +125,12 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                "django.core.context_processors.media",
+                "django.core.context_processors.static",
+                "django.core.context_processors.tz",
+                "django.contrib.messages.context_processors.messages",
+                'sekizai.context_processors.sekizai',
+                'cms.context_processors.cms_settings',
             ],
         },
     },
@@ -129,33 +138,12 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'dynamicweb.wsgi.application'
 
-# Deprecated since version 1.8.
-# callables take a request object as their argument and return a dictionary of
-# items to be merged into the context.
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
-    "django.core.context_processors.static",
-    "django.core.context_processors.tz",
-    "django.contrib.messages.context_processors.messages",
-    "django.core.context_processors.request",
-    'sekizai.context_processors.sekizai',
-    'cms.context_processors.cms_settings',
-)
-
-TEMPLATE_DIRS = (
-    os.path.join(PROJECT_DIR, 'templates'),
-)
+TDIR = os.path.join(PROJECT_DIR, 'templates')
 
 CMS_TEMPLATES_DIR = {
-    1: os.path.join(TEMPLATE_DIRS[0], 'cms/'),
+    1: os.path.join(TDIR, '')
 }
 
-# Database
-# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
@@ -273,17 +261,12 @@ MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media')
 MEDIA_URL = APP_ROOT_ENDPOINT + 'media/'
 FILE_UPLOAD_PERMISSIONS = 0o644
 
-# Templates confs
-TEMPLATE_DIRS = (
-    os.path.join(PROJECT_DIR, "templates"),
-)
-
 META_SITE_PROTOCOL = 'http'
 META_USE_SITES = True
 
 MIGRATION_MODULES = {
     'cms': 'cms.migrations',
-    'filer': 'filer.migrations_django',
+    # 'filer': 'filer.migrations_django',
     'menus': 'menus.migrations_django',
     'djangocms_flash': 'djangocms_flash.migrations_django',
     'djangocms_googlemap': 'djangocms_googlemap.migrations_django',
@@ -420,4 +403,4 @@ META_INCLUDE_KEYWORDS = ["ungleich", "hosting", "switzerland",
                          "Schweiz", "Swiss", "cdist"]
 META_USE_SITES = True
 
-PARLER_LANGUAGES = {1: ({'code': 'en-us'}, {'code': 'de'}, )}
+PARLER_LANGUAGES = {1: ({'code': 'en-us'}, {'code': 'de'},)}

dynamicweb/urls.py

@@ -13,7 +13,7 @@ urlpatterns = [
                   url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
                   url(r'^jsi18n/(?P<packages>\S+?)/$',
                       'django.views.i18n.javascript_catalog'),
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+              ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 # note the django CMS URLs included via i18n_patterns
 urlpatterns += i18n_patterns('',
@@ -21,7 +21,7 @@ urlpatterns += i18n_patterns('',
                              url(r'^digitalglarus/', include('digitalglarus.urls',
                                                              namespace="digitalglarus")),
                              url(r'^', include('cms.urls')),
-)
+                             )
 
 if settings.DEBUG:
     urlpatterns += patterns('',

hosting/templates/hosting/base.html

@@ -378,7 +378,7 @@
                             <a href="#contact">Contact</a>
                         </li>
                     </ul>
-                    <p class="copyright text-muted small">Copyright &copy; ungleich GmbH 2015. All Rights Reserved</p>
+                    <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
                 </div>
             </div>
         </div>

pg_upgrade_internal.log

@@ -0,0 +1,42 @@
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:55:31 2016
+-----------------------------------------------------------------
+
+You must identify the directory where the old cluster binaries reside.
+Please use the -b command-line option or the PGBINOLD environment variable.
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:09 2016
+-----------------------------------------------------------------
+
+You must identify the directory where the old cluster binaries reside.
+Please use the -b command-line option or the PGBINOLD environment variable.
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:22 2016
+-----------------------------------------------------------------
+
+You must identify the directory where the old cluster binaries reside.
+Please use the -b command-line option or the PGBINOLD environment variable.
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:25 2016
+-----------------------------------------------------------------
+
+You must identify the directory where the old cluster binaries reside.
+Please use the -b command-line option or the PGBINOLD environment variable.
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:32 2016
+-----------------------------------------------------------------
+
+You must identify the directory where the old cluster binaries reside.
+Please use the -b command-line option or the PGBINOLD environment variable.
+
+-----------------------------------------------------------------
+  pg_upgrade run on Tue Mar  1 20:46:31 2016
+-----------------------------------------------------------------
+
+You must identify the directory where the old cluster binaries reside.
+Please use the -b command-line option or the PGBINOLD environment variable.

pg_upgrade_server.log

@@ -0,0 +1,30 @@
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:55:31 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:09 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:22 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:25 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:32 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Tue Mar  1 20:46:31 2016
+-----------------------------------------------------------------
+

pg_upgrade_utility.log

@@ -0,0 +1,30 @@
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:55:31 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:09 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:22 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:25 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Mon Feb 29 11:56:32 2016
+-----------------------------------------------------------------
+
+
+-----------------------------------------------------------------
+  pg_upgrade run on Tue Mar  1 20:46:31 2016
+-----------------------------------------------------------------
+

requirements.txt

@@ -1,61 +1,104 @@
-# lib
-psycopg2>=2.6
-Pillow>=2
-html5lib==0.999
-six==1.3.0 #compat
-python-memcached
-
-# django
-django==1.7.10
-
-#django-assets
-django-bootstrap3
-lesscpy
-django_compressor
-
-# django apps
-django-treebeard==3.0
-django-sekizai==0.7
-django-classy-tags==0.5
-django-filer==0.9.9
-django-reversion
-
-# django-cms
-django-cms
-
-# django-cms-plugins
-djangocms-admin-style==0.2.5
-djangocms-text-ckeditor>=2.4
-django-select2>=4.3.1
-djangocms-blog>=0.4.0
-
-djangocms-flash
-djangocms-googlemap
-djangocms-inherit
-djangocms-teaser
-
-djangocms-link
-djangocms-snippet
-djangocms-style
-djangocms-column
-djangocms-grid
-djangocms-oembed
-djangocms-table
-
-cmsplugin-filer==0.10.1
-
-# production
-# circus-web
-# chaussette
-# meinheld
-
-# python3 support
-gevent>=1.1a2
-
-# djangocms-page-meta
-djangocms-page-meta
-# memcache
-pylibmc
-
-# .env
-django-dotenv
+aldryn-blog==0.4.6
+aldryn-boilerplates==0.7
+aldryn-common==0.1.3
+aldryn-search==0.2.7
+anyjson==0.3.3
+chaussette==1.3.0
+cmsplugin-filer==1.0.1
+cssselect==0.9.1
+Django==1.8.9
+django-admin-enhancer==1.0.0
+django-appconf==1.0.1
+django-appdata==0.1.4
+django-bootstrap3==7.0.0
+django-classy-tags==0.7.1
+django-cms==3.2.1
+django-compressor==1.5
+django-countries==3.3
+django-debug-toolbar==1.3.2
+django-dotenv==1.3.0
+django-extensions==1.5.5
+django-filer==1.1.1
+django-filter==0.10.0
+django-formtools==1.0
+django-fsm==2.2.1
+django-fsm-admin==1.2.1
+django-guardian==1.2.0
+django-haystack==2.3.1
+django-hvad==1.2.1
+-e git+git@github.com:agiliq/merchant.git@2584954a1371ee6c7d11be2d75a94402e7c641d8#egg=django_merchant
+django-meta==0.3.1
+django-meta-mixin==0.1.1
+django-model-utils==2.2
+django-money==0.7.0
+django-mptt==0.8.2
+django-parler==1.6.1
+django-polymorphic==0.8.1
+django-reversion==1.10.1
+django-sekizai==0.9.0
+Django-Select2==5.8.1
+django-sortedm2m==0.10.0
+django-spurl==0.6
+django-standard-form==1.1.1
+django-taggit==0.18.0
+django-taggit-autosuggest==0.2.8
+django-taggit-templatetags==0.2.5
+django-templatetag-sugar==1.0
+django-treebeard==4.0
+djangocms-admin-style==1.1.0
+djangocms-blog==0.5.0
+djangocms-column==1.5
+djangocms-flash==0.2.0
+djangocms-googlemap==0.3
+djangocms-grid==1.2
+djangocms-inherit==0.1
+djangocms-link==1.6.2
+djangocms-oembed==0.5
+djangocms-page-meta==0.5.5
+djangocms-snippet==1.5
+djangocms-style==1.5
+djangocms-table==1.2
+djangocms-teaser==0.1
+djangocms-text-ckeditor==2.6.0
+djangorestframework==3.1.3
+easy-thumbnails==2.3
+factory-boy==2.5.2
+gevent==1.1b5
+gnureadline==6.3.3
+greenlet==0.4.9
+html5lib==0.9999999
+iowait==0.2
+ipdb==0.8.1
+ipython==3.2.0
+lesscpy==0.10.2
+lxml==3.4.4
+Mako==1.0.2
+Markdown==2.6.2
+MarkupSafe==0.23
+meinheld==0.5.8
+micawber==0.3.3
+mock==1.3.0
+pbr==1.8.1
+Pillow==3.1.1
+ply==3.6
+psutil==3.2.1
+psycopg2==2.6.1
+py-moneyed==0.5.0
+pylibmc==1.5.0
+pyquery==1.2.9
+python-memcached==1.57
+pytz==2015.6
+pyzmq==14.7.0
+requests==2.7.0
+simplejson==3.8.0
+six==1.10.0
+South==1.0.2
+sqlparse==0.1.15
+stripe==1.22.3
+tomako==0.1.0
+TornadIO2==0.0.3
+tornado==4.2.1
+Unidecode==0.4.19
+URLObject==2.4.0
+wheel==0.29.0
+YURL==0.13

templates/digitalglarus/about.html

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

templates/digitalglarus/contact.html

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

templates/digitalglarus/index.html

@@ -5,28 +5,7 @@
 <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>
+      {% placeholder 'digital_glarus_gallery_grid' %}
       <h2 class="brand-before">
 	<small>WELCOME TO</small>
       </h2>

templates/digitalglarus/letscowork.html

@@ -3,14 +3,6 @@
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
-<div class="row">
-  <div class="box">
-    <div class="col-lg-12 text-center">
-      <h1> <span id="date-quantity">99</span> days to go! </h1>
-    </div>
-  </div>
-  <div class="clearfix"></div>
-</div>
 <div class="row">
   <div class="box">
     <div class="col-lg-12">

templates/digitalglarus/one_column.html

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

templates/digitalglarus/two_columns.html

@@ -0,0 +1,21 @@
+{% extends "cms/digitalglarus/base.html" %}
+{% load staticfiles cms_tags %}
+{% block title %}About{% endblock %}
+
+{% block content %}
+<div class="row">
+  <div class="box">
+    <div class="col-lg-6">
+      {% placeholder 'two_columns_a' %}
+    </div>
+    <div class="col-lg-6">
+      {% placeholder 'two_columns_b' %}
+    </div>
+    <div class="clearfix"></div>
+  </div>
+</div>
+
+</div>
+<!-- /.container -->
+
+{% endblock %}

templates/ungleichch/blog.html

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

templates/ungleichch/page.html

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