Merge pull request #12 from nephila/feature/badges

Feature/badges
This commit is contained in:
Iacopo Spalletti 2014-04-11 12:18:18 +02:00
commit 957b057fc8
2 changed files with 2 additions and 5 deletions

View file

@ -5,10 +5,7 @@ djangocms-blog
.. image:: https://badge.fury.io/py/djangocms-blog.png
:target: http://badge.fury.io/py/djangocms-blog
.. image:: https://travis-ci.org/yakky/djangocms-blog.png?branch=master
:target: https://travis-ci.org/yakky/djangocms-blog
.. image:: https://pypip.in/d/djangocms-blog/badge.png
.. image:: http://img.shields.io/pypi/dm/djangocms-blog.png
:target: https://crate.io/packages/djangocms-blog?version=latest

View file

@ -36,7 +36,7 @@ class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdmin,
}),
(None, {
'fields': [('main_image', 'main_image_thumbnail', 'main_image_full'),
'abstract', 'meta_description']
'abstract', ('meta_description', 'meta_keywords')]
}),
]