Picture form + test

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 0692cc7..40b45be 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -110,7 +110,7 @@ TEMPLATE_DIRS = [
     path.join(PROJECT_DIR, 'templates'),
 ]
 
     path.join(PROJECT_DIR, 'templates'),
 ]
 

-LOGIN_URL = '/uzytkownicy/login/'
+LOGIN_URL = '/uzytkownicy/zaloguj/'

 
 LOGIN_REDIRECT_URL = '/'
 
 
 LOGIN_REDIRECT_URL = '/'
 


@@ -137,6 +137,7 @@ INSTALLED_APPS = [
     'modeltranslation',
 
     # our
     'modeltranslation',
 
     # our

+    'ajaxable',

     'api',
     'catalogue',
     'chunks',
     'api',
     'catalogue',
     'chunks',


@@ -161,12 +162,16 @@ CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True
 # 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/jquery.countdown.css', 'css/master.plain.css', 'css/sponsors.css', 'css/facelist_2-0.css',),
+        #'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/master.plain.css', 'css/facelist_2-0.css',),

         'source_filenames': [
         'source_filenames': [

+            'css/jquery.countdown.css', 
+

             'css/base.css',
             'css/header.css',
             'css/main_page.css',
             'css/base.css',
             'css/header.css',
             'css/main_page.css',

+            'css/dialogs.css',

             'css/book_box.css',
             'css/book_box.css',

+            'css/sponsors.css',

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


@@ -181,23 +186,26 @@ COMPRESS_CSS = {
 }
 
 COMPRESS_JS = {
 }
 
 COMPRESS_JS = {

-    #~ 'jquery': {
-        #~ #'source_filenames': ('js/jquery.js',),
-        #~ 'source_filenames': [],
-        #~ 'output_filename': 'js/jquery.min.js',
-    #~ },
-    #~ 'all': {
-        #~ 'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js',
-            #~ 'js/jquery.countdown.js', 'js/jquery.countdown-pl.js',
-            #~ 'js/jquery.countdown-de.js', 'js/jquery.countdown-uk.js',
-            #~ 'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js',
-            #~ 'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js',
-            #~ 'js/jquery.cycle.min.js',
-            #~ 'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',
-            #~ ),
-        #~ 'source_filenames': [],
-        #~ 'output_filename': 'js/all?.min.js',
-    #~ },
+    'base': {
+        'source_filenames': (
+            'js/jquery.cycle.min.js',
+            'js/jquery.jqmodal.js',
+            'js/jquery.form.js',
+            'js/jquery.countdown.js', 'js/jquery.countdown-pl.js',
+            'js/jquery.countdown-de.js', 'js/jquery.countdown-uk.js',
+            'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js',
+            'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js',
+
+            'js/locale.js',
+            'js/dialogs.js',
+            'js/sponsors.js',
+            'js/pdcounter.js',
+
+            #~ 'js/jquery.autocomplete.js',
+            #~ 'js/jquery.labelify.js', 'js/catalogue.js',
+            ),
+        'output_filename': 'js/base?.min.js',
+    },

     #~ 'book': {
         #~ 'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
         #~ 'source_filenames': [],
     #~ 'book': {
         #~ 'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
         #~ 'source_filenames': [],