Commit 030eb440 by Kálmán Viktor

dashboard: switch back to main pipeline 1.4

parent 8ebf4214
......@@ -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'))]
......
......@@ -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
# 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 <http://www.gnu.org/licenses/>.
from pipeline.compilers.less import LessCompiler
class DummyLessCompiler(LessCompiler):
def compile_file(self, *args, **kwargs):
pass
{% load i18n %}
{% load staticfiles %}
{% load cache %}
{% load compressed %}
{% load pipeline %}
<!DOCTYPE html>
<html lang="{{lang}}">
<head>
......@@ -14,7 +14,7 @@
<title>{% block title %}{% block title-page %}{% endblock %} | {% block title-site %}CIRCLE{% endblock %}{% endblock %}</title>
{% compressed_css 'all' %}
{% stylesheet 'all' %}
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
......@@ -84,7 +84,7 @@
<script src="{% static "jquery/dist/jquery.min.js" %}"></script>
<script src="{{ STATIC_URL }}jsi18n/{{ LANGUAGE_CODE }}/djangojs.js"></script>
{% compressed_js 'all' %}
{% javascript 'all' %}
{% block extra_script %}
{% endblock %}
......
{% extends "dashboard/base.html" %}
{% load staticfiles %}
{% load i18n %}
{% load compressed %}
{% load pipeline %}
{% block title-page %}{{ instance.name }} | vm{% endblock %}
......@@ -242,5 +242,5 @@
{% endblock %}
{% block extra_js %}
{% compressed_js 'vm-detail' %}
{% javascript 'vm-detail' %}
{% endblock %}
......@@ -42,4 +42,4 @@ sqlparse==0.1.13
pika==0.9.14
Fabric==1.10.0
lxml==3.4.0
git+https://github.com/BME-IK/django-pipeline.git
django-pipeline==1.4.7
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment