Link catalogue to documents.

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

diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py
index 71bc998..8b7b9c4 100644 (file)
--- a/src/redakcja/settings/__init__.py
+++ b/src/redakcja/settings/__init__.py
@@ -1,9 +1,14 @@
+# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import os.path
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 from .defaults import *
 from ..localsettings import *
 
 import os.path
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 from .defaults import *
 from ..localsettings import *
 

+DATA_UPLOAD_MAX_MEMORY_SIZE = 20000000
+

 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 
 STATICFILES_DIRS = [
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 
 STATICFILES_DIRS = [


@@ -25,6 +30,7 @@ TEMPLATES = [
                 "redakcja.context_processors.settings", # this is instead of media
                 'django.template.context_processors.csrf',
                 "django.template.context_processors.request",
                 "redakcja.context_processors.settings", # this is instead of media
                 'django.template.context_processors.csrf',
                 "django.template.context_processors.request",

+                "django.contrib.messages.context_processors.messages",

             ],
         },
     },
             ],
         },
     },


@@ -37,8 +43,14 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'django_cas_ng.middleware.CASMiddleware',
+    ]
+
+if CAS_SERVER_URL:
+    MIDDLEWARE.append(
+        'django_cas_ng.middleware.CASMiddleware',
+    )

 
 

+MIDDLEWARE += [

     'django.contrib.admindocs.middleware.XViewMiddleware',
     'fnp_django_pagination.middleware.PaginationMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.contrib.admindocs.middleware.XViewMiddleware',
     'fnp_django_pagination.middleware.PaginationMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',


@@ -49,10 +61,11 @@ if DEBUG:
         'debug_toolbar.middleware.DebugToolbarMiddleware',
     ] + MIDDLEWARE
 
         'debug_toolbar.middleware.DebugToolbarMiddleware',
     ] + MIDDLEWARE
 

-AUTHENTICATION_BACKENDS = (
-    'django.contrib.auth.backends.ModelBackend',
-    'django_cas_ng.backends.CASBackend',
-)
+if CAS_SERVER_URL:
+    AUTHENTICATION_BACKENDS = (
+        'django.contrib.auth.backends.ModelBackend',
+        'django_cas_ng.backends.CASBackend',
+    )

 
 ROOT_URLCONF = 'redakcja.urls'
 
 
 ROOT_URLCONF = 'redakcja.urls'
 


@@ -73,8 +86,10 @@ INSTALLED_APPS = (
     'pipeline',
     'fnpdjango',
     'django_cas_ng',
     'pipeline',
     'fnpdjango',
     'django_cas_ng',

+    'bootstrap4',

 
     'catalogue',
 
     'catalogue',

+    'documents',

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


@@ -102,6 +117,9 @@ STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
 PIPELINE = {
     'CSS_COMPRESSOR': None,
     'JS_COMPRESSOR': None,
 PIPELINE = {
     'CSS_COMPRESSOR': None,
     'JS_COMPRESSOR': None,

+    'COMPILERS': (
+        'libsasscompiler.LibSassCompiler',
+    ),

 
     # CSS and JS files to compress
     'STYLESHEETS': {
 
     # CSS and JS files to compress
     'STYLESHEETS': {


@@ -113,19 +131,21 @@ PIPELINE = {
                 'css/history.css',
                 'css/summary.css',
                 'css/html.css',
                 'css/history.css',
                 'css/summary.css',
                 'css/html.css',

-                'css/jquery.autocomplete.css',

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

+
+                'wiki/scss/splitter.scss',
+                'wiki/scss/visual.scss'

             ),
             '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',
-         },
-         'book': {
+            'output_filename': 'compressed/documents_styles.css',
+        },
+        'book': {

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


@@ -133,7 +153,6 @@ PIPELINE = {
         },
         'book_list': {
             'source_filenames': (
         },
         'book_list': {
             'source_filenames': (

-                'contextmenu/jquery.contextMenu.css',

                 'css/book_list.css',
             ),
             'output_filename': 'compressed/book_list.css',
                 'css/book_list.css',
             ),
             'output_filename': 'compressed/book_list.css',


@@ -144,7 +163,6 @@ PIPELINE = {
         'detail': {
             'source_filenames': (
                 # libraries
         'detail': {
             'source_filenames': (
                 # libraries

-                'js/lib/jquery/jquery.autocomplete.js',

                 'js/lib/jquery/jquery.blockui.js',
                 'js/lib/jquery/jquery.elastic.js',
                 'js/lib/jquery/jquery.xmlns.js',
                 'js/lib/jquery/jquery.blockui.js',
                 'js/lib/jquery/jquery.elastic.js',
                 'js/lib/jquery/jquery.xmlns.js',


@@ -153,10 +171,12 @@ PIPELINE = {
 
                 # wiki scripts
                 'js/wiki/wikiapi.js',
 
                 # wiki scripts
                 'js/wiki/wikiapi.js',

+                'wiki/js/themes.js',

                 'js/wiki/xslt.js',
 
                 # base UI
                 'js/wiki/base.js',
                 'js/wiki/xslt.js',
 
                 # base UI
                 'js/wiki/base.js',

+                'wiki/js/sidebar-perspective.js',

                 'js/wiki/toolbar.js',
 
                 # dialogs
                 'js/wiki/toolbar.js',
 
                 # dialogs


@@ -175,12 +195,10 @@ PIPELINE = {
                 'js/wiki/view_column_diff.js',
             ),
             'output_filename': 'compressed/detail_scripts.js',
                 'js/wiki/view_column_diff.js',
             ),
             'output_filename': 'compressed/detail_scripts.js',

-         },
+        },

         'wiki_img': {
             'source_filenames': (
                 # libraries
         'wiki_img': {
             'source_filenames': (
                 # libraries

-                'js/lib/jquery-1.4.2.min.js',
-                'js/lib/jquery/jquery.autocomplete.js',

                 'js/lib/jquery/jquery.blockui.js',
                 'js/lib/jquery/jquery.elastic.js',
                 'js/lib/jquery/jquery.imgareaselect.js',
                 'js/lib/jquery/jquery.blockui.js',
                 'js/lib/jquery/jquery.elastic.js',
                 'js/lib/jquery/jquery.imgareaselect.js',


@@ -189,6 +207,7 @@ PIPELINE = {
 
                 # wiki scripts
                 'js/wiki_img/wikiapi.js',
 
                 # wiki scripts
                 'js/wiki_img/wikiapi.js',

+                'wiki/js/themes.js',

 
                 # base UI
                 'js/wiki_img/base.js',
 
                 # base UI
                 'js/wiki_img/base.js',


@@ -207,17 +226,18 @@ PIPELINE = {
                 'js/wiki/view_column_diff.js',
             ),
             'output_filename': 'compressed/detail_img_scripts.js',
                 'js/wiki/view_column_diff.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',
-         },
-         'book': {
+            'output_filename': 'compressed/documents_scripts.js',
+        },
+        'book': {

             'source_filenames': (
             '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',


@@ -227,9 +247,7 @@ PIPELINE = {
         },
         'book_list': {
             'source_filenames': (
         },
         'book_list': {
             'source_filenames': (

-                'contextmenu/jquery.ui.position.js',
-                'contextmenu/jquery.contextMenu.js',
-                'js/catalogue/book_list.js',
+                'js/documents/book_list.js',

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


@@ -237,6 +255,9 @@ PIPELINE = {
 }
 
 
 }
 
 

+SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
+
+

 try:
     SENTRY_DSN
 except NameError:
 try:
     SENTRY_DSN
 except NameError:


@@ -246,4 +267,3 @@ else:
         dsn=SENTRY_DSN,
         integrations=[DjangoIntegration()]
     )
         dsn=SENTRY_DSN,
         integrations=[DjangoIntegration()]
     )

-