validate username (email) at registration

[redakcja.git] / redakcja / settings / compress.py

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 43150e4..decfa16 100644 (file)
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -1,7 +1,25 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of MIL/PEER, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+
+STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+PIPELINE_CSS_COMPRESSOR = None
+PIPELINE_JS_COMPRESSOR = None
+PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'
+
+

 # CSS and JS files to compress
 # CSS and JS files to compress

-COMPRESS_CSS = {
+PIPELINE_CSS = {

     'detail': {
     'detail': {

-         'source_filenames': (
+        'source_filenames': (

             'css/master.css',
             'css/toolbar.css',
             'css/gallery.css',
             'css/master.css',
             'css/toolbar.css',
             'css/gallery.css',


@@ -11,30 +29,32 @@ COMPRESS_CSS = {
             'css/jquery.autocomplete.css',
             'css/dialogs.css',
         ),
             'css/jquery.autocomplete.css',
             'css/dialogs.css',
         ),

-        'output_filename': 'compressed/detail_styles_?.css',
+        'output_filename': 'compressed/detail_styles.css',

     },
     'catalogue': {
         'source_filenames': (
     },
     'catalogue': {
         'source_filenames': (

-            'css/filelist.css',
+            # 'css/filelist.css',
+            'css/base.css',
+            'datepicker/css/datepicker.css',

         ),
         ),

-        'output_filename': 'compressed/catalogue_styles_?.css',
-     },
-     'book': {
+        'output_filename': 'compressed/catalogue_styles.css',
+    },
+    'book': {

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

-        'output_filename': 'compressed/book_?.css',         
+        'output_filename': 'compressed/book.css',

     },
     'book_list': {
         'source_filenames': (
             'contextmenu/jquery.contextMenu.css',
             'css/book_list.css',
         ),
     },
     'book_list': {
         'source_filenames': (
             'contextmenu/jquery.contextMenu.css',
             'css/book_list.css',
         ),

-        'output_filename': 'compressed/book_list_?.css',
+        'output_filename': 'compressed/book_list.css',

     },
 }
 
     },
 }
 

-COMPRESS_JS = {
+PIPELINE_JS = {

     # everything except codemirror
     'detail': {
         'source_filenames': (
     # everything except codemirror
     'detail': {
         'source_filenames': (


@@ -69,24 +89,25 @@ COMPRESS_JS = {
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
         ),
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
         ),

-        'output_filename': 'compressed/detail_scripts_?.js',
+        'output_filename': 'compressed/detail_scripts.js',

      },
     'catalogue': {
         'source_filenames': (
                 'js/catalogue/catalogue.js',
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
      },
     'catalogue': {
         'source_filenames': (
                 'js/catalogue/catalogue.js',
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',

+                'datepicker/js/bootstrap-datepicker.js',

         ),
         ),

-        'output_filename': 'compressed/catalogue_scripts_?.js',
-     },
-     'book': {
+        'output_filename': 'compressed/catalogue_scripts.js',
+    },
+    'book': {

         'source_filenames': (
             'js/book_text/jquery.eventdelegation.js',
             'js/book_text/jquery.scrollto.js',
             'js/book_text/jquery.highlightfade.js',
             'js/book_text/book.js',
         ),
         'source_filenames': (
             'js/book_text/jquery.eventdelegation.js',
             'js/book_text/jquery.scrollto.js',
             'js/book_text/jquery.highlightfade.js',
             'js/book_text/book.js',
         ),

-        'output_filename': 'compressed/book_?.js',
+        'output_filename': 'compressed/book.js',

          },
     'book_list': {
         'source_filenames': (
          },
     'book_list': {
         'source_filenames': (


@@ -94,13 +115,6 @@ COMPRESS_JS = {
             'contextmenu/jquery.contextMenu.js',
             'js/catalogue/book_list.js',
         ),
             'contextmenu/jquery.contextMenu.js',
             'js/catalogue/book_list.js',
         ),

-        'output_filename': 'compressed/book_list_?.js',
+        'output_filename': 'compressed/book_list.js',

     }
 }
     }
 }

-
-COMPRESS = True
-COMPRESS_CSS_FILTERS = None
-COMPRESS_JS_FILTERS = None
-COMPRESS_AUTO = True
-COMPRESS_VERSION = True
-COMPRESS_VERSIONING = 'compress.versioning.hash.MD5Versioning'