Merge branch 'release/1.4.2'

This commit is contained in:
rascencio 2015-06-16 01:48:41 -06:00
commit d6631bcf25
3 changed files with 13 additions and 0 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

@ -29,6 +29,7 @@
{% endaddtoblock %} {% endaddtoblock %}
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="description" content="{% page_attribute 'meta_description' %}"> <meta name="description" content="{% page_attribute 'meta_description' %}">
{% include 'meta.html' %}
{% block meta %} {% block meta %}
{% endblock %} {% endblock %}
{% render_block "external-css" %} {% render_block "external-css" %}