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

Merge branch 'hotfix/back_blog_to_placeholder' into develop

Browse source
This commit is contained in:
rascencio 2015-06-13 22:38:06 -06:00
commit 2376ffb284
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dynamicweb/settings.py
View file

@ -226,7 +226,25 @@ CMS_PLACEHOLDER_CONF = {
} }
} }
], ],
} },
'content': {
'name' : _('Content'),
'default_plugins':[
{
'plugin_type':'TextPlugin',
'values':{'body':'<p></p>'},
},
]
},
'post_content': {
'name' : _('Content'),
'default_plugins':[
{
'plugin_type':'TextPlugin',
'values':{'body':'<p></p>'},
},
]
},
} }
CACHES = { CACHES = {
@ -383,7 +401,7 @@ BOOTSTRAP3 = {
# djangocms_blog config # djangocms_blog config
BLOG_ENABLE_COMMENTS = False BLOG_ENABLE_COMMENTS = False
BLOG_USE_PLACEHOLDER = False BLOG_USE_PLACEHOLDER = True
BLOG_IMAGE_THUMBNAIL_SIZE = {'size': '120x120', 'crop': True,'upscale': False} BLOG_IMAGE_THUMBNAIL_SIZE = {'size': '120x120', 'crop': True,'upscale': False}
BLOG_IMAGE_FULL_SIZE = {'size': '640x120', 'crop': True,'upscale': False} BLOG_IMAGE_FULL_SIZE = {'size': '640x120', 'crop': True,'upscale': False}
BLOG_PAGINATION = 4 BLOG_PAGINATION = 4