Merge lp:~dholbach/ubucon-site/newsblog into lp:ubucon-site

[Daniel Holbach]

Add Aldryn newsblog. Rest of the configuration happens in the admin interface.

[Michael Hall (mhall119)]

The charm config needs libxml2-dev and libxslt-dev added to it's list of packages to install from apt for this to work, but otherwise it looks good to me.

review: Approve

=== added file 'README.local.md'
--- README.local.md	1970-01-01 00:00:00 +0000
+++ README.local.md	2016-03-30 08:22:06 +0000
@@ -0,0 +1,10 @@
+sudo apt install virtualenv libxml2-dev libxslt-dev 
+
+# Enable DATABASE in ubucon_site/settings/__init__.py
+
+virtualenv env
+./env/bin/pip install -r ubucon_site/requirements.txt
+./env/bin/python manage.py syncdb
+./env/bin/python manage.py initdb
+./env/bin/python manage.py collectstatic
+./env/bin/python manage.py runserver

=== modified file 'ubucon_site/requirements.txt'
--- ubucon_site/requirements.txt	2015-11-13 13:41:09 +0000
+++ ubucon_site/requirements.txt	2016-03-30 08:22:06 +0000
@@ -1,3 +1,4 @@
+aldryn-newsblog==1.2.1
 Django==1.7.1
 Django-Select2==4.3.1
 Pillow==2.9.0

=== modified file 'ubucon_site/settings/__init__.py'
--- ubucon_site/settings/__init__.py	2015-12-10 16:25:19 +0000
+++ ubucon_site/settings/__init__.py	2016-03-30 08:22:06 +0000
@@ -82,6 +82,7 @@
 
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
+    'aldryn_boilerplates.template_loaders.AppDirectoriesLoader',
     'django.template.loaders.app_directories.Loader',
     'django.template.loaders.eggs.Loader'
 )
@@ -97,7 +98,9 @@
     'django.core.context_processors.tz',
     'sekizai.context_processors.sekizai',
     'django.core.context_processors.static',
-    'cms.context_processors.cms_settings'
+    'cms.context_processors.cms_settings',
+    # For Aldryn
+    'aldryn_boilerplates.context_processors.boilerplate',
 )
 
 TEMPLATE_DIRS = (
@@ -154,6 +157,21 @@
     'djangocms_teaser',
     'djangocms_video',
 
+    # Required for aldryn news blog:
+    'aldryn_apphooks_config',
+    'aldryn_boilerplates',
+    'aldryn_categories',
+    'aldryn_common',
+    'aldryn_newsblog',
+    'aldryn_people',
+    'aldryn_reversion',
+    'aldryn_translation_tools',
+    'easy_thumbnails',
+    'filer',
+    'parler',
+    'sortedm2m',
+    'taggit',
+
     'ubucon_site'
 )
 
@@ -254,3 +272,20 @@
 # Allow iframes in ckeditor
 TEXT_ADDITIONAL_TAGS = ('iframe',)
 TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
+
+# Settings for Aldryn
+THUMBNAIL_PROCESSORS = (
+    'easy_thumbnails.processors.colorspace',
+    'easy_thumbnails.processors.autocrop',
+    # 'easy_thumbnails.processors.scale_and_crop',
+    'filer.thumbnail_processors.scale_and_crop_with_subject_location',
+    'easy_thumbnails.processors.filters',
+    'easy_thumbnails.processors.background',
+)
+
+STATICFILES_FINDERS = [
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    # important! place right before django.contrib.staticfiles.finders.AppDirectoriesFinder
+    'aldryn_boilerplates.staticfile_finders.AppDirectoriesFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+]