diff --git a/circle/circle/settings/base.py b/circle/circle/settings/base.py index ab3c8e4..6ef2b24 100644 --- a/circle/circle/settings/base.py +++ b/circle/circle/settings/base.py @@ -156,6 +156,7 @@ STATIC_URL = get_env_variable('DJANGO_STATIC_URL', default='/static/') STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'pipeline.finders.PipelineFinder', ) ########## END STATIC FILE CONFIGURATION STATICFILES_DIRS = [normpath(join(SITE_ROOT, 'bower_components'))] diff --git a/circle/circle/settings/local.py b/circle/circle/settings/local.py index ead29f4..96f2322 100644 --- a/circle/circle/settings/local.py +++ b/circle/circle/settings/local.py @@ -110,8 +110,8 @@ if DEBUG: from django.dispatch import Signal Signal.send_robust = Signal.send -PIPELINE_DISABLED_COMPILERS = ( - 'pipeline.compilers.less.LessCompiler', +PIPELINE_COMPILERS = ( + 'dashboard.compilers.DummyLessCompiler', ) ADMIN_ENABLED = True diff --git a/circle/dashboard/compilers.py b/circle/dashboard/compilers.py new file mode 100644 index 0000000..723f48a --- /dev/null +++ b/circle/dashboard/compilers.py @@ -0,0 +1,23 @@ +# Copyright 2014 Budapest University of Technology and Economics (BME IK) +# +# This file is part of CIRCLE Cloud. +# +# CIRCLE is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along +# with CIRCLE. If not, see . + +from pipeline.compilers.less import LessCompiler + + +class DummyLessCompiler(LessCompiler): + def compile_file(self, *args, **kwargs): + pass diff --git a/circle/dashboard/templates/base.html b/circle/dashboard/templates/base.html index 120ac70..206dd15 100644 --- a/circle/dashboard/templates/base.html +++ b/circle/dashboard/templates/base.html @@ -1,7 +1,7 @@ {% load i18n %} {% load staticfiles %} {% load cache %} -{% load compressed %} +{% load pipeline %} @@ -14,7 +14,7 @@ {% block title %}{% block title-page %}{% endblock %} | {% block title-site %}CIRCLE{% endblock %}{% endblock %} - {% compressed_css 'all' %} + {% stylesheet 'all' %}