From 93d489334f449ff7336bdd92514beb207e3dfcf5 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 7 Aug 2018 21:44:51 +0200 Subject: [PATCH 1/5] Load cms_templates later These templates are/were used in digitalglarus and hence are obsolete now. Later can be removed after testing. --- dynamicweb/settings/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 7d333a2f..7d62ceb5 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -179,9 +179,7 @@ ROOT_URLCONF = 'dynamicweb.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(PROJECT_DIR, 'cms_templates/'), - os.path.join(PROJECT_DIR, 'cms_templates/djangocms_blog/'), - os.path.join(PROJECT_DIR, 'membership'), + 'DIRS': [os.path.join(PROJECT_DIR, 'membership'), os.path.join(PROJECT_DIR, 'hosting/templates/'), os.path.join(PROJECT_DIR, 'nosystemd/templates/'), os.path.join(PROJECT_DIR, @@ -192,6 +190,8 @@ TEMPLATES = [ os.path.join(PROJECT_DIR, 'ungleich_page/templates/ungleich_page'), os.path.join(PROJECT_DIR, 'templates/analytics'), + os.path.join(PROJECT_DIR, 'cms_templates/'), + os.path.join(PROJECT_DIR, 'cms_templates/djangocms_blog/'), ], 'APP_DIRS': True, 'OPTIONS': { From 0ddbdb045f669f1dae6f60898481e8941bf27eb2 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 7 Aug 2018 21:48:25 +0200 Subject: [PATCH 2/5] Remove unused CMS templates --- dynamicweb/settings/base.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 7d62ceb5..f5cff4fe 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -215,18 +215,18 @@ TEMPLATES = [ WSGI_APPLICATION = 'dynamicweb.wsgi.application' CMS_TEMPLATES = ( - ('base_glarus.html', gettext('default')), - ('one_column.html', gettext('2 Column')), - ('two_columns.html', gettext('3 Column')), - ('about.html', gettext('DG.About')), - ('contact.html', gettext('DG.Contact')), - ('home_digitalglarus.html', gettext('DG.Home')), - ('letscowork.html', gettext('DG.CoWork')), - # ('detail.html', gettext('DG.Detail')), - ('one_column.html', gettext('DG.OneColumn')), + # ('base_glarus.html', gettext('default')), + # ('one_column.html', gettext('2 Column')), + # ('two_columns.html', gettext('3 Column')), + # ('about.html', gettext('DG.About')), + # ('contact.html', gettext('DG.Contact')), + # ('home_digitalglarus.html', gettext('DG.Home')), + # ('letscowork.html', gettext('DG.CoWork')), + # # ('detail.html', gettext('DG.Detail')), + # ('one_column.html', gettext('DG.OneColumn')), # ungleich ('blog_ungleich.html', gettext('Blog')), - ('page.html', gettext('Page')), + # ('page.html', gettext('Page')), # dcl ('datacenterlight/cms/base.html', gettext('Data Center Light')), ('ungleich_page/glasfaser_cms_page.html', gettext('Glasfaser')), From 0a3f51361f04ce2e0dd14a90a264b4d0d1f5c096 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 7 Aug 2018 21:58:50 +0200 Subject: [PATCH 3/5] Add RSS feed icon and link --- ungleich/templates/cms/ungleichch/_header_base.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ungleich/templates/cms/ungleichch/_header_base.html b/ungleich/templates/cms/ungleichch/_header_base.html index d32f72e6..3dcb689f 100644 --- a/ungleich/templates/cms/ungleichch/_header_base.html +++ b/ungleich/templates/cms/ungleichch/_header_base.html @@ -31,6 +31,9 @@

{% page_attribute 'page_title' %}

{% page_attribute 'meta_description' %} +
+ +
From 48936ace5196ed78af78f8b2c7e708616b16d544 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 7 Aug 2018 21:59:44 +0200 Subject: [PATCH 4/5] Revert back commenting out unwanted templates Todo in another pull request --- dynamicweb/settings/base.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index f5cff4fe..7d62ceb5 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -215,18 +215,18 @@ TEMPLATES = [ WSGI_APPLICATION = 'dynamicweb.wsgi.application' CMS_TEMPLATES = ( - # ('base_glarus.html', gettext('default')), - # ('one_column.html', gettext('2 Column')), - # ('two_columns.html', gettext('3 Column')), - # ('about.html', gettext('DG.About')), - # ('contact.html', gettext('DG.Contact')), - # ('home_digitalglarus.html', gettext('DG.Home')), - # ('letscowork.html', gettext('DG.CoWork')), - # # ('detail.html', gettext('DG.Detail')), - # ('one_column.html', gettext('DG.OneColumn')), + ('base_glarus.html', gettext('default')), + ('one_column.html', gettext('2 Column')), + ('two_columns.html', gettext('3 Column')), + ('about.html', gettext('DG.About')), + ('contact.html', gettext('DG.Contact')), + ('home_digitalglarus.html', gettext('DG.Home')), + ('letscowork.html', gettext('DG.CoWork')), + # ('detail.html', gettext('DG.Detail')), + ('one_column.html', gettext('DG.OneColumn')), # ungleich ('blog_ungleich.html', gettext('Blog')), - # ('page.html', gettext('Page')), + ('page.html', gettext('Page')), # dcl ('datacenterlight/cms/base.html', gettext('Data Center Light')), ('ungleich_page/glasfaser_cms_page.html', gettext('Glasfaser')), From e27317aeab5fdf8ed16562a95a9fae77f85e932a Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 7 Aug 2018 23:24:02 +0200 Subject: [PATCH 5/5] Move rss icon from the header to the footer --- ungleich/templates/cms/ungleichch/_footer.html | 8 ++++++++ ungleich/templates/cms/ungleichch/_header_base.html | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ungleich/templates/cms/ungleichch/_footer.html b/ungleich/templates/cms/ungleichch/_footer.html index 81194f69..94832ed4 100644 --- a/ungleich/templates/cms/ungleichch/_footer.html +++ b/ungleich/templates/cms/ungleichch/_footer.html @@ -30,6 +30,14 @@ +
  • + + + + + + +

    • Copyright © ungleich GmbH {% now "Y" %} diff --git a/ungleich/templates/cms/ungleichch/_header_base.html b/ungleich/templates/cms/ungleichch/_header_base.html index 3dcb689f..d32f72e6 100644 --- a/ungleich/templates/cms/ungleichch/_header_base.html +++ b/ungleich/templates/cms/ungleichch/_header_base.html @@ -31,9 +31,6 @@

    {% page_attribute 'page_title' %}

    {% page_attribute 'meta_description' %} -
    - -