fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'img-playground' of ssh://git.nowoczesnapolska.org.pl:2223/~/repo/redakc...
[redakcja.git]
/
redakcja
/
settings
/
compress.py
diff --git
a/redakcja/settings/compress.py
b/redakcja/settings/compress.py
index
714e4c2
..
ddd0aec
100644
(file)
--- a/
redakcja/settings/compress.py
+++ b/
redakcja/settings/compress.py
@@
-14,11
+14,11
@@
COMPRESS_CSS = {
),
'output_filename': 'compressed/detail_styles_?.css',
},
),
'output_filename': 'compressed/detail_styles_?.css',
},
- '
listing
': {
+ '
catalogue
': {
'source_filenames': (
'css/filelist.css',
),
'source_filenames': (
'css/filelist.css',
),
- 'output_filename': 'compressed/
listing
_styles_?.css',
+ 'output_filename': 'compressed/
catalogue
_styles_?.css',
}
}
}
}
@@
-27,10
+27,10
@@
COMPRESS_JS = {
'detail': {
'source_filenames': (
# libraries
'detail': {
'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.autocomplete.js',
'js/lib/jquery/jquery.blockui.js',
'js/lib/jquery/jquery.elastic.js',
+ 'js/lib/jquery/jquery.xmlns.js',
'js/button_scripts.js',
'js/slugify.js',
'js/button_scripts.js',
'js/slugify.js',
@@
-44,7
+44,8
@@
COMPRESS_JS = {
# dialogs
'js/wiki/dialog_save.js',
# dialogs
'js/wiki/dialog_save.js',
- 'js/wiki/dialog_addtag.js',
+ 'js/wiki/dialog_revert.js',
+ 'js/wiki/dialog_pubmark.js',
# views
'js/wiki/view_history.js',
# views
'js/wiki/view_history.js',
@@
-74,26
+75,29
@@
COMPRESS_JS = {
# base UI
'js/wiki_img/base.js',
# base UI
'js/wiki_img/base.js',
- 'js/wiki
_img
/toolbar.js',
+ 'js/wiki/toolbar.js',
# dialogs
# dialogs
- 'js/wiki_img/dialog_save.js',
- 'js/wiki_img/dialog_addtag.js',
+ 'js/wiki/dialog_save.js',
+ 'js/wiki/dialog_revert.js',
+ 'js/wiki/dialog_pubmark.js',
# views
# views
- 'js/wiki_img/view_summary.js',
'js/wiki_img/view_editor_objects.js',
'js/wiki_img/view_editor_motifs.js',
'js/wiki/view_editor_source.js',
'js/wiki_img/view_editor_objects.js',
'js/wiki_img/view_editor_motifs.js',
'js/wiki/view_editor_source.js',
+ 'js/wiki/view_history.js',
+ 'js/wiki/view_column_diff.js',
),
'output_filename': 'compressed/detail_img_scripts_?.js',
},
),
'output_filename': 'compressed/detail_img_scripts_?.js',
},
- '
listing
': {
+ '
catalogue
': {
'source_filenames': (
'source_filenames': (
- 'js/
lib/jquery-1.4.2.min
.js',
+ 'js/
catalogue/catalogue
.js',
'js/slugify.js',
'js/slugify.js',
+ 'email_mangler/email_mangler.js',
),
),
- 'output_filename': 'compressed/
listing
_scripts_?.js',
+ 'output_filename': 'compressed/
catalogue
_scripts_?.js',
}
}
}
}