Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gutyán Gábor
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
3cbb35e4
authored
Nov 03, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
circle: enable js compressor
also move the disable less compiler attr to local.py
parent
ae8aeb57
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
8 deletions
+6
-8
circle/circle/settings/base.py
+1
-7
circle/circle/settings/local.py
+4
-0
circle/fabfile.py
+0
-1
requirements/base.txt
+1
-0
No files found.
circle/circle/settings/base.py
View file @
3cbb35e4
...
...
@@ -170,13 +170,8 @@ STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
PIPELINE_COMPILERS
=
(
'pipeline.compilers.less.LessCompiler'
,
)
PIPELINE_DISABLED_COMPILERS
=
(
'pipeline.compilers.less.LessCompiler'
,
)
PIPELINE_CSS_COMPRESSOR
=
'pipeline.compressors.yuglify.YuglifyCompressor'
# PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
# PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
PIPELINE_JS_COMPRESSOR
=
None
# js compressors don't really like our deps
PIPELINE_JS_COMPRESSOR
=
'pipeline.compressors.slimit.SlimItCompressor'
PIPELINE_DISABLE_WRAPPER
=
True
PIPELINE_LESS_ARGUMENTS
=
u'--include-path={}'
.
format
(
':'
.
join
(
STATICFILES_DIRS
))
PIPELINE_CSS
=
{
...
...
@@ -242,7 +237,6 @@ PIPELINE_JS = {
"no-vnc/include/rfb.js"
,
"dashboard/vm-console.js"
,
"dashboard/vm-tour.js"
,
"dashboard/disk-list.js"
,
),
"output_filename"
:
"vm-detail.js"
,
},
...
...
circle/circle/settings/local.py
View file @
3cbb35e4
...
...
@@ -102,3 +102,7 @@ CRISPY_FAIL_SILENTLY = not DEBUG
if
DEBUG
:
from
django.dispatch
import
Signal
Signal
.
send_robust
=
Signal
.
send
PIPELINE_DISABLED_COMPILERS
=
(
'pipeline.compilers.less.LessCompiler'
,
)
circle/fabfile.py
View file @
3cbb35e4
...
...
@@ -61,7 +61,6 @@ def compile_js():
def
collectstatic
():
"Collect static files"
with
_workon
(
"circle"
),
cd
(
"~/circle/circle"
):
run
(
"./manage.py compileless"
)
run
(
"./manage.py collectstatic --noinput"
)
...
...
requirements/base.txt
View file @
3cbb35e4
...
...
@@ -37,3 +37,4 @@ Fabric==1.9.0
lxml==3.3.5
pyinotify==0.9.4
git+https://github.com/BME-IK/django-pipeline.git
slimit==0.8.1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment