From abbc2982e325997896cafbe9b96f5e9d2a1a736d Mon Sep 17 00:00:00 2001 From: Tomislav R Date: Mon, 29 Feb 2016 23:28:31 +0100 Subject: [PATCH 1/2] 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\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\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 Date: Tue, 1 Mar 2016 21:24:51 +0100 Subject: [PATCH 2/2] 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" %}