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

Merge pull request #462 from pcoder/task/3737/ga_exists_on_all_pages

Browse source 
Corrected/added missing google analytics and reformated code
This commit is contained in:
Pcoder 2017-08-24 00:00:22 +02:00 committed by GitHub
commit 0026874f09
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dynamicweb/settings/base.py
View file

@ -37,8 +37,10 @@ def int_env(val, default_value=0):
try: try:
return_value = int(os.environ.get(val)) return_value = int(os.environ.get(val))
except Exception as e: except Exception as e:
logger.error("Encountered exception trying to get env value for {}\nException details: {}".format( logger.error(
val, str(e))) ("Encountered exception trying to get env value for {}\nException "
"details: {}").format(
val, str(e)))
return return_value return return_value
@ -169,10 +171,12 @@ TEMPLATES = [
os.path.join(PROJECT_DIR, 'membership'), os.path.join(PROJECT_DIR, 'membership'),
os.path.join(PROJECT_DIR, 'hosting/templates/'), os.path.join(PROJECT_DIR, 'hosting/templates/'),
os.path.join(PROJECT_DIR, 'nosystemd/templates/'), os.path.join(PROJECT_DIR, 'nosystemd/templates/'),
os.path.join(PROJECT_DIR, 'ungleich/templates/djangocms_blog/'), os.path.join(PROJECT_DIR,
'ungleich/templates/djangocms_blog/'),
os.path.join(PROJECT_DIR, 'ungleich/templates/cms/ungleichch'), os.path.join(PROJECT_DIR, 'ungleich/templates/cms/ungleichch'),
os.path.join(PROJECT_DIR, 'ungleich/templates/ungleich'), os.path.join(PROJECT_DIR, 'ungleich/templates/ungleich'),
os.path.join(PROJECT_DIR, 'ungleich_page/templates/ungleich_page'), os.path.join(PROJECT_DIR,
'ungleich_page/templates/ungleich_page'),
os.path.join(PROJECT_DIR, 'templates/analytics'), os.path.join(PROJECT_DIR, 'templates/analytics'),
], ],
'APP_DIRS': True, 'APP_DIRS': True,
@ -536,9 +540,12 @@ GOOGLE_ANALYTICS_PROPERTY_IDS = {
'ungleich.ch': 'UA-62285904-1', 'ungleich.ch': 'UA-62285904-1',
'digitalglarus.ch': 'UA-62285904-2', 'digitalglarus.ch': 'UA-62285904-2',
'blog.ungleich.ch': 'UA-62285904-4', 'blog.ungleich.ch': 'UA-62285904-4',
'hosting': 'UA-62285904-5', 'rails-hosting.ch': 'UA-62285904-5',
'datacenterlight.ch': 'UA-62285904-9', 'django-hosting.ch': 'UA-62285904-6',
'node-hosting.ch': 'UA-62285904-7',
'datacenterlight.ch': 'UA-62285904-8',
'devuanhosting.ch': 'UA-62285904-9',
'ipv6onlyhosting.ch': 'UA-62285904-10',
'127.0.0.1:8000': 'localhost', '127.0.0.1:8000': 'localhost',
'dynamicweb-development.ungleich.ch': 'development', 'dynamicweb-development.ungleich.ch': 'development',
'dynamicweb-staging.ungleich.ch': 'staging' 'dynamicweb-staging.ungleich.ch': 'staging'
@ -563,7 +570,8 @@ if ENABLE_DEBUG_LOGGING:
'file': { 'file': {
'level': 'DEBUG', 'level': 'DEBUG',
'class': 'logging.FileHandler', 'class': 'logging.FileHandler',
'filename': "{PROJECT_DIR}/debug.log".format(PROJECT_DIR=PROJECT_DIR), 'filename': "{PROJECT_DIR}/debug.log".format(
PROJECT_DIR=PROJECT_DIR),
}, },
}, },
'loggers': { 'loggers': {

1
hosting/templates/hosting/base.html
View file

@ -38,7 +38,6 @@
<![endif]--> <![endif]-->
{% with 'hosting/img/'|add:hosting|add:'-intro-bg.png' as image_static %} {% with 'hosting/img/'|add:hosting|add:'-intro-bg.png' as image_static %}
alt="">
<style media="screen" type="text/css"> <style media="screen" type="text/css">
.intro-header { .intro-header {
background: url("{% static image_static %}") no-repeat center center; background: url("{% static image_static %}") no-repeat center center;