Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
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
030eb440
authored
May 05, 2015
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: switch back to main pipeline 1.4
parent
8ebf4214
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
8 deletions
+32
-8
circle/circle/settings/base.py
+1
-0
circle/circle/settings/local.py
+2
-2
circle/dashboard/compilers.py
+23
-0
circle/dashboard/templates/base.html
+3
-3
circle/dashboard/templates/dashboard/vm-detail.html
+2
-2
requirements/base.txt
+1
-1
No files found.
circle/circle/settings/base.py
View file @
030eb440
...
...
@@ -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'
))]
...
...
circle/circle/settings/local.py
View file @
030eb440
...
...
@@ -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.Dummy
LessCompiler'
,
)
ADMIN_ENABLED
=
True
circle/dashboard/compilers.py
0 → 100644
View file @
030eb440
# 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
circle/dashboard/templates/base.html
View file @
030eb440
{% 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 %}
...
...
circle/dashboard/templates/dashboard/vm-detail.html
View file @
030eb440
{% 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 %}
requirements/base.txt
View file @
030eb440
...
...
@@ -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
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