X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/03c5ba6e50339d7bc470eb6d7f051483eff1e96b..f499ee9347f539c36f3846fdc41020f2320bae77:/platforma/settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
index 5485b305..88141489 100644
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -86,7 +86,7 @@ MIDDLEWARE_CLASSES = (
 
     'django.middleware.doc.XViewMiddleware',    
     'maintenancemode.middleware.MaintenanceModeMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware'
+    # 'debug_toolbar.middleware.DebugToolbarMiddleware' #
 )
 
 AUTHENTICATION_BACKENDS = (
@@ -114,9 +114,12 @@ COMPRESS_CSS = {
     'detail': {
          'source_filenames': (
             'css/master.css',
+            'css/gallery.css',  
             'css/history.css', 
+            'css/summary.css',
             'css/html.css',             
             'css/jquery.autocomplete.css',
+            'css/dialogs.css',
         ),
         'output_filename': 'compressed/detail_styles_?.css',
     },
@@ -129,13 +132,13 @@ COMPRESS_CSS = {
 }
  
 COMPRESS_JS = {
-    # everything except codemirror and jquery (which we take from google)
+    # everything except codemirror
     'detail': {
         'source_filenames': (
-                #'js/jquery-1.4.2.min.js', 
+                'js/jquery-1.4.2.min.js', 
                 'js/jquery.autocomplete.js', 
                 'js/jquery.blockui.js',
-                'js/jquery.elastic.js',
+                'js/jquery.elastic.js',                
                 'js/button_scripts.js',
                 'js/slugify.js',
                 
@@ -143,16 +146,26 @@ COMPRESS_JS = {
                 'js/wiki/wikiapi.js',
                 'js/wiki/base.js',
                 'js/wiki/xslt.js',
-                'js/wiki/history.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/wysiwyg_editor.js',
+                'js/wiki/scan_gallery.js',                
+                'js/wiki/diff_view.js',
+                
+                # bootstrap
                 'js/wiki/main.js',
         ),             
         'output_filename': 'compressed/detail_scripts_?.js',
      },
     'listing': {
         'source_filenames': (
-                # 'js/jquery-1.4.2.min.js', 
+                'js/jquery-1.4.2.min.js', 
                 'js/slugify.js',                
         ),             
         'output_filename': 'compressed/listing_scripts_?.js',
@@ -212,17 +225,6 @@ FILEBROWSER_DEFAULT_ORDER = "path_relative"
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 IMAGE_DIR = 'images'
 
-# Python logging settings
-import logging
-
-log = logging.getLogger('platforma')
-log.setLevel(logging.DEBUG)
-ch = logging.StreamHandler()
-ch.setLevel(logging.DEBUG)
-formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-ch.setFormatter(formatter)
-log.addHandler(ch)
-
 # Import localsettings file, which may override settings defined here
 try:
     from localsettings import *
@@ -232,16 +234,12 @@ except ImportError:
 try:
     LOGGING_CONFIG_FILE 
 except NameError:
-    LOGGING_CONFIG_FILE = os.path.join(PROJECT_ROOT, 
+    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.config.fileConfig(LOGGING_CONFIG_FILE)    
 except ImportError, exc:
-    import traceback
-    traceback.print_exc()
-    raise
-
+    raise
\ No newline at end of file