From 7936e5dfe5a3e284ecb1fd0a10fab7d51882fedd Mon Sep 17 00:00:00 2001 From: Tomislav R Date: Tue, 1 Mar 2016 21:24:51 +0100 Subject: [PATCH] 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 +++++++------------ dynamicweb/settings/local.py | 12 +++--- 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 +- 36 files changed, 45 insertions(+), 40 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/dynamicweb/settings/local.py b/dynamicweb/settings/local.py index 8511ad5c..d2da36d1 100644 --- a/dynamicweb/settings/local.py +++ b/dynamicweb/settings/local.py @@ -4,12 +4,12 @@ ALLOWED_HOSTS = [ "*" ] -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': 'app.db', - } -} +# DATABASES = { +# 'default': { +# 'ENGINE': 'django.db.backends.sqlite3', +# 'NAME': 'app.db', +# } +# } CACHES = { 'default': { 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" %}