Merge branch 'feature/include-django-meta' into develop

This commit is contained in:
rascencio 2015-06-16 01:48:12 -06:00
commit e1c3f073a7
3 changed files with 17 additions and 1 deletions

View file

@ -88,6 +88,7 @@ INSTALLED_APPS = (
'ungleich', 'ungleich',
'railshosting', 'railshosting',
'digitalglarus', 'digitalglarus',
'djangocms_page_meta',
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
@ -410,6 +411,14 @@ BLOG_POSTS_LIST_TRUNCWORDS_COUNT = 100
BLOG_MULTISITE = True BLOG_MULTISITE = True
BLOG_AUTHOR_DEFAULT = True BLOG_AUTHOR_DEFAULT = True
#django-meta
META_SITE_PROTOCOL = "https"
META_SITE_DOMAIN = "ungleich.ch"
META_SITE_TYPE = "website"
META_SITE_NAME = "ungleich"
META_INCLUDE_KEYWORDS = ["ungleich", "hosting", "switzerland", "Schweiz", "Swiss", "cdist"]
META_USE_SITES = True
try: try:
from .local.local_settings import * from .local.local_settings import *
except ImportError as e: except ImportError as e:

View file

@ -50,3 +50,6 @@ circus-web
chaussette chaussette
meinheld meinheld
gevent gevent
# djangocms-page-meta
djangocms-page-meta

View file

@ -27,7 +27,11 @@
<link href="{% static 'blog.ungleich.ch/css/clean-blog.css' %}" type="text/css" <link href="{% static 'blog.ungleich.ch/css/clean-blog.css' %}" type="text/css"
rel="stylesheet" medial="all" /> rel="stylesheet" medial="all" />
{% endaddtoblock %} {% endaddtoblock %}
<meta charset="UTF-8">
<meta name="description" content="{% page_attribute 'meta_description' %}">
{% include 'meta.html' %}
{% block meta %}
{% endblock %}
{% render_block "external-css" %} {% render_block "external-css" %}
{% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
</head> </head>