diff --git a/app/settings.py b/app/settings.py index cf0cdcf..2f3ba9a 100644 --- a/app/settings.py +++ b/app/settings.py @@ -26,7 +26,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__)) SECRET_KEY = '=%%a@whz46w1#=8ffk^a+8vya5fg-kz0ztyz!_@hdg-(5a9q+s' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True TEMPLATE_DEBUG = False @@ -151,6 +151,7 @@ TEMPLATE_LOADERS = ( MIDDLEWARE_CLASSES = ( 'django.middleware.cache.UpdateCacheMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'country_segment.middleware.ResolveCountryCodeMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', @@ -162,7 +163,7 @@ MIDDLEWARE_CLASSES = ( 'cms.middleware.page.CurrentPageMiddleware', 'cms.middleware.toolbar.ToolbarMiddleware', 'cms.middleware.language.LanguageCookieMiddleware', - 'django.middleware.cache.FetchFromCacheMiddleware' + 'django.middleware.cache.FetchFromCacheMiddleware', ) TEMPLATE_CONTEXT_PROCESSORS = ( @@ -241,6 +242,8 @@ INSTALLED_APPS = ( 'djangocms_picture', 'djangocms_teaser', 'djangocms_video', + 'aldryn_segmentation', + 'country_segment', 'reversion', 'pipeline', 'zsite', @@ -269,6 +272,7 @@ INSTALLED_APPS = ( # 'debug_toolbar', 'djangocms_forms', 'smartsnippets', + 'easy_select2', ) SOUTH_MIGRATION_MODULES = { @@ -373,3 +377,13 @@ MIGRATION_MODULES = { 'cmsplugin_filer_image': 'cmsplugin_filer_image.migrations_django' } + + +CKEDITOR_SETTINGS = { + 'toolbar_HTMLField': [ + ['Undo', 'Redo'], + ['ShowBlocks'], + ['Format', 'Image'], + ], + 'skin': 'moono', +} diff --git a/requirements.txt b/requirements.txt index b3fcfc2..1dab66b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,4 +34,9 @@ aldryn-apphooks-config #export C_INCLUDE_PATH=/usr/local/Cellar/libxml2/2.9.2/include/libxml2:$C_INCLUDE_PATH git+https://github.com/MagicSolutions/django-cmsplugin-tabs.git#egg=django-cmsplugin-tabs django-cms-smartsnippets -django-admin-extend \ No newline at end of file +django-admin-extend +pyuca +https://github.com/aldryn/aldryn-segmentation/archive/master.zip +https://github.com/aldryn/aldryn-country-segment/archive/master.zip +django-easy-select2 +geoip \ No newline at end of file