Merge remote-tracking branch 'origin/master'

This commit is contained in:
상희 김 2015-09-09 22:55:54 +02:00
commit 5b7c9584db
19 changed files with 773 additions and 361 deletions

View file

@ -5,7 +5,7 @@
{% block meta_description %}{{ post.meta_description }}{% endblock meta_description %}
{% block meta_keywords %}{{ post.meta_keywords }}{% endblock meta_keywords %}
{% block canonical_url %}<link rel="canonical" href="{{ SITE.domain }}{{ view.get_view_url }}"/>{% endblock canonical_url %}
{% block title %}{{ post.get_title }}{% endblock %}
{% block title %}{% page_attribute "page_title" %} - {{ post.get_title }}{% endblock %}
<!-- page header -->
{% block base_header %}
{% include "djangocms_blog/_header_post_detail.html" %}