X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b9b13c455b4c7c5254499b92e40484abc3dfc4d7..57b7dbdead87b83ebc630a1ea70b9ada08599f5b:/wolnelektury/settings.py diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index de4b2cc1f..33c219843 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -3,7 +3,7 @@ from os import path PROJECT_DIR = path.abspath(path.dirname(__file__)) -DEBUG = False +DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = [ @@ -38,12 +38,14 @@ USE_I18N = True # Absolute path to the directory that holds media. # Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = path.join(PROJECT_DIR, 'media') +MEDIA_ROOT = path.join(PROJECT_DIR, '../media') +STATIC_ROOT = path.join(PROJECT_DIR, 'static') # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash if there is a path component (optional in other cases). # Examples: "http://media.lawrence.com", "http://example.com/media/" MEDIA_URL = '/media/' +STATIC_URL = '/static/' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. @@ -65,6 +67,7 @@ TEMPLATE_CONTEXT_PROCESSORS = [ 'django.core.context_processors.i18n', 'django.core.context_processors.media', 'django.core.context_processors.request', + 'wolnelektury.context_processors.extra_settings', ] MIDDLEWARE_CLASSES = [ @@ -73,9 +76,10 @@ MIDDLEWARE_CLASSES = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.middleware.doc.XViewMiddleware', 'pagination.middleware.PaginationMiddleware', + 'django.middleware.locale.LocaleMiddleware', ] -ROOT_URLCONF = 'urls' +ROOT_URLCONF = 'wolnelektury.urls' TEMPLATE_DIRS = [ path.join(PROJECT_DIR, 'templates'), @@ -93,13 +97,19 @@ INSTALLED_APPS = [ 'django.contrib.sites', 'django.contrib.admin', 'django.contrib.admindocs', - + # external + 'south', + 'sorl.thumbnail', + 'sponsors', 'newtagging', 'pagination', 'chunks', 'compress', 'catalogue', + 'lessons', + 'piston', + 'api', ] CACHE_BACKEND = 'locmem:///?max_entries=3000' @@ -107,12 +117,12 @@ CACHE_BACKEND = 'locmem:///?max_entries=3000' # CSS and JavaScript file groups COMPRESS_CSS = { 'all': { - 'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/master.plain.css',), - 'output_filename': 'css/all.min.css', + 'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/jquery.countdown.css', 'css/master.plain.css', 'css/sponsors.css',), + 'output_filename': 'css/all.min?.css', }, 'book': { 'source_filenames': ('css/master.book.css',), - 'output_filename': 'css/book.min.css', + 'output_filename': 'css/book.min?.css', } } @@ -122,18 +132,33 @@ COMPRESS_JS = { 'output_filename': 'js/jquery.min.js', }, 'all': { - 'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js', - 'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',), - 'output_filename': 'js/all.min.js', + 'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js', + 'js/jquery.countdown.js', 'js/jquery.countdown-pl.js', + 'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js', + 'js/jquery.cookie.js',), + 'output_filename': 'js/all?.min.js', }, 'book': { 'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',), - 'output_filename': 'js/book.min.js', + 'output_filename': 'js/book?.min.js', } } +COMPRESS_VERSION = True COMPRESS_CSS_FILTERS = None +THUMBNAIL_QUALITY = 95 +THUMBNAIL_EXTENSION = 'png' + +THUMBNAIL_PROCESSORS = ( + # Default processors + 'sorl.thumbnail.processors.colorspace', + 'sorl.thumbnail.processors.autocrop', + 'sorl.thumbnail.processors.scale_and_crop', + 'sorl.thumbnail.processors.filters', + # Custom processors + 'sponsors.processors.add_padding', +) # Load localsettings, if they exist try: