Made MEDIA_URL relative to application URL.

[wolnelektury.git] / settings.py

diff --git a/settings.py b/settings.py
index 83505ea..04b5fd5 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-

 # Django settings for wolnelektury project.
 from os import path
 
 # Django settings for wolnelektury project.
 from os import path
 


@@ -43,12 +44,12 @@ MEDIA_ROOT = PROJECT_DIR + '/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/"
 # 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 = 'http://localhost:8000/pliki/'
+MEDIA_URL = '/media/'

 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".

-ADMIN_MEDIA_PREFIX = '/media/'
+ADMIN_MEDIA_PREFIX = '/admin-media/'

 
 # Make this unique, and don't share it with anybody.
 
 
 # Make this unique, and don't share it with anybody.
 


@@ -88,7 +89,7 @@ TEMPLATE_DIRS = (
 # CSS and JS files to compress
 COMPRESS_CSS = {
     'all': {
 # CSS and JS files to compress
 COMPRESS_CSS = {
     'all': {

-        'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css',),
+        'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/master.plain.css',),

         'output_filename': 'css/all.min.css',
     }
 }
         'output_filename': 'css/all.min.css',
     }
 }


@@ -96,7 +97,7 @@ COMPRESS_CSS = {
 COMPRESS_JS = {
     'all': {
         'source_filenames': ('js/jquery.js', 'js/jquery.autocolumn.js', 'js/jquery.autocomplete.js', 
 COMPRESS_JS = {
     'all': {
         'source_filenames': ('js/jquery.js', 'js/jquery.autocolumn.js', 'js/jquery.autocomplete.js', 

-            'js/jquery.form.js', 'js/jquery.jqmodal.js', 'js/jquery.labelify.js',),
+            'js/jquery.form.js', 'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',),

         'output_filename': 'js/all.min.js',
     }
 }
         'output_filename': 'js/all.min.js',
     }
 }