fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fixups.
[wolnelektury.git]
/
wolnelektury
/
settings
/
static.py
diff --git
a/wolnelektury/settings/static.py
b/wolnelektury/settings/static.py
index
7ea3d70
..
ebce200
100644
(file)
--- a/
wolnelektury/settings/static.py
+++ b/
wolnelektury/settings/static.py
@@
-20,10
+20,9
@@
PIPELINE_CSS = {
'main': {
# styles both for mobile and for big screen
'source_filenames': [
'main': {
# styles both for mobile and for big screen
'source_filenames': [
- 'css/jquery.countdown.css',
+ 'css/jquery.countdown.css',
'sponsors/css/sponsors.css',
'sponsors/css/sponsors.css',
- 'css/social/shelf_tags.css',
'uni_form/uni-form.css',
'uni_form/default.uni-form.css',
'uni_form/uni-form.css',
'uni_form/default.uni-form.css',
@@
-58,8
+57,8
@@
PIPELINE_CSS = {
},
'player': {
'source_filenames': [
},
'player': {
'source_filenames': [
- 'jplayer/jplayer.blue.monday.css',
- 'player/player.css',
+ 'jplayer/jplayer.blue.monday.css',
+ 'player/player.css',
],
'output_filename': 'css/compressed/player.css',
},
],
'output_filename': 'css/compressed/player.css',
},
@@
-67,6
+66,10
@@
PIPELINE_CSS = {
'source_filenames': ('css/simple.css',),
'output_filename': 'css/compressed/simple.css',
},
'source_filenames': ('css/simple.css',),
'output_filename': 'css/compressed/simple.css',
},
+ 'widget': {
+ 'source_filenames': ('scss/widget.scss',),
+ 'output_filename': 'css/compressed/widget.css',
+ },
}
PIPELINE_JS = {
}
PIPELINE_JS = {
@@
-90,16
+93,16
@@
PIPELINE_JS = {
'player/openplayer.js',
'js/search.js',
'funding/funding.js',
'player/openplayer.js',
'js/search.js',
'funding/funding.js',
-
+
'uni_form/uni-form.js',
),
'output_filename': 'js/base.min.js',
},
'player': {
'source_filenames': [
'uni_form/uni-form.js',
),
'output_filename': 'js/base.min.js',
},
'player': {
'source_filenames': [
- 'jplayer/jquery.jplayer.min.js',
- 'jplayer/jplayer.playlist.min.js',
- 'player/player.js',
+ 'jplayer/jquery.jplayer.min.js',
+ 'jplayer/jplayer.playlist.min.js',
+ 'player/player.js',
],
'output_filename': 'js/player.min.js',
},
],
'output_filename': 'js/player.min.js',
},
@@
-136,13
+139,21
@@
PIPELINE_JS = {
'book_ie': {
'source_filenames': ('js/contrib/ierange-m2.js',),
'output_filename': 'js/book_ie.min.js',
'book_ie': {
'source_filenames': ('js/contrib/ierange-m2.js',),
'output_filename': 'js/book_ie.min.js',
- }
-
+ },
+ 'widget': {
+ 'source_filenames': (
+ 'js/contrib/jquery.js',
+ 'js/contrib/jquery-ui-1.8.16.custom.min.js',
+ 'js/search.js',
+ 'js/widget_run.js',
+ ),
+ 'output_filename': 'js/widget.min.js',
+ },
}
STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage'
PIPELINE_CSS_COMPRESSOR = None
}
STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage'
PIPELINE_CSS_COMPRESSOR = None
-PIPELINE_JS_COMPRESSOR =
None
+PIPELINE_JS_COMPRESSOR =
'pipeline.compressors.jsmin.JSMinCompressor'
PIPELINE_COMPILERS = (
'pipeline.compilers.sass.SASSCompiler',
PIPELINE_COMPILERS = (
'pipeline.compilers.sass.SASSCompiler',