moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge master

Browse source
This commit is contained in:
Arvind Tiwari 2018-03-21 01:09:47 +05:30
commit c9ee9f6ec3
43 changed files with 1815 additions and 713 deletions
Download patch file Download diff file Expand all files Collapse all files

32
dynamicweb/settings/base.py
View file

@ -227,7 +227,7 @@ CMS_TEMPLATES = (
('blog_ungleich.html', gettext('Blog')),
('page.html', gettext('Page')),
# dcl
('datacenterlight/cms_page.html', gettext('Data Center Light')),
('datacenterlight/cms/base.html', gettext('Data Center Light')),
('ungleich_page/glasfaser_cms_page.html', gettext('Glasfaser')),
('ungleich_page/ungleich_cms_page.html', gettext('ungleich')),
)
@ -333,6 +333,26 @@ CMS_PLACEHOLDER_CONF = {
},
]
},
'datacenterlight_navbar': {
'name': _('Datacenterlight Navbar'),
'plugins': ['DCLNavbarPlugin'],
'default_plugins': [
{
'plugin_type': 'DCLNavbarPlugin',
'values': {},
},
]
},
'datacenterlight_footer': {
'name': _('Datacenterlight Footer'),
'plugins': ['DCLFooterPlugin'],
'default_plugins': [
{
'plugin_type': 'DCLFooterPlugin',
'values': {},
},
]
},
}
CMS_PERMISSION = True
@ -591,7 +611,10 @@ GOOGLE_ANALYTICS_PROPERTY_IDS = {
'node-hosting.ch': 'UA-62285904-7',
'datacenterlight.ch': 'UA-62285904-8',
'devuanhosting.ch': 'UA-62285904-9',
'devuanhosting.com': 'UA-62285904-9',
'ipv6onlyhosting.ch': 'UA-62285904-10',
'ipv6onlyhosting.net': 'UA-62285904-10',
'ipv6onlyhosting.com': 'UA-62285904-10',
'127.0.0.1:8000': 'localhost',
'dynamicweb-development.ungleich.ch': 'development',
'dynamicweb-staging.ungleich.ch': 'staging'
@ -610,10 +633,9 @@ DCL_ERROR_EMAILS_TO = env('DCL_ERROR_EMAILS_TO')
DCL_ERROR_EMAILS_TO_LIST = []
if DCL_ERROR_EMAILS_TO is not None:
DCL_ERROR_EMAILS_TO_LIST = [x.strip() for x in
DCL_ERROR_EMAILS_TO.split(
',')] \
if "," in DCL_ERROR_EMAILS_TO else [DCL_ERROR_EMAILS_TO.strip()]
DCL_ERROR_EMAILS_TO_LIST = [
x.strip() for x in DCL_ERROR_EMAILS_TO.split(',')
] if "," in DCL_ERROR_EMAILS_TO else [DCL_ERROR_EMAILS_TO.strip()]
if 'info@ungleich.ch' not in DCL_ERROR_EMAILS_TO_LIST:
DCL_ERROR_EMAILS_TO_LIST.append('info@ungleich.ch')

1
dynamicweb/settings/prod.py
View file

@ -26,6 +26,7 @@ ALLOWED_HOSTS = [
".django-hosting.ch",
".node-hosting.ch",
".devuanhosting.ch",
".devuanhosting.com",
".digitalezukunft.ch",
".ipv6onlyhosting.ch",
".ipv6onlyhosting.com",