X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/db833ba4517084f61a64907c6d15606e7c881edd..b49dd31cdbff70d595284d7f8591d2b85e7281a8:/wolnelektury/settings.py?ds=sidebyside diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index 2b9d542d0..fcecc1a54 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -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. @@ -96,12 +98,13 @@ INSTALLED_APPS = [ # external 'south', - 'djangosphinx', + 'sponsors', 'newtagging', 'pagination', 'chunks', 'compress', 'catalogue', + 'lessons', ] CACHE_BACKEND = 'locmem:///?max_entries=3000' @@ -109,7 +112,7 @@ 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',), + 'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/master.plain.css', 'css/sponsors.css',), 'output_filename': 'css/all.min.css', }, 'book': { @@ -136,9 +139,6 @@ COMPRESS_JS = { COMPRESS_CSS_FILTERS = None -SPHINX_SERVER = 'localhost' -SPHINX_PORT = 3312 - # Load localsettings, if they exist try: