Changed WSGI script.

[redakcja.git] / platforma / settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
index 0290dd8..90ecd27 100644 (file)
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -84,7 +84,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django_cas.middleware.CASMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django_cas.middleware.CASMiddleware',
 

-    'django.middleware.doc.XViewMiddleware',    
+    'django.middleware.doc.XViewMiddleware',

     'maintenancemode.middleware.MaintenanceModeMiddleware',
     # 'debug_toolbar.middleware.DebugToolbarMiddleware' #
 )
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     # 'debug_toolbar.middleware.DebugToolbarMiddleware' #
 )


@@ -104,7 +104,7 @@ TEMPLATE_DIRS = (
 #
 # Central Auth System
 #
 #
 # Central Auth System
 #

-## Set this to where the CAS server lives 
+## Set this to where the CAS server lives

 # CAS_SERVER_URL = "http://cas.fnp.pl/
 CAS_ADMIN_PREFIX = "/admin/"
 CAS_LOGOUT_COMPLETELY = True
 # CAS_SERVER_URL = "http://cas.fnp.pl/
 CAS_ADMIN_PREFIX = "/admin/"
 CAS_LOGOUT_COMPLETELY = True


@@ -114,10 +114,10 @@ COMPRESS_CSS = {
     'detail': {
          'source_filenames': (
             'css/master.css',
     'detail': {
          'source_filenames': (
             'css/master.css',

-            'css/gallery.css',  
-            'css/history.css', 
+            'css/gallery.css',
+            'css/history.css',

             'css/summary.css',
             'css/summary.css',

-            'css/html.css',             
+            'css/html.css',

             'css/jquery.autocomplete.css',
             'css/dialogs.css',
         ),
             'css/jquery.autocomplete.css',
             'css/dialogs.css',
         ),


@@ -125,45 +125,53 @@ COMPRESS_CSS = {
     },
     'listing': {
         'source_filenames': (
     },
     'listing': {
         'source_filenames': (

-            'css/filelist.css', 
-        ),             
+            'css/filelist.css',
+        ),

         'output_filename': 'compressed/listing_styles_?.css',
      }
 }
         'output_filename': 'compressed/listing_styles_?.css',
      }
 }

- 
+

 COMPRESS_JS = {
 COMPRESS_JS = {

-    # everything except codemirror and jquery (which we take from google)
+    # everything except codemirror

     'detail': {
         'source_filenames': (
     'detail': {
         'source_filenames': (

-                #'js/jquery-1.4.2.min.js', 
-                'js/jquery.autocomplete.js', 
+                'js/jquery-1.4.2.min.js',
+                'js/jquery.autocomplete.js',

                 'js/jquery.blockui.js',
                 'js/jquery.elastic.js',
                 'js/button_scripts.js',
                 'js/slugify.js',
                 'js/jquery.blockui.js',
                 'js/jquery.elastic.js',
                 'js/button_scripts.js',
                 'js/slugify.js',

-                
+

                 # wiki scripts
                 'js/wiki/wikiapi.js',
                 'js/wiki/base.js',
                 'js/wiki/xslt.js',
                 # wiki scripts
                 'js/wiki/wikiapi.js',
                 'js/wiki/base.js',
                 'js/wiki/xslt.js',

+
+                # dialogs
+                'js/wiki/save_dialog.js',
+
+                # views

                 'js/wiki/history_view.js',
                 'js/wiki/summary_view.js',
                 'js/wiki/source_editor.js',
                 'js/wiki/wysiwyg_editor.js',
                 'js/wiki/history_view.js',
                 'js/wiki/summary_view.js',
                 'js/wiki/source_editor.js',
                 'js/wiki/wysiwyg_editor.js',

-                'js/wiki/scan_gallery.js',                
+                'js/wiki/scan_gallery.js',
+                'js/wiki/diff_view.js',
+
+                # bootstrap

                 'js/wiki/main.js',
                 'js/wiki/main.js',

-        ),             
+        ),

         'output_filename': 'compressed/detail_scripts_?.js',
      },
     'listing': {
         'source_filenames': (
         'output_filename': 'compressed/detail_scripts_?.js',
      },
     'listing': {
         'source_filenames': (

-                # 'js/jquery-1.4.2.min.js', 
-                'js/slugify.js',                
-        ),             
+                'js/jquery-1.4.2.min.js',
+                'js/slugify.js',
+        ),

         'output_filename': 'compressed/listing_scripts_?.js',
      }
 }
         'output_filename': 'compressed/listing_scripts_?.js',
      }
 }

- 
+

 COMPRESS = True
 COMPRESS_CSS_FILTERS = None
 COMPRESS_JS_FILTERS = None
 COMPRESS = True
 COMPRESS_CSS_FILTERS = None
 COMPRESS_JS_FILTERS = None


@@ -182,13 +190,13 @@ INSTALLED_APPS = (
 
     'django_nose',
     'debug_toolbar',
 
     'django_nose',
     'debug_toolbar',

-    
+

     'compress',
     'south',
     'sorl.thumbnail',
     'filebrowser',
 
     'compress',
     'south',
     'sorl.thumbnail',
     'filebrowser',
 

-    'wiki',    
+    'wiki',

     'toolbar',
 )
 
     'toolbar',
 )
 


@@ -204,7 +212,7 @@ NOSE_ARGS = (
     '--cover-package=' + ','.join(TEST_MODULES),
     '-d',
     '--with-coverage',
     '--cover-package=' + ','.join(TEST_MODULES),
     '-d',
     '--with-coverage',

-    '--with-doctest'
+    '--with-doctest',

 )
 
 
 )
 
 


@@ -224,14 +232,14 @@ except ImportError:
     pass
 
 try:
     pass
 
 try:

-    LOGGING_CONFIG_FILE 
+    LOGGING_CONFIG_FILE

 except NameError:
 except NameError:

-    LOGGING_CONFIG_FILE = os.path.join(PROJECT_ROOT, 'config', 
+    LOGGING_CONFIG_FILE = os.path.join(PROJECT_ROOT, 'config',

                                 ('logging.cfg' if not DEBUG else 'logging.cfg.dev'))
 try:
     import logging
     import logging.config
                                 ('logging.cfg' if not DEBUG else 'logging.cfg.dev'))
 try:
     import logging
     import logging.config

-    
-    logging.config.fileConfig(LOGGING_CONFIG_FILE)    
+
+    logging.config.fileConfig(LOGGING_CONFIG_FILE)

 except ImportError, exc:
 except ImportError, exc:

-    raise
\ No newline at end of file
+    raise