More cleanup, upgraded README.md

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 1e60e1d..6b7d333 100644 (file)
--- 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/"
 
 # 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/'
 
 # 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.
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.


@@ -95,11 +97,17 @@ INSTALLED_APPS = [
     'django.contrib.admindocs',
     
     # external
     'django.contrib.admindocs',
     
     # external

+    'south',
+    'sorl.thumbnail',
+    'sponsors',

     'newtagging',
     'pagination',
     'chunks',
     'compress',
     'catalogue',
     'newtagging',
     'pagination',
     'chunks',
     'compress',
     'catalogue',

+    'lessons',
+    'piston',
+    'api',

 ]
 
 CACHE_BACKEND = 'locmem:///?max_entries=3000'
 ]
 
 CACHE_BACKEND = 'locmem:///?max_entries=3000'


@@ -107,12 +115,12 @@ CACHE_BACKEND = 'locmem:///?max_entries=3000'
 # CSS and JavaScript file groups
 COMPRESS_CSS = {
     'all': {
 # 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/master.plain.css', 'css/sponsors.css',),
+        'output_filename': 'css/all.min?.css',

     },
     'book': {
         'source_filenames': ('css/master.book.css',),
     },
     'book': {
         'source_filenames': ('css/master.book.css',),

-        'output_filename': 'css/book.min.css',
+        'output_filename': 'css/book.min?.css',

     }
 }
 
     }
 }
 


@@ -123,17 +131,31 @@ COMPRESS_JS = {
     },
     'all': {
         'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.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',
+            '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',),
     },
     '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
 
 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:
 
 # Load localsettings, if they exist
 try: