diff --git a/mamweb/settings.py b/mamweb/settings.py index 70dcaddd..2f4e1e0a 100644 --- a/mamweb/settings.py +++ b/mamweb/settings.py @@ -62,6 +62,10 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.6/howto/static-files/ +MEDIA_TREE_MEDIA_BACKENDS = ( + 'media_tree.contrib.media_backends.easy_thumbnails.EasyThumbnailsBackend', +) + STATIC_URL = '/static/' MEDIA_URL = '/media/' MEDIA_ROOT = os.path.join(BASE_DIR, 'media') @@ -72,6 +76,12 @@ STATICFILES_DIRS = ( ) SITE_ID = 1 +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'django.contrib.staticfiles.finders.FileSystemFinder', +) + + TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', @@ -112,7 +122,10 @@ TEMPLATE_DIRS = ( ) INSTALLED_APPS = ( - 'djangocms_admin_style', +# 'grappelli', +# 'djangocms_admin_style', +# 'suit', + 'djangocms_text_ckeditor', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -127,16 +140,37 @@ INSTALLED_APPS = ( 'menus', 'south', 'sekizai', - 'djangocms_style', - 'djangocms_column', - 'djangocms_file', - 'djangocms_flash', - 'djangocms_googlemap', - 'djangocms_inherit', - 'djangocms_link', - 'djangocms_picture', - 'djangocms_teaser', - 'djangocms_video', + +# 'filer', +# 'easy_thumbnails', + +# 'media_tree', +# 'media_tree.contrib.cms_plugins', +# 'media_tree.contrib.cms_plugins.media_tree_listing', +# 'media_tree.contrib.cms_plugins.media_tree_image', +# 'media_tree.contrib.cms_plugins.media_tree_slideshow', +# 'media_tree.contrib.cms_plugins.media_tree_gallery', +# 'media_tree.contrib.media_extensions.images.focal_point', +# 'media_tree.contrib.media_extensions.zipfiles', + + +# 'cmsplugin_filer_file', +# 'cmsplugin_filer_folder', +# 'cmsplugin_filer_link', +# 'cmsplugin_filer_image', +# 'cmsplugin_filer_teaser', +# 'cmsplugin_filer_video', + +# 'djangocms_style', +# 'djangocms_column', +# 'djangocms_file', +# 'djangocms_flash', +# 'djangocms_googlemap', +# 'djangocms_inherit', +# 'djangocms_link', +# 'djangocms_picture', +# 'djangocms_teaser', +# 'djangocms_video', 'reversion', 'mamweb' ) @@ -189,4 +223,6 @@ DATABASES = { SOUTH_MIGRATION_MODULES = { 'reversion': 'reversion.south_migrations', + 'easy_thumbnails': 'easy_thumbnails.south_migrations', + } diff --git a/mamweb/urls.py b/mamweb/urls.py index d0208476..dd274c6c 100644 --- a/mamweb/urls.py +++ b/mamweb/urls.py @@ -8,9 +8,8 @@ from cms.sitemaps import CMSSitemap admin.autodiscover() urlpatterns = i18n_patterns('', + url(r'^admin/', include(admin.site.urls)), # NOQA - url(r'^sitemap\.xml$', 'django.contrib.sitemaps.views.sitemap', - {'sitemaps': {'cmspages': CMSSitemap}}), url(r'^', include('cms.urls')), )