Fix annotations window.

[redakcja.git] / src / redakcja / settings / __init__.py

diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py
index dd18ae6..9bca263 100644 (file)
--- a/src/redakcja/settings/__init__.py
+++ b/src/redakcja/settings/__init__.py
@@ -76,6 +76,7 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.sites',

+    'admin_numeric_filter',

     'django.contrib.admin',
     'django.contrib.admindocs',
 
     'django.contrib.admin',
     'django.contrib.admindocs',
 


@@ -89,6 +90,7 @@ INSTALLED_APPS = (
     'bootstrap4',
 
     'catalogue',
     'bootstrap4',
 
     'catalogue',

+    'documents',

     'cover',
     'dvcs',
     'wiki',
     'cover',
     'dvcs',
     'wiki',


@@ -96,11 +98,16 @@ INSTALLED_APPS = (
     'toolbar',
     'apiclient',
     'email_mangler',
     'toolbar',
     'apiclient',
     'email_mangler',

+    'wlxml.apps.WlxmlConfig',

 )
 
 if DEBUG:
     INSTALLED_APPS += ('debug_toolbar',)
 
 )
 
 if DEBUG:
     INSTALLED_APPS += ('debug_toolbar',)
 

+LOCALE_PATHS = [
+    PROJECT_ROOT + "/locale-contrib",
+]
+

 LOGIN_REDIRECT_URL = '/documents/user'
 
 MIN_COVER_SIZE = (915, 1270)
 LOGIN_REDIRECT_URL = '/documents/user'
 
 MIN_COVER_SIZE = (915, 1270)


@@ -111,13 +118,13 @@ STATICFILES_FINDERS = (
     'pipeline.finders.PipelineFinder',
 )
 
     'pipeline.finders.PipelineFinder',
 )
 

-STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+STATICFILES_STORAGE = 'pipeline.storage.PipelineManifestStorage'

 
 PIPELINE = {
     'CSS_COMPRESSOR': None,
     'JS_COMPRESSOR': None,
     'COMPILERS': (
 
 PIPELINE = {
     'CSS_COMPRESSOR': None,
     'JS_COMPRESSOR': None,
     'COMPILERS': (

-        'libsasscompiler.LibSassCompiler',
+        'pipeline.compilers.sass.SASSCompiler',

     ),
 
     # CSS and JS files to compress
     ),
 
     # CSS and JS files to compress


@@ -129,7 +136,7 @@ PIPELINE = {
                 'css/gallery.css',
                 'css/history.css',
                 'css/summary.css',
                 'css/gallery.css',
                 'css/history.css',
                 'css/summary.css',

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

                 'css/imgareaselect-default.css',
                 'css/dialogs.css',
 
                 'css/imgareaselect-default.css',
                 'css/dialogs.css',
 


@@ -138,11 +145,11 @@ PIPELINE = {
             ),
             'output_filename': 'compressed/detail_styles.css',
         },
             ),
             'output_filename': 'compressed/detail_styles.css',
         },

-        'catalogue': {
+        'documents': {

             'source_filenames': (
                 'css/filelist.css',
             ),
             'source_filenames': (
                 'css/filelist.css',
             ),

-            'output_filename': 'compressed/catalogue_styles.css',
+            'output_filename': 'compressed/documents_styles.css',

         },
         'book': {
             'source_filenames': (
         },
         'book': {
             'source_filenames': (


@@ -169,6 +176,7 @@ PIPELINE = {
                 'js/slugify.js',
 
                 # wiki scripts
                 'js/slugify.js',
 
                 # wiki scripts

+                'js/wiki/caret.js',

                 'js/wiki/wikiapi.js',
                 'wiki/js/themes.js',
                 'js/wiki/xslt.js',
                 'js/wiki/wikiapi.js',
                 'wiki/js/themes.js',
                 'js/wiki/xslt.js',


@@ -190,6 +198,7 @@ PIPELINE = {
                 'js/wiki/view_editor_wysiwyg.js',
                 'js/wiki/view_gallery.js',
                 'js/wiki/view_annotations.js',
                 'js/wiki/view_editor_wysiwyg.js',
                 'js/wiki/view_gallery.js',
                 'js/wiki/view_annotations.js',

+                'js/wiki/view_properties.js',

                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
             ),
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
             ),


@@ -226,16 +235,17 @@ PIPELINE = {
             ),
             'output_filename': 'compressed/detail_img_scripts.js',
         },
             ),
             'output_filename': 'compressed/detail_img_scripts.js',
         },

-        'catalogue': {
+        'documents': {

             'source_filenames': (
             'source_filenames': (

-                'js/catalogue/catalogue.js',
+                'js/documents/documents.js',

                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
             ),
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
             ),

-            'output_filename': 'compressed/catalogue_scripts.js',
+            'output_filename': 'compressed/documents_scripts.js',

         },
         'book': {
             'source_filenames': (
         },
         'book': {
             'source_filenames': (

+                'js/lib/jquery/jquery.cycle2.min.js',

                 'js/book_text/jquery.eventdelegation.js',
                 'js/book_text/jquery.scrollto.js',
                 'js/book_text/jquery.highlightfade.js',
                 'js/book_text/jquery.eventdelegation.js',
                 'js/book_text/jquery.scrollto.js',
                 'js/book_text/jquery.highlightfade.js',


@@ -245,7 +255,7 @@ PIPELINE = {
         },
         'book_list': {
             'source_filenames': (
         },
         'book_list': {
             'source_filenames': (

-                'js/catalogue/book_list.js',
+                'js/documents/book_list.js',

             ),
             'output_filename': 'compressed/book_list.js',
         }
             ),
             'output_filename': 'compressed/book_list.js',
         }