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

Merge branch 'hotfix/placeholderblog' into develop

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

2
Makefile
View file

@ -2,7 +2,7 @@ PY?=python3
BASEDIR=$(CURDIR) BASEDIR=$(CURDIR)
SSH_HOST=dynamicweb-staging.ungleich.ch SSH_HOST=dynamicweb.ungleich.ch
SSH_PORT=22 SSH_PORT=22
SSH_USER=app SSH_USER=app
SSH_TARGET_DIR=/home/$(SSH_USER)/app SSH_TARGET_DIR=/home/$(SSH_USER)/app

11
dynamicweb/settings.py
View file

@ -392,6 +392,17 @@ BLOG_POSTS_LIST_TRUNCWORDS_COUNT = 100
BLOG_MULTISITE = True BLOG_MULTISITE = True
BLOG_AUTHOR_DEFAULT = True BLOG_AUTHOR_DEFAULT = True
CKEDITOR_SETTINGS = {
'language': '{{ language }}',
'toolbar_CMS': [
['Undo', 'Redo'],
['cmsplugins', '-', 'ShowBlocks'],
['Format', 'Styles'],
],
'skin': 'moono',
}
try: try:
from .local.local_settings import * from .local.local_settings import *
except ImportError as e: except ImportError as e: