From 8b8d7733d374f89fdcd043174f1bea2a10f5d033 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Wed, 3 Feb 2016 05:24:58 -0600
Subject: [PATCH 01/26] dynamic year for hosting template footer
Signed-off-by: rscnt <rascnt@gmail.com>
---
hosting/templates/hosting/base.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosting/templates/hosting/base.html b/hosting/templates/hosting/base.html
index a9eb1d7a..d0d567c1 100644
--- a/hosting/templates/hosting/base.html
+++ b/hosting/templates/hosting/base.html
@@ -378,7 +378,7 @@
<a href="#contact">Contact</a>
</li>
</ul>
- <p class="copyright text-muted small">Copyright © ungleich GmbH 2015. All Rights Reserved</p>
+ <p class="copyright text-muted small">Copyright © ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
</div>
</div>
</div>
From 559fe2f698f0737c6466a98f6df6715b98d42957 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Wed, 3 Feb 2016 07:27:29 -0600
Subject: [PATCH 02/26] adding supporters view
Signed-off-by: rscnt <rascnt@gmail.com>
---
digitalglarus/admin.py | 3 +-
digitalglarus/models.py | 6 +++-
.../templates/digitalglarus/supporters.html | 35 +++++++++++++++++++
digitalglarus/urls.py | 1 +
digitalglarus/views.py | 9 ++++-
5 files changed, 51 insertions(+), 3 deletions(-)
create mode 100644 digitalglarus/templates/digitalglarus/supporters.html
diff --git a/digitalglarus/admin.py b/digitalglarus/admin.py
index a44a4f56..31bd8c97 100644
--- a/digitalglarus/admin.py
+++ b/digitalglarus/admin.py
@@ -1,4 +1,5 @@
from django.contrib import admin
-from .models import Message
+from .models import Message, Supporter
admin.site.register(Message)
+admin.site.register(Supporter)
diff --git a/digitalglarus/models.py b/digitalglarus/models.py
index a7535966..f8939972 100644
--- a/digitalglarus/models.py
+++ b/digitalglarus/models.py
@@ -1,6 +1,5 @@
from django.db import models
-# Create your models here.
class Message(models.Model):
name = models.CharField(max_length=200)
@@ -12,3 +11,8 @@ 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.CharField(max_length=500)
diff --git a/digitalglarus/templates/digitalglarus/supporters.html b/digitalglarus/templates/digitalglarus/supporters.html
new file mode 100644
index 00000000..6222b734
--- /dev/null
+++ b/digitalglarus/templates/digitalglarus/supporters.html
@@ -0,0 +1,35 @@
+{% 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-6">
+ <img class="img-responsive img-border-left" src="{% static 'digitalglarus/img/img_4.png' %}" alt="">
+ </div>
+ <div class="col-md-6">
+ {% for support in supporters %}
+ <div class="col-md-4">
+ <p>
+ {{ support.name }}
+ </p>
+ <p>
+ {{ support.description }}
+ </p>
+ </div>
+ {% endfor %}
+ </div>
+ <div class="clearfix"></div>
+ </div>
+</div>
+<!-- /.container -->
+
+{% endblock %}
diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py
index 44d881e0..e3b29b9e 100644
--- a/digitalglarus/urls.py
+++ b/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'),
]
diff --git a/digitalglarus/views.py b/digitalglarus/views.py
index d509ee38..86856b6f 100644
--- a/digitalglarus/views.py
+++ b/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)
From b9efa57eb6b95e9d65b196eae8bc5a6db726fc45 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Wed, 3 Feb 2016 07:36:52 -0600
Subject: [PATCH 03/26] supporters: better style for names
---
.../templates/digitalglarus/supporters.html | 45 +++++++++----------
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/digitalglarus/templates/digitalglarus/supporters.html b/digitalglarus/templates/digitalglarus/supporters.html
index 6222b734..a0b43b84 100644
--- a/digitalglarus/templates/digitalglarus/supporters.html
+++ b/digitalglarus/templates/digitalglarus/supporters.html
@@ -4,31 +4,30 @@
{% 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-6">
- <img class="img-responsive img-border-left" src="{% static 'digitalglarus/img/img_4.png' %}" alt="">
- </div>
- <div class="col-md-6">
- {% for support in supporters %}
- <div class="col-md-4">
- <p>
- {{ support.name }}
- </p>
- <p>
- {{ support.description }}
- </p>
+ <div class="box">
+ <div class="col-lg-12">
+ <hr>
+ <h2 class="intro-text text-center">
+ Supporters
+ </h2>
+ <hr>
</div>
- {% endfor %}
+ <div class="col-md-12">
+ {% for support in supporters %}
+ <div class="col-md-3">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ {{ support.name }}
+ </div>
+ <div class="panel-body">
+ {{ support.description }}
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ <div class="clearfix"></div>
</div>
- <div class="clearfix"></div>
- </div>
</div>
<!-- /.container -->
From 0051981f07221ec97d7baab3c957b6d7bfeb3b5f Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sun, 7 Feb 2016 20:02:56 -0600
Subject: [PATCH 04/26] updated requirements
Signed-off-by: rscnt <rascnt@gmail.com>
---
requirements.txt | 157 +++++++++++++++++++++++++++++------------------
1 file changed, 98 insertions(+), 59 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index cdd1ee7f..5fd718e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,61 +1,100 @@
-# 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
-
+Django==1.7.10
+Django-Select2==5.0.2
+Mako==1.0.2
+Markdown==2.6.2
+MarkupSafe==0.23
+Pillow==2.9.0
+South==1.0.2
+TornadIO2==0.0.3
+URLObject==2.4.0
+Unidecode==0.04.18
+YURL==0.13
+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==0.10.1
+cssselect==0.9.1
+django-admin-enhancer==1.0.0
+django-appconf==1.0.1
+django-appdata==0.1.4
+django-bootstrap3==6.2.2
+django-classy-tags==0.5
+django-cms==3.1.3
+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==0.9.9
+django-filter==0.10.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-master
+django-meta==0.3.1
+django-meta-mixin==0.1.1
+django-model-utils==2.2
+django-money==0.7.0
+django-mptt==0.6.1
+django-parler==1.5
+django-polymorphic==0.7.1
+django-reversion==1.9.3
+django-sekizai==0.7
+django-sortedm2m==0.10.0
+django-spurl==0.6
+django-standard-form==1.1.1
+django-taggit==0.17.1
+django-taggit-autosuggest==0.2.7
+django-taggit-templatetags==0.2.5
+django-templatetag-sugar==1.0
+django-treebeard==3.0
+djangocms-admin-style==0.2.5
+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.2
+factory-boy==2.5.2
+gevent==1.1b5
+greenlet==0.4.9
+html5lib==0.999
+iowait==0.2
+ipdb==0.8.1
+ipython==3.2.0
+lesscpy==0.10.2
+lxml==3.4.4
+meinheld==0.5.8
+micawber==0.3.3
+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.3.0
+sqlparse==0.1.15
+stripe==1.22.3
+tomako==0.1.0
+tornado==4.2.1
-# production
-# circus-web
-# chaussette
-# meinheld
-
-# python3 support
-gevent>=1.1a2
-
-# djangocms-page-meta
-djangocms-page-meta
-# memcache
-pylibmc
-
-# .env
-django-dotenv
From 06c0b3ec55ce01bda706aa631247b0020bb45a10 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sun, 7 Feb 2016 20:03:13 -0600
Subject: [PATCH 05/26] added supporters migration
Signed-off-by: rscnt <rascnt@gmail.com>
---
digitalglarus/migrations/0004_supporter.py | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 digitalglarus/migrations/0004_supporter.py
diff --git a/digitalglarus/migrations/0004_supporter.py b/digitalglarus/migrations/0004_supporter.py
new file mode 100644
index 00000000..606ad3c6
--- /dev/null
+++ b/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,),
+ ),
+ ]
From 2325d5288d9859f1bb2e53113e75acbd5f253463 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sun, 7 Feb 2016 20:19:11 -0600
Subject: [PATCH 06/26] supporters description should be text field
Signed-off-by: rscnt <rascnt@gmail.com>
---
.../migrations/0005_auto_20160208_0218.py | 20 +++++++++++++++++++
digitalglarus/models.py | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 digitalglarus/migrations/0005_auto_20160208_0218.py
diff --git a/digitalglarus/migrations/0005_auto_20160208_0218.py b/digitalglarus/migrations/0005_auto_20160208_0218.py
new file mode 100644
index 00000000..0f2e4beb
--- /dev/null
+++ b/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,
+ ),
+ ]
diff --git a/digitalglarus/models.py b/digitalglarus/models.py
index f8939972..48759aa3 100644
--- a/digitalglarus/models.py
+++ b/digitalglarus/models.py
@@ -15,4 +15,4 @@ class Message(models.Model):
class Supporter(models.Model):
name = models.CharField(max_length=200)
- description = models.CharField(max_length=500)
+ description = models.TextField()
From f352f487ca3dffe621337876bffc5e675369d4ae Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 02:41:39 -0600
Subject: [PATCH 07/26] added supporters admin
---
.../templates/digitalglarus/supporters.html | 20 +++++++++----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/digitalglarus/templates/digitalglarus/supporters.html b/digitalglarus/templates/digitalglarus/supporters.html
index a0b43b84..16f60e60 100644
--- a/digitalglarus/templates/digitalglarus/supporters.html
+++ b/digitalglarus/templates/digitalglarus/supporters.html
@@ -8,22 +8,20 @@
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">
- Supporters
+ Supporters
</h2>
<hr>
</div>
<div class="col-md-12">
- {% for support in supporters %}
- <div class="col-md-3">
- <div class="panel panel-default">
- <div class="panel-heading">
- {{ support.name }}
- </div>
- <div class="panel-body">
- {{ support.description }}
- </div>
- </div>
+ {% for supporter in supporters %}
+ <div class="col-md-3">
+ <div class="thumbnail">
+ <div class="caption">
+ <h3>{{supporter.name}}</h3>
+ <p>{{supporter.description}}</p>
+ </div>
</div>
+ </div>
{% endfor %}
</div>
<div class="clearfix"></div>
From aa62bd16b8b65cda45c3da83c6e6587729c857ee Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 02:42:01 -0600
Subject: [PATCH 08/26] added models for galleries and supporters
Signed-off-by: rscnt <rascnt@gmail.com>
---
digitalglarus/models.py | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/digitalglarus/models.py b/digitalglarus/models.py
index 48759aa3..bac011fb 100644
--- a/digitalglarus/models.py
+++ b/digitalglarus/models.py
@@ -1,4 +1,6 @@
from django.db import models
+from cms.models import CMSPlugin
+from filer.fields.image import FilerImageField
class Message(models.Model):
@@ -16,3 +18,31 @@ class Message(models.Model):
class Supporter(models.Model):
name = models.CharField(max_length=200)
description = models.TextField()
+
+ def __str__(self):
+ return "%s" % (self.name)
+
+
+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)
From 3d4fb0dd1bfa40c7dbd6f17af2720c9bccb40c98 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 02:42:26 -0600
Subject: [PATCH 09/26] added plugins for digitalglarus
---
digitalglarus/cms_plugins.py | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 digitalglarus/cms_plugins.py
diff --git a/digitalglarus/cms_plugins.py b/digitalglarus/cms_plugins.py
new file mode 100644
index 00000000..db317a67
--- /dev/null
+++ b/digitalglarus/cms_plugins.py
@@ -0,0 +1,19 @@
+from cms.plugin_base import CMSPluginBase
+from cms.plugin_pool import plugin_pool
+from .models import DGGalleryPlugin
+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
+
+plugin_pool.register_plugin(CMSGalleryPlugin)
From e4328f94d7425db7b83fe50084b1dc4e375ffb4a Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 02:42:53 -0600
Subject: [PATCH 10/26] added digitalglarus gallery template
Signed-off-by: rscnt <rascnt@gmail.com>
---
.../templates/digitalglarus/gallery.html | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 digitalglarus/templates/digitalglarus/gallery.html
diff --git a/digitalglarus/templates/digitalglarus/gallery.html b/digitalglarus/templates/digitalglarus/gallery.html
new file mode 100644
index 00000000..b87de936
--- /dev/null
+++ b/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>
From ed08e54a55355661e67d3d41cd478189ab23e59f Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 02:43:08 -0600
Subject: [PATCH 11/26] added digital glarus admin
---
digitalglarus/admin.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/digitalglarus/admin.py b/digitalglarus/admin.py
index 31bd8c97..62a2dc89 100644
--- a/digitalglarus/admin.py
+++ b/digitalglarus/admin.py
@@ -1,5 +1,12 @@
from django.contrib import admin
-from .models import Message, Supporter
+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)
From d0afe3707883881e293665732ce38b6c08273143 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 02:43:52 -0600
Subject: [PATCH 12/26] added digital glarus migrations
Signed-off-by: rscnt <rascnt@gmail.com>
---
...006_dggallery_dggalleryplugin_dgpicture.py | 52 +++++++++++++++++++
1 file changed, 52 insertions(+)
create mode 100644 digitalglarus/migrations/0006_dggallery_dggalleryplugin_dgpicture.py
diff --git a/digitalglarus/migrations/0006_dggallery_dggalleryplugin_dgpicture.py b/digitalglarus/migrations/0006_dggallery_dggalleryplugin_dgpicture.py
new file mode 100644
index 00000000..1444e9a5
--- /dev/null
+++ b/digitalglarus/migrations/0006_dggallery_dggalleryplugin_dgpicture.py
@@ -0,0 +1,52 @@
+# -*- 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'),
+ ('filer', '0002_auto_20160208_0200'),
+ ('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,),
+ ),
+ ]
From 94ac23cdf4224f9e99d3b43a1369d69e1e76ecae Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 02:58:40 -0600
Subject: [PATCH 13/26] fixed migrations
Signed-off-by: rscnt <rascnt@gmail.com>
---
.../migrations/0006_dggallery_dggalleryplugin_dgpicture.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/digitalglarus/migrations/0006_dggallery_dggalleryplugin_dgpicture.py b/digitalglarus/migrations/0006_dggallery_dggalleryplugin_dgpicture.py
index 1444e9a5..525bb85e 100644
--- a/digitalglarus/migrations/0006_dggallery_dggalleryplugin_dgpicture.py
+++ b/digitalglarus/migrations/0006_dggallery_dggalleryplugin_dgpicture.py
@@ -9,7 +9,6 @@ class Migration(migrations.Migration):
dependencies = [
('cms', '0012_auto_20150607_2207'),
- ('filer', '0002_auto_20160208_0200'),
('digitalglarus', '0005_auto_20160208_0218'),
]
From f4b6f43db6d5580d72540610a2a2c68400c0ab80 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 03:01:34 -0600
Subject: [PATCH 14/26] adding placeholder for index gallery
Signed-off-by: rscnt <rascnt@gmail.com>
---
templates/cms/digitalglarus/index.html | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/templates/cms/digitalglarus/index.html b/templates/cms/digitalglarus/index.html
index 6c5fb507..06460eef 100644
--- a/templates/cms/digitalglarus/index.html
+++ b/templates/cms/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>
From e64fa30eef2b77f123cefcd860045755ab42d58d Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 03:41:47 -0600
Subject: [PATCH 15/26] deleted counter on letscowork item
Signed-off-by: rscnt <rascnt@gmail.com>
---
templates/cms/digitalglarus/letscowork.html | 8 --------
1 file changed, 8 deletions(-)
diff --git a/templates/cms/digitalglarus/letscowork.html b/templates/cms/digitalglarus/letscowork.html
index 8bc8eda6..bdfbec2b 100644
--- a/templates/cms/digitalglarus/letscowork.html
+++ b/templates/cms/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">
From 39be9466382868d07457b19d1bb9c492ca15c370 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 04:11:26 -0600
Subject: [PATCH 16/26] DG: base template should show cms toolar
Signed-off-by: rscnt <rascnt@gmail.com>
---
digitalglarus/templates/digitalglarus/base.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/digitalglarus/templates/digitalglarus/base.html b/digitalglarus/templates/digitalglarus/base.html
index d1a9e4de..2b90085f 100644
--- a/digitalglarus/templates/digitalglarus/base.html
+++ b/digitalglarus/templates/digitalglarus/base.html
@@ -45,7 +45,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>
From 218fccf8af259a9353b97b3cef22716f85196d08 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 04:14:00 -0600
Subject: [PATCH 17/26] adding assets to DG base template
Signed-off-by: rscnt <rascnt@gmail.com>
---
digitalglarus/templates/digitalglarus/base.html | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/digitalglarus/templates/digitalglarus/base.html b/digitalglarus/templates/digitalglarus/base.html
index 2b90085f..76063827 100644
--- a/digitalglarus/templates/digitalglarus/base.html
+++ b/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]>
From eb9032592e316a54cad0a96034f46b627b04bc2d Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 04:21:33 -0600
Subject: [PATCH 18/26] DG: added link to supporters...
Signed-off-by: rscnt <rascnt@gmail.com>
---
templates/cms/digitalglarus/partials/menu.html | 3 +++
1 file changed, 3 insertions(+)
diff --git a/templates/cms/digitalglarus/partials/menu.html b/templates/cms/digitalglarus/partials/menu.html
index 7223713f..68bcd326 100644
--- a/templates/cms/digitalglarus/partials/menu.html
+++ b/templates/cms/digitalglarus/partials/menu.html
@@ -18,6 +18,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>
From 111506d885eac9f3780002b4aa946e9cf892f7a9 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 04:23:46 -0600
Subject: [PATCH 19/26] ...
Signed-off-by: rscnt <rascnt@gmail.com>
---
digitalglarus/templates/digitalglarus/base.html | 3 +++
1 file changed, 3 insertions(+)
diff --git a/digitalglarus/templates/digitalglarus/base.html b/digitalglarus/templates/digitalglarus/base.html
index 76063827..61344ffe 100644
--- a/digitalglarus/templates/digitalglarus/base.html
+++ b/digitalglarus/templates/digitalglarus/base.html
@@ -71,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>
From 862ce849f29bf3b8cd56aec392cb8584057bc841 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 04:31:53 -0600
Subject: [PATCH 20/26] dg: supporters styles
---
digitalglarus/models.py | 2 +-
digitalglarus/templates/digitalglarus/supporters.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/digitalglarus/models.py b/digitalglarus/models.py
index bac011fb..b70c00fd 100644
--- a/digitalglarus/models.py
+++ b/digitalglarus/models.py
@@ -17,7 +17,7 @@ class Message(models.Model):
class Supporter(models.Model):
name = models.CharField(max_length=200)
- description = models.TextField()
+ description = models.TextField(null=True, blank=True)
def __str__(self):
return "%s" % (self.name)
diff --git a/digitalglarus/templates/digitalglarus/supporters.html b/digitalglarus/templates/digitalglarus/supporters.html
index 16f60e60..aa2d1fbf 100644
--- a/digitalglarus/templates/digitalglarus/supporters.html
+++ b/digitalglarus/templates/digitalglarus/supporters.html
@@ -14,7 +14,7 @@
</div>
<div class="col-md-12">
{% for supporter in supporters %}
- <div class="col-md-3">
+ <div class="col-md-6">
<div class="thumbnail">
<div class="caption">
<h3>{{supporter.name}}</h3>
From bead7f96261cb7dc17ae361ff6f762e00003a12c Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Mon, 8 Feb 2016 04:32:18 -0600
Subject: [PATCH 21/26] supporter description can be null
Signed-off-by: rscnt <rascnt@gmail.com>
---
.../migrations/0007_auto_20160208_1031.py | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 digitalglarus/migrations/0007_auto_20160208_1031.py
diff --git a/digitalglarus/migrations/0007_auto_20160208_1031.py b/digitalglarus/migrations/0007_auto_20160208_1031.py
new file mode 100644
index 00000000..47e0d1e7
--- /dev/null
+++ b/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,
+ ),
+ ]
From d1c1882831bed46665ad5ca15b1556fc30ab5db8 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sat, 13 Feb 2016 14:28:46 -0600
Subject: [PATCH 22/26] added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
---
digitalglarus/cms_plugins.py | 15 ++++++++++++++-
.../digitalglarus/supporters_plugin.html | 14 ++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 digitalglarus/templates/digitalglarus/supporters_plugin.html
diff --git a/digitalglarus/cms_plugins.py b/digitalglarus/cms_plugins.py
index db317a67..03c54cae 100644
--- a/digitalglarus/cms_plugins.py
+++ b/digitalglarus/cms_plugins.py
@@ -1,6 +1,6 @@
from cms.plugin_base import CMSPluginBase
from cms.plugin_pool import plugin_pool
-from .models import DGGalleryPlugin
+from .models import DGGalleryPlugin, Supporter
from django.utils.translation import ugettext as _
class CMSGalleryPlugin(CMSPluginBase):
@@ -16,4 +16,17 @@ class CMSGalleryPlugin(CMSPluginBase):
})
return context
+class CMSSupportersPlugin(CMSPluginBase):
+ name = _("Digital Glarus Supporters")
+ render_template = "digitalglarus/supporters_plugin.html"
+
+ def render(self, context, instance, placeholder):
+ context.update({
+ 'supporters': Supporter.objects.all(),
+ 'object': instance,
+ 'placeholder':placeholder
+ })
+ return context
+
plugin_pool.register_plugin(CMSGalleryPlugin)
+plugin_pool.register_plugin(CMSSupportersPlugin)
diff --git a/digitalglarus/templates/digitalglarus/supporters_plugin.html b/digitalglarus/templates/digitalglarus/supporters_plugin.html
new file mode 100644
index 00000000..f4fbd349
--- /dev/null
+++ b/digitalglarus/templates/digitalglarus/supporters_plugin.html
@@ -0,0 +1,14 @@
+<div class="col-md-12">
+ {{placeholder}}
+ <h1> WILLIWILLIWANKA </h1>
+{% 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>
From f25a4f3d577bf6fdecc8b46a2d6281d3f1b0b380 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sun, 14 Feb 2016 09:47:07 -0600
Subject: [PATCH 23/26] added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
---
digitalglarus/cms_plugins.py | 5 ++--
.../migrations/0008_dgsupportersplugin.py | 26 +++++++++++++++++++
..._remove_dgsupportersplugin_dgsupporters.py | 18 +++++++++++++
digitalglarus/models.py | 6 +++++
.../digitalglarus/supporters_plugin.html | 16 ++++--------
.../cms/digitalglarus/partials/menu.html | 3 ---
templates/cms/digitalglarus/two_columns.html | 21 +++++++++++++++
7 files changed, 79 insertions(+), 16 deletions(-)
create mode 100644 digitalglarus/migrations/0008_dgsupportersplugin.py
create mode 100644 digitalglarus/migrations/0009_remove_dgsupportersplugin_dgsupporters.py
create mode 100644 templates/cms/digitalglarus/two_columns.html
diff --git a/digitalglarus/cms_plugins.py b/digitalglarus/cms_plugins.py
index 03c54cae..703176a2 100644
--- a/digitalglarus/cms_plugins.py
+++ b/digitalglarus/cms_plugins.py
@@ -1,6 +1,6 @@
from cms.plugin_base import CMSPluginBase
from cms.plugin_pool import plugin_pool
-from .models import DGGalleryPlugin, Supporter
+from .models import DGGalleryPlugin, DGSupportersPlugin, Supporter
from django.utils.translation import ugettext as _
class CMSGalleryPlugin(CMSPluginBase):
@@ -18,11 +18,12 @@ class CMSGalleryPlugin(CMSPluginBase):
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(),
+ 'supporters': Supporter.objects.all().order_by('name'),
'object': instance,
'placeholder':placeholder
})
diff --git a/digitalglarus/migrations/0008_dgsupportersplugin.py b/digitalglarus/migrations/0008_dgsupportersplugin.py
new file mode 100644
index 00000000..c7855bca
--- /dev/null
+++ b/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',),
+ ),
+ ]
diff --git a/digitalglarus/migrations/0009_remove_dgsupportersplugin_dgsupporters.py b/digitalglarus/migrations/0009_remove_dgsupportersplugin_dgsupporters.py
new file mode 100644
index 00000000..39ee3969
--- /dev/null
+++ b/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',
+ ),
+ ]
diff --git a/digitalglarus/models.py b/digitalglarus/models.py
index b70c00fd..0f6742c3 100644
--- a/digitalglarus/models.py
+++ b/digitalglarus/models.py
@@ -22,6 +22,9 @@ class Supporter(models.Model):
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)
@@ -46,3 +49,6 @@ class DGPicture(models.Model):
class DGGalleryPlugin(CMSPlugin):
dgGallery = models.ForeignKey(DGGallery)
+
+class DGSupportersPlugin(CMSPlugin):
+ pass
diff --git a/digitalglarus/templates/digitalglarus/supporters_plugin.html b/digitalglarus/templates/digitalglarus/supporters_plugin.html
index f4fbd349..b037e99f 100644
--- a/digitalglarus/templates/digitalglarus/supporters_plugin.html
+++ b/digitalglarus/templates/digitalglarus/supporters_plugin.html
@@ -1,14 +1,8 @@
-<div class="col-md-12">
- {{placeholder}}
- <h1> WILLIWILLIWANKA </h1>
-{% for supporter in supporters %}
+<div class="row">
+ {% for supporter in supporters.all %}
<div class="col-md-6">
- <div class="thumbnail">
- <div class="caption">
- <h3>{{supporter.name}}</h3>
- <p>{{supporter.description}}</p>
- </div>
- </div>
+ <h3 class="text-center">{{supporter.name}}</h3>
+ <p class="text-center">{{supporter.description}}</p>
</div>
-{% endfor %}
+ {% endfor %}
</div>
diff --git a/templates/cms/digitalglarus/partials/menu.html b/templates/cms/digitalglarus/partials/menu.html
index 68bcd326..7223713f 100644
--- a/templates/cms/digitalglarus/partials/menu.html
+++ b/templates/cms/digitalglarus/partials/menu.html
@@ -18,9 +18,6 @@
<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>
diff --git a/templates/cms/digitalglarus/two_columns.html b/templates/cms/digitalglarus/two_columns.html
new file mode 100644
index 00000000..6893b5de
--- /dev/null
+++ b/templates/cms/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 %}
From 66d042dbe74fcd2da9a5daa4ba9e8c24714e8b9b Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sun, 14 Feb 2016 11:52:05 -0600
Subject: [PATCH 24/26] one column supporters
---
digitalglarus/templates/digitalglarus/supporters_plugin.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/digitalglarus/templates/digitalglarus/supporters_plugin.html b/digitalglarus/templates/digitalglarus/supporters_plugin.html
index b037e99f..97f113e2 100644
--- a/digitalglarus/templates/digitalglarus/supporters_plugin.html
+++ b/digitalglarus/templates/digitalglarus/supporters_plugin.html
@@ -1,6 +1,6 @@
<div class="row">
{% for supporter in supporters.all %}
- <div class="col-md-6">
+ <div class="col-md-12">
<h3 class="text-center">{{supporter.name}}</h3>
<p class="text-center">{{supporter.description}}</p>
</div>
From abbc2982e325997896cafbe9b96f5e9d2a1a736d Mon Sep 17 00:00:00 2001
From: Tomislav R <tmslav@gmail.com>
Date: Mon, 29 Feb 2016 23:28:31 +0100
Subject: [PATCH 25/26] django version update #3
---
digitalglarus/cms_plugins.py | 4 +-
.../migrations/0010_auto_20160229_2106.py | 19 ++++++
.../{ => cms}/digitalglarus/about.html | 0
.../{ => cms}/digitalglarus/base.html | 0
.../{ => cms}/digitalglarus/contact.html | 0
.../{ => cms}/digitalglarus/detail.html | 0
.../{ => cms}/digitalglarus/gallery.html | 0
.../{ => cms}/digitalglarus/index.html | 0
.../{ => cms}/digitalglarus/letscowork.html | 0
.../{ => cms}/digitalglarus/supporters.html | 0
.../digitalglarus/supporters_plugin.html | 0
dynamicweb/settings/base.py | 9 +--
dynamicweb/urls.py | 22 +++----
pg_upgrade_internal.log | 35 ++++++++++
pg_upgrade_server.log | 25 ++++++++
pg_upgrade_utility.log | 25 ++++++++
requirements.txt | 64 ++++++++++---------
17 files changed, 153 insertions(+), 50 deletions(-)
create mode 100644 digitalglarus/migrations/0010_auto_20160229_2106.py
rename digitalglarus/templates/{ => cms}/digitalglarus/about.html (100%)
rename digitalglarus/templates/{ => cms}/digitalglarus/base.html (100%)
rename digitalglarus/templates/{ => cms}/digitalglarus/contact.html (100%)
rename digitalglarus/templates/{ => cms}/digitalglarus/detail.html (100%)
rename digitalglarus/templates/{ => cms}/digitalglarus/gallery.html (100%)
rename digitalglarus/templates/{ => cms}/digitalglarus/index.html (100%)
rename digitalglarus/templates/{ => cms}/digitalglarus/letscowork.html (100%)
rename digitalglarus/templates/{ => cms}/digitalglarus/supporters.html (100%)
rename digitalglarus/templates/{ => cms}/digitalglarus/supporters_plugin.html (100%)
create mode 100644 pg_upgrade_internal.log
create mode 100644 pg_upgrade_server.log
create mode 100644 pg_upgrade_utility.log
diff --git a/digitalglarus/cms_plugins.py b/digitalglarus/cms_plugins.py
index 703176a2..d379116c 100644
--- a/digitalglarus/cms_plugins.py
+++ b/digitalglarus/cms_plugins.py
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext as _
class CMSGalleryPlugin(CMSPluginBase):
model = DGGalleryPlugin
name = _("Digital Glarus Gallery")
- render_template = "digitalglarus/gallery.html"
+ render_template = "cms/digitalglarus/gallery.html"
def render(self, context, instance, placeholder):
context.update({
@@ -19,7 +19,7 @@ class CMSGalleryPlugin(CMSPluginBase):
class CMSSupportersPlugin(CMSPluginBase):
name = _("Digital Glarus Supporters")
model = DGSupportersPlugin
- render_template = "digitalglarus/supporters_plugin.html"
+ render_template = "cms/digitalglarus/supporters_plugin.html"
def render(self, context, instance, placeholder):
context.update({
diff --git a/digitalglarus/migrations/0010_auto_20160229_2106.py b/digitalglarus/migrations/0010_auto_20160229_2106.py
new file mode 100644
index 00000000..251af2cb
--- /dev/null
+++ b/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),
+ ),
+ ]
diff --git a/digitalglarus/templates/digitalglarus/about.html b/digitalglarus/templates/cms/digitalglarus/about.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/about.html
rename to digitalglarus/templates/cms/digitalglarus/about.html
diff --git a/digitalglarus/templates/digitalglarus/base.html b/digitalglarus/templates/cms/digitalglarus/base.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/base.html
rename to digitalglarus/templates/cms/digitalglarus/base.html
diff --git a/digitalglarus/templates/digitalglarus/contact.html b/digitalglarus/templates/cms/digitalglarus/contact.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/contact.html
rename to digitalglarus/templates/cms/digitalglarus/contact.html
diff --git a/digitalglarus/templates/digitalglarus/detail.html b/digitalglarus/templates/cms/digitalglarus/detail.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/detail.html
rename to digitalglarus/templates/cms/digitalglarus/detail.html
diff --git a/digitalglarus/templates/digitalglarus/gallery.html b/digitalglarus/templates/cms/digitalglarus/gallery.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/gallery.html
rename to digitalglarus/templates/cms/digitalglarus/gallery.html
diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/cms/digitalglarus/index.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/index.html
rename to digitalglarus/templates/cms/digitalglarus/index.html
diff --git a/digitalglarus/templates/digitalglarus/letscowork.html b/digitalglarus/templates/cms/digitalglarus/letscowork.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/letscowork.html
rename to digitalglarus/templates/cms/digitalglarus/letscowork.html
diff --git a/digitalglarus/templates/digitalglarus/supporters.html b/digitalglarus/templates/cms/digitalglarus/supporters.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/supporters.html
rename to digitalglarus/templates/cms/digitalglarus/supporters.html
diff --git a/digitalglarus/templates/digitalglarus/supporters_plugin.html b/digitalglarus/templates/cms/digitalglarus/supporters_plugin.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/supporters_plugin.html
rename to digitalglarus/templates/cms/digitalglarus/supporters_plugin.html
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 16c14f66..79647397 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -146,13 +146,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
)
TEMPLATE_DIRS = (
- os.path.join(PROJECT_DIR, 'templates'),
+ os.path.join(PROJECT_DIR, 'templates'),os.path.join(PROJECT_DIR, 'templates/cms/'),
)
-
-CMS_TEMPLATES_DIR = {
- 1: os.path.join(TEMPLATE_DIRS[0], 'cms/'),
-}
-
# Database
# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
@@ -283,7 +278,7 @@ 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',
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 129058de..08346c0e 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -8,20 +8,20 @@ from django.conf import settings
from hosting.views import railshosting
urlpatterns = [
- url(r'^hosting/', include('hosting.urls', namespace="hosting")),
- url(r'^railshosting/', railshosting, name="rails.hosting"),
- 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)
+ url(r'^hosting/', include('hosting.urls', namespace="hosting")),
+ url(r'^railshosting/', railshosting, name="rails.hosting"),
+ 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)
# note the django CMS URLs included via i18n_patterns
urlpatterns += i18n_patterns('',
- url(r'^admin/', include(admin.site.urls)),
- url(r'^digitalglarus/', include('digitalglarus.urls',
- namespace="digitalglarus")),
- url(r'^', include('cms.urls')),
-)
+ url(r'^admin/', include(admin.site.urls)),
+ url(r'^digitalglarus/', include('digitalglarus.urls',
+ namespace="digitalglarus")),
+ url(r'^', include('cms.urls')),
+ )
if settings.DEBUG:
urlpatterns += patterns('',
diff --git a/pg_upgrade_internal.log b/pg_upgrade_internal.log
new file mode 100644
index 00000000..d69c307c
--- /dev/null
+++ b/pg_upgrade_internal.log
@@ -0,0 +1,35 @@
+
+-----------------------------------------------------------------
+ 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.
diff --git a/pg_upgrade_server.log b/pg_upgrade_server.log
new file mode 100644
index 00000000..b63b126f
--- /dev/null
+++ b/pg_upgrade_server.log
@@ -0,0 +1,25 @@
+
+-----------------------------------------------------------------
+ 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
+-----------------------------------------------------------------
+
diff --git a/pg_upgrade_utility.log b/pg_upgrade_utility.log
new file mode 100644
index 00000000..b63b126f
--- /dev/null
+++ b/pg_upgrade_utility.log
@@ -0,0 +1,25 @@
+
+-----------------------------------------------------------------
+ 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
+-----------------------------------------------------------------
+
diff --git a/requirements.txt b/requirements.txt
index 5fd718e0..c779cefb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,59 +1,51 @@
-Django==1.7.10
-Django-Select2==5.0.2
-Mako==1.0.2
-Markdown==2.6.2
-MarkupSafe==0.23
-Pillow==2.9.0
-South==1.0.2
-TornadIO2==0.0.3
-URLObject==2.4.0
-Unidecode==0.04.18
-YURL==0.13
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==0.10.1
+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==6.2.2
-django-classy-tags==0.5
-django-cms==3.1.3
+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==0.9.9
+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-master
+-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.6.1
-django-parler==1.5
-django-polymorphic==0.7.1
-django-reversion==1.9.3
-django-sekizai==0.7
+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.17.1
-django-taggit-autosuggest==0.2.7
+django-taggit==0.18.0
+django-taggit-autosuggest==0.2.8
django-taggit-templatetags==0.2.5
django-templatetag-sugar==1.0
-django-treebeard==3.0
-djangocms-admin-style==0.2.5
+django-treebeard==4.0
+djangocms-admin-style==1.1.0
djangocms-blog==0.5.0
djangocms-column==1.5
djangocms-flash==0.2.0
@@ -69,18 +61,25 @@ djangocms-table==1.2
djangocms-teaser==0.1
djangocms-text-ckeditor==2.6.0
djangorestframework==3.1.3
-easy-thumbnails==2.2
+easy-thumbnails==2.3
factory-boy==2.5.2
gevent==1.1b5
+gnureadline==6.3.3
greenlet==0.4.9
-html5lib==0.999
+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
@@ -92,9 +91,14 @@ pytz==2015.6
pyzmq==14.7.0
requests==2.7.0
simplejson==3.8.0
-six==1.3.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
From 5fbde4878d4314d91ec37e9b5a3a6c9f493b0cae Mon Sep 17 00:00:00 2001
From: Tomislav R <tmslav@gmail.com>
Date: Tue, 1 Mar 2016 21:24:51 +0100
Subject: [PATCH 26/26] update
---
DEPLOY.rst | 2 +-
digitalglarus/cms_plugins.py | 4 +-
.../{cms => }/digitalglarus/about.html | 0
.../{cms => }/digitalglarus/base.html | 0
.../{cms => }/digitalglarus/contact.html | 0
.../{cms => }/digitalglarus/detail.html | 0
.../{cms => }/digitalglarus/gallery.html | 0
.../{cms => }/digitalglarus/index.html | 0
.../{cms => }/digitalglarus/letscowork.html | 0
.../{cms => }/digitalglarus/supporters.html | 0
.../digitalglarus/supporters_plugin.html | 0
dynamicweb/settings/base.py | 40 +++++++------------
pg_upgrade_internal.log | 7 ++++
pg_upgrade_server.log | 5 +++
pg_upgrade_utility.log | 5 +++
templates/{cms => }/__init__.py | 0
templates/{cms => }/digitalglarus/__init__.py | 0
templates/{cms => }/digitalglarus/about.html | 2 +-
templates/{cms => }/digitalglarus/base.html | 0
.../{cms => }/digitalglarus/contact.html | 2 +-
templates/{cms => }/digitalglarus/detail.html | 0
templates/{cms => }/digitalglarus/index.html | 0
.../{cms => }/digitalglarus/letscowork.html | 0
.../{cms => }/digitalglarus/one_column.html | 2 +-
.../partials/language-chooser.html | 0
.../digitalglarus/partials/menu.html | 0
.../{cms => }/digitalglarus/two_columns.html | 0
templates/{cms => }/ungleichch/__init__.py | 0
templates/{cms => }/ungleichch/_footer.html | 0
.../{cms => }/ungleichch/_header_base.html | 0
templates/{cms => }/ungleichch/_menu.html | 0
templates/{cms => }/ungleichch/base.html | 0
templates/{cms => }/ungleichch/blog.html | 2 +-
templates/{cms => }/ungleichch/index.html | 0
templates/{cms => }/ungleichch/page.html | 2 +-
35 files changed, 39 insertions(+), 34 deletions(-)
rename digitalglarus/templates/{cms => }/digitalglarus/about.html (100%)
rename digitalglarus/templates/{cms => }/digitalglarus/base.html (100%)
rename digitalglarus/templates/{cms => }/digitalglarus/contact.html (100%)
rename digitalglarus/templates/{cms => }/digitalglarus/detail.html (100%)
rename digitalglarus/templates/{cms => }/digitalglarus/gallery.html (100%)
rename digitalglarus/templates/{cms => }/digitalglarus/index.html (100%)
rename digitalglarus/templates/{cms => }/digitalglarus/letscowork.html (100%)
rename digitalglarus/templates/{cms => }/digitalglarus/supporters.html (100%)
rename digitalglarus/templates/{cms => }/digitalglarus/supporters_plugin.html (100%)
rename templates/{cms => }/__init__.py (100%)
rename templates/{cms => }/digitalglarus/__init__.py (100%)
rename templates/{cms => }/digitalglarus/about.html (97%)
rename templates/{cms => }/digitalglarus/base.html (100%)
rename templates/{cms => }/digitalglarus/contact.html (97%)
rename templates/{cms => }/digitalglarus/detail.html (100%)
rename templates/{cms => }/digitalglarus/index.html (100%)
rename templates/{cms => }/digitalglarus/letscowork.html (100%)
rename templates/{cms => }/digitalglarus/one_column.html (87%)
rename templates/{cms => }/digitalglarus/partials/language-chooser.html (100%)
rename templates/{cms => }/digitalglarus/partials/menu.html (100%)
rename templates/{cms => }/digitalglarus/two_columns.html (100%)
rename templates/{cms => }/ungleichch/__init__.py (100%)
rename templates/{cms => }/ungleichch/_footer.html (100%)
rename templates/{cms => }/ungleichch/_header_base.html (100%)
rename templates/{cms => }/ungleichch/_menu.html (100%)
rename templates/{cms => }/ungleichch/base.html (100%)
rename templates/{cms => }/ungleichch/blog.html (64%)
rename templates/{cms => }/ungleichch/index.html (100%)
rename templates/{cms => }/ungleichch/page.html (69%)
diff --git a/DEPLOY.rst b/DEPLOY.rst
index ab5e06e9..f0a0a695 100644
--- a/DEPLOY.rst
+++ b/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.
diff --git a/digitalglarus/cms_plugins.py b/digitalglarus/cms_plugins.py
index d379116c..703176a2 100644
--- a/digitalglarus/cms_plugins.py
+++ b/digitalglarus/cms_plugins.py
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext as _
class CMSGalleryPlugin(CMSPluginBase):
model = DGGalleryPlugin
name = _("Digital Glarus Gallery")
- render_template = "cms/digitalglarus/gallery.html"
+ render_template = "digitalglarus/gallery.html"
def render(self, context, instance, placeholder):
context.update({
@@ -19,7 +19,7 @@ class CMSGalleryPlugin(CMSPluginBase):
class CMSSupportersPlugin(CMSPluginBase):
name = _("Digital Glarus Supporters")
model = DGSupportersPlugin
- render_template = "cms/digitalglarus/supporters_plugin.html"
+ render_template = "digitalglarus/supporters_plugin.html"
def render(self, context, instance, placeholder):
context.update({
diff --git a/digitalglarus/templates/cms/digitalglarus/about.html b/digitalglarus/templates/digitalglarus/about.html
similarity index 100%
rename from digitalglarus/templates/cms/digitalglarus/about.html
rename to digitalglarus/templates/digitalglarus/about.html
diff --git a/digitalglarus/templates/cms/digitalglarus/base.html b/digitalglarus/templates/digitalglarus/base.html
similarity index 100%
rename from digitalglarus/templates/cms/digitalglarus/base.html
rename to digitalglarus/templates/digitalglarus/base.html
diff --git a/digitalglarus/templates/cms/digitalglarus/contact.html b/digitalglarus/templates/digitalglarus/contact.html
similarity index 100%
rename from digitalglarus/templates/cms/digitalglarus/contact.html
rename to digitalglarus/templates/digitalglarus/contact.html
diff --git a/digitalglarus/templates/cms/digitalglarus/detail.html b/digitalglarus/templates/digitalglarus/detail.html
similarity index 100%
rename from digitalglarus/templates/cms/digitalglarus/detail.html
rename to digitalglarus/templates/digitalglarus/detail.html
diff --git a/digitalglarus/templates/cms/digitalglarus/gallery.html b/digitalglarus/templates/digitalglarus/gallery.html
similarity index 100%
rename from digitalglarus/templates/cms/digitalglarus/gallery.html
rename to digitalglarus/templates/digitalglarus/gallery.html
diff --git a/digitalglarus/templates/cms/digitalglarus/index.html b/digitalglarus/templates/digitalglarus/index.html
similarity index 100%
rename from digitalglarus/templates/cms/digitalglarus/index.html
rename to digitalglarus/templates/digitalglarus/index.html
diff --git a/digitalglarus/templates/cms/digitalglarus/letscowork.html b/digitalglarus/templates/digitalglarus/letscowork.html
similarity index 100%
rename from digitalglarus/templates/cms/digitalglarus/letscowork.html
rename to digitalglarus/templates/digitalglarus/letscowork.html
diff --git a/digitalglarus/templates/cms/digitalglarus/supporters.html b/digitalglarus/templates/digitalglarus/supporters.html
similarity index 100%
rename from digitalglarus/templates/cms/digitalglarus/supporters.html
rename to digitalglarus/templates/digitalglarus/supporters.html
diff --git a/digitalglarus/templates/cms/digitalglarus/supporters_plugin.html b/digitalglarus/templates/digitalglarus/supporters_plugin.html
similarity index 100%
rename from digitalglarus/templates/cms/digitalglarus/supporters_plugin.html
rename to digitalglarus/templates/digitalglarus/supporters_plugin.html
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 79647397..64baac4e 100644
--- a/dynamicweb/settings/base.py
+++ b/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,27 +138,11 @@ 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',
-)
+TDIR = os.path.join(PROJECT_DIR, 'templates')
-TEMPLATE_DIRS = (
- os.path.join(PROJECT_DIR, 'templates'),os.path.join(PROJECT_DIR, 'templates/cms/'),
-)
-# Database
-# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
+CMS_TEMPLATES_DIR = {
+ 1: os.path.join(TDIR, '')
+}
DATABASES = {
'default': {
@@ -268,11 +261,6 @@ 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
@@ -415,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'},)}
diff --git a/pg_upgrade_internal.log b/pg_upgrade_internal.log
index d69c307c..4a3d55a7 100644
--- a/pg_upgrade_internal.log
+++ b/pg_upgrade_internal.log
@@ -33,3 +33,10 @@ Please use the -b command-line option or the PGBINOLD environment variable.
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.
diff --git a/pg_upgrade_server.log b/pg_upgrade_server.log
index b63b126f..b3ecffad 100644
--- a/pg_upgrade_server.log
+++ b/pg_upgrade_server.log
@@ -23,3 +23,8 @@
pg_upgrade run on Mon Feb 29 11:56:32 2016
-----------------------------------------------------------------
+
+-----------------------------------------------------------------
+ pg_upgrade run on Tue Mar 1 20:46:31 2016
+-----------------------------------------------------------------
+
diff --git a/pg_upgrade_utility.log b/pg_upgrade_utility.log
index b63b126f..b3ecffad 100644
--- a/pg_upgrade_utility.log
+++ b/pg_upgrade_utility.log
@@ -23,3 +23,8 @@
pg_upgrade run on Mon Feb 29 11:56:32 2016
-----------------------------------------------------------------
+
+-----------------------------------------------------------------
+ pg_upgrade run on Tue Mar 1 20:46:31 2016
+-----------------------------------------------------------------
+
diff --git a/templates/cms/__init__.py b/templates/__init__.py
similarity index 100%
rename from templates/cms/__init__.py
rename to templates/__init__.py
diff --git a/templates/cms/digitalglarus/__init__.py b/templates/digitalglarus/__init__.py
similarity index 100%
rename from templates/cms/digitalglarus/__init__.py
rename to templates/digitalglarus/__init__.py
diff --git a/templates/cms/digitalglarus/about.html b/templates/digitalglarus/about.html
similarity index 97%
rename from templates/cms/digitalglarus/about.html
rename to templates/digitalglarus/about.html
index 6c12cbcb..8a0da727 100755
--- a/templates/cms/digitalglarus/about.html
+++ b/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 %}
diff --git a/templates/cms/digitalglarus/base.html b/templates/digitalglarus/base.html
similarity index 100%
rename from templates/cms/digitalglarus/base.html
rename to templates/digitalglarus/base.html
diff --git a/templates/cms/digitalglarus/contact.html b/templates/digitalglarus/contact.html
similarity index 97%
rename from templates/cms/digitalglarus/contact.html
rename to templates/digitalglarus/contact.html
index 3b5f5734..01a57109 100755
--- a/templates/cms/digitalglarus/contact.html
+++ b/templates/digitalglarus/contact.html
@@ -1,4 +1,4 @@
-{% extends "cms/digitalglarus/base.html" %}
+{% extends "digitalglarus/base.html" %}
{% load cms_tags %}
{% block title %}Contact{% endblock %}
diff --git a/templates/cms/digitalglarus/detail.html b/templates/digitalglarus/detail.html
similarity index 100%
rename from templates/cms/digitalglarus/detail.html
rename to templates/digitalglarus/detail.html
diff --git a/templates/cms/digitalglarus/index.html b/templates/digitalglarus/index.html
similarity index 100%
rename from templates/cms/digitalglarus/index.html
rename to templates/digitalglarus/index.html
diff --git a/templates/cms/digitalglarus/letscowork.html b/templates/digitalglarus/letscowork.html
similarity index 100%
rename from templates/cms/digitalglarus/letscowork.html
rename to templates/digitalglarus/letscowork.html
diff --git a/templates/cms/digitalglarus/one_column.html b/templates/digitalglarus/one_column.html
similarity index 87%
rename from templates/cms/digitalglarus/one_column.html
rename to templates/digitalglarus/one_column.html
index 079bbb28..a808028e 100644
--- a/templates/cms/digitalglarus/one_column.html
+++ b/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 %}
diff --git a/templates/cms/digitalglarus/partials/language-chooser.html b/templates/digitalglarus/partials/language-chooser.html
similarity index 100%
rename from templates/cms/digitalglarus/partials/language-chooser.html
rename to templates/digitalglarus/partials/language-chooser.html
diff --git a/templates/cms/digitalglarus/partials/menu.html b/templates/digitalglarus/partials/menu.html
similarity index 100%
rename from templates/cms/digitalglarus/partials/menu.html
rename to templates/digitalglarus/partials/menu.html
diff --git a/templates/cms/digitalglarus/two_columns.html b/templates/digitalglarus/two_columns.html
similarity index 100%
rename from templates/cms/digitalglarus/two_columns.html
rename to templates/digitalglarus/two_columns.html
diff --git a/templates/cms/ungleichch/__init__.py b/templates/ungleichch/__init__.py
similarity index 100%
rename from templates/cms/ungleichch/__init__.py
rename to templates/ungleichch/__init__.py
diff --git a/templates/cms/ungleichch/_footer.html b/templates/ungleichch/_footer.html
similarity index 100%
rename from templates/cms/ungleichch/_footer.html
rename to templates/ungleichch/_footer.html
diff --git a/templates/cms/ungleichch/_header_base.html b/templates/ungleichch/_header_base.html
similarity index 100%
rename from templates/cms/ungleichch/_header_base.html
rename to templates/ungleichch/_header_base.html
diff --git a/templates/cms/ungleichch/_menu.html b/templates/ungleichch/_menu.html
similarity index 100%
rename from templates/cms/ungleichch/_menu.html
rename to templates/ungleichch/_menu.html
diff --git a/templates/cms/ungleichch/base.html b/templates/ungleichch/base.html
similarity index 100%
rename from templates/cms/ungleichch/base.html
rename to templates/ungleichch/base.html
diff --git a/templates/cms/ungleichch/blog.html b/templates/ungleichch/blog.html
similarity index 64%
rename from templates/cms/ungleichch/blog.html
rename to templates/ungleichch/blog.html
index 5317a021..73e477b7 100644
--- a/templates/cms/ungleichch/blog.html
+++ b/templates/ungleichch/blog.html
@@ -1,4 +1,4 @@
-{% extends "cms/ungleichch/base.html" %}
+{% extends "ungleichch/base.html" %}
{% block base_content %}
{% block content %}
{% endblock %}
diff --git a/templates/cms/ungleichch/index.html b/templates/ungleichch/index.html
similarity index 100%
rename from templates/cms/ungleichch/index.html
rename to templates/ungleichch/index.html
diff --git a/templates/cms/ungleichch/page.html b/templates/ungleichch/page.html
similarity index 69%
rename from templates/cms/ungleichch/page.html
rename to templates/ungleichch/page.html
index 81a4a027..f31d0a00 100644
--- a/templates/cms/ungleichch/page.html
+++ b/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" %}