matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added django_compress and cssmin to the requirements files and enalbed django_compress for CSS and JS files

Browse Source
This commit is contained in:
Roberto Rosario
2011-10-18 11:03:51 -04:00
parent 5ac70a2100
commit 6c7bc820a6
5 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/main/templates/base.html
View File

@@ -46,12 +46,11 @@
{% endblock %}
{% block web_theme_javascript %}
<script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.scrollview.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}packages/JqueryAsynchImageLoader-0.8.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.fancybox-1.3.4/fancybox/jquery.easing-1.3.pack.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.scrollview.js"></script>
<script type="text/javascript">
jQuery(document).ready(function() {
{% if not disable_auto_focus %}

9
apps/web_theme/templates/web_theme_base.html
View File

@@ -1,5 +1,7 @@
{% load i18n %}
{% load theme_tags %}
{% load compress %}
{% get_theme as web_theme %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -11,6 +13,7 @@
{% block web_theme_head %}{% endblock %}
{% compress css %}
<link rel="stylesheet" href="{{ STATIC_URL }}web_theme_media/stylesheets/base.css" type="text/css" media="screen" />
<link rel="stylesheet" id="current-theme" href="{{ STATIC_URL }}web_theme_media/stylesheets/themes/{{ web_theme }}/style.css" type="text/css" media="screen" />
<style type="text/css">
@@ -32,15 +35,18 @@
}
</style>
{% block web_theme_stylesheets %}{% endblock %}
{% endcompress %}
{% compress js %}
<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery-1.5.2.min.js"></script>
{% if enable_scroll_js %}
<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery.scrollTo.js"></script>#}
<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery.localscroll.js"></script>#}
{% endif %}
{% block web_theme_javascript %}{% endblock %}
<script type="text/javascript">
$(document).ready(function() {
$(".message").fadeIn("slow");
@@ -59,6 +65,7 @@
});
});
</script>
{% endcompress %}
</head>
<body>
<div id="container">

2
requirements/development.txt
View File

@@ -16,3 +16,5 @@ pdfminer==20110227
APScheduler==2.0.2
django-grappelli==2.3.3
Pillow==1.7.4
cssmin==0.1.4
django-compressor==1.1

2
requirements/production.txt
View File

@@ -13,3 +13,5 @@ pdfminer==20110227
APScheduler==2.0.2
django-grappelli==2.3.3
Pillow==1.7.4
cssmin==0.1.4
django-compressor==1.1

10
settings.py
View File

@@ -162,6 +162,7 @@ INSTALLED_APPS = (
'job_processor',
'history',
'main',
'compressor',
)
TEMPLATE_CONTEXT_PROCESSORS = (
@@ -173,6 +174,15 @@ TEMPLATE_CONTEXT_PROCESSORS = (
# 'django.contrib.messages.context_processors.messages',
)
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
# other finders..
'compressor.finders.CompressorFinder',
)
COMPRESS_PARSER = 'compressor.parser.HtmlParser'
COMPRESS_CSS_FILTERS = ['compressor.filters.css_default.CssAbsoluteFilter', 'compressor.filters.cssmin.CSSMinFilter']
#===== User configuration options ===============
#--------- Pagination ------------------
#PAGINATION_DEFAULT_PAGINATION = 10