fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes #4189: theme box fails when entering second theme.
[redakcja.git]
/
src
/
redakcja
/
settings
/
__init__.py
diff --git
a/src/redakcja/settings/__init__.py
b/src/redakcja/settings/__init__.py
index
dd18ae6
..
c7cf324
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',
@@
-101,6
+103,10
@@
INSTALLED_APPS = (
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)
@@
-138,11
+144,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': (
@@
-190,6
+196,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
+233,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
+253,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',
}