X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/c48ff2d3e64065793c24cfb8ae151f02b8e6646a..c4426f18fdb50c224e8a5211a1766dcf261eaff8:/src/redakcja/settings/__init__.py diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py index c8a4a828..8b7b9c4b 100644 --- a/src/redakcja/settings/__init__.py +++ b/src/redakcja/settings/__init__.py @@ -7,6 +7,8 @@ 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 = [ @@ -41,8 +43,14 @@ MIDDLEWARE = [ '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', @@ -53,10 +61,11 @@ if DEBUG: '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' @@ -77,8 +86,10 @@ INSTALLED_APPS = ( 'pipeline', 'fnpdjango', 'django_cas_ng', + 'bootstrap4', 'catalogue', + 'documents', 'cover', 'dvcs', 'wiki', @@ -106,6 +117,9 @@ STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' PIPELINE = { 'CSS_COMPRESSOR': None, 'JS_COMPRESSOR': None, + 'COMPILERS': ( + 'libsasscompiler.LibSassCompiler', + ), # CSS and JS files to compress 'STYLESHEETS': { @@ -117,17 +131,19 @@ PIPELINE = { 'css/history.css', 'css/summary.css', 'css/html.css', - 'css/jquery.autocomplete.css', 'css/imgareaselect-default.css', 'css/dialogs.css', + + 'wiki/scss/splitter.scss', + 'wiki/scss/visual.scss' ), 'output_filename': 'compressed/detail_styles.css', }, - 'catalogue': { + 'documents': { 'source_filenames': ( 'css/filelist.css', ), - 'output_filename': 'compressed/catalogue_styles.css', + 'output_filename': 'compressed/documents_styles.css', }, 'book': { 'source_filenames': ( @@ -137,7 +153,6 @@ PIPELINE = { }, 'book_list': { 'source_filenames': ( - 'contextmenu/jquery.contextMenu.css', 'css/book_list.css', ), 'output_filename': 'compressed/book_list.css', @@ -148,7 +163,6 @@ PIPELINE = { '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', @@ -157,10 +171,12 @@ PIPELINE = { # wiki scripts 'js/wiki/wikiapi.js', + 'wiki/js/themes.js', 'js/wiki/xslt.js', # base UI 'js/wiki/base.js', + 'wiki/js/sidebar-perspective.js', 'js/wiki/toolbar.js', # dialogs @@ -183,8 +199,6 @@ PIPELINE = { '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', @@ -193,6 +207,7 @@ PIPELINE = { # wiki scripts 'js/wiki_img/wikiapi.js', + 'wiki/js/themes.js', # base UI 'js/wiki_img/base.js', @@ -212,16 +227,17 @@ PIPELINE = { ), 'output_filename': 'compressed/detail_img_scripts.js', }, - 'catalogue': { + 'documents': { 'source_filenames': ( - 'js/catalogue/catalogue.js', + 'js/documents/documents.js', 'js/slugify.js', 'email_mangler/email_mangler.js', ), - 'output_filename': 'compressed/catalogue_scripts.js', + 'output_filename': 'compressed/documents_scripts.js', }, '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', @@ -231,9 +247,7 @@ PIPELINE = { }, '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', } @@ -241,6 +255,9 @@ PIPELINE = { } +SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' + + try: SENTRY_DSN except NameError: