Skip to content

Commit c42f708

Browse files
liangliangyyliangliangyy
committed
添加js/css压缩
1 parent 6de281b commit c42f708

File tree

4 files changed

+62
-28
lines changed

4 files changed

+62
-28
lines changed

‎DjangoBlog/settings.py‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
'blog',
4444
'accounts',
4545
'comments',
46-
'oauth'
46+
'oauth',
47+
'compressor'
4748
]
4849

4950
MIDDLEWARE_CLASSES = [
@@ -272,3 +273,26 @@
272273
},
273274
}
274275
}
276+
277+
278+
279+
STATICFILES_FINDERS = (
280+
'django.contrib.staticfiles.finders.FileSystemFinder',
281+
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
282+
#other
283+
'compressor.finders.CompressorFinder',
284+
)
285+
COMPRESS_ENABLED = True
286+
#COMPRESS_OFFLINE = True
287+
288+
"""
289+
COMPRESS_CSS_FILTERS = [
290+
#creates absolute urls from relative ones
291+
'compressor.filters.css_default.CssAbsoluteFilter',
292+
#css minimizer
293+
'compressor.filters.cssmin.CSSMinFilter'
294+
]
295+
COMPRESS_JS_FILTERS = [
296+
'compressor.filters.jsmin.JSMinFilter'
297+
]
298+
"""

‎requirements.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ Unidecode
1414
Whoosh
1515
mistune
1616
pygments
17-
django-ipware
17+
django-ipware
18+
django_compressor

‎templates/share_layout/base.html‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{% load static %}
22
{% load cache %}
3+
{% load compress %}
34
<!DOCTYPE html>
45
<!--[if IE 7]>
56
<html class="ie ie7" lang="zh-CN" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# article: http://ogp.me/ns/article#">
@@ -22,27 +23,28 @@
2223
<![endif]-->
2324

2425
<link rel='dns-prefetch' href='//fonts.googleapis.com'/>
25-
<link rel='dns-prefetch' href='//s.w.org'/>
2626
<link rel="alternate" type="application/rss+xml" title="{{ SITE_NAME }} &raquo; Feed"
2727
href="{{ SITE_BASE_URL }}feed"/>
28-
<link rel="alternate" type="application/rss+xml" title="{{ SITE_NAME }} &raquo; 评论Feed"
29-
href="https://www.lylinux.org/comments/feed"/>
30-
3128

3229
<link rel='stylesheet' id='twentytwelve-fonts-css'
3330
href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700&#038;subset=latin,latin-ext'
3431
type='text/css' media='all'/>
35-
<link rel='stylesheet' id='twentytwelve-style-css' href='{% static 'blog/css/style.css' %}' type='text/css'
36-
media='all'/>
37-
{% comment %}<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>{% endcomment %}
38-
<!--[if lt IE 9]>
32+
{% compress css %}
33+
<link rel='stylesheet' id='twentytwelve-style-css' href='{% static 'blog/css/style.css' %}' type='text/css'
34+
media='all'/>
35+
{% comment %}<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>{% endcomment %}
36+
<!--[if lt IE 9]>
3937
<link rel='stylesheet' id='twentytwelve-ie-css' href='{% static 'blog/css/ie.css' %}' type='text/css' media='all' />
4038
<![endif]-->
41-
39+
<link rel="stylesheet" href="{% static 'pygments/default.css' %}"/>
40+
{% block compress_css %}
41+
{% endblock %}
42+
{% endcompress %}
4243
{% comment %}<script type='text/javascript' src='{% static 'blog/js/jquery.js' %}' defer='defer'></script>
4344
<script type='text/javascript' src='{% static 'blog/js/jquery-migrate.min.js' %}' defer='defer'></script>{% endcomment %}
44-
<script type="text/javascript" src="{% static 'blog/js/jquery-3.1.1.js' %}"></script>
45-
<link rel="stylesheet" href="{% static 'pygments/default.css' %}"/>
45+
{% compress js %}
46+
<script type="text/javascript" src="{% static 'blog/js/jquery-3.1.1.js' %}"></script>
47+
{% endcompress %}
4648
</head>
4749

4850
<body class="home blog custom-font-enabled">
@@ -88,8 +90,12 @@ <h2 class="site-description">{{ SITE_DESCRIPTION }}</h2>
8890
{% comment %}<link href="{% static 'highlight/styles/default.css' %}" rel="stylesheet">
8991
<script type="application/javascript" src="{% static 'highlight/highlight.pack.js' %}"></script>
9092
<script>hljs.initHighlightingOnLoad();</script>{% endcomment %}
91-
<script src="{% static 'blog/js/blog.js' %}" type="application/javascript"></script>
92-
<script src="{% static 'blog/js/navigation.js' %}" type="application/javascript"></script>
93+
{% compress js %}
94+
<script src="{% static 'blog/js/blog.js' %}" type="application/javascript"></script>
95+
<script src="{% static 'blog/js/navigation.js' %}" type="application/javascript"></script>
96+
{% block compress_js %}
97+
{% endblock %}
98+
{% endcompress %}
9399
{% block footer %}
94100
{% endblock %}
95101
</footer>

‎templates/share_layout/base_account.html‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,22 @@
1111
<link rel="icon" href="../../favicon.ico">
1212

1313
<title>{{ SITE_NAME }} | {{ SITE_DESCRIPTION }}</title>
14+
{% load compress %}
15+
{% compress css %}
16+
<!-- Bootstrap core CSS -->
17+
<link href="{% static 'assets/css/bootstrap.min.css' %}" rel="stylesheet">
1418

15-
<!-- Bootstrap core CSS -->
16-
<link href="{% static 'assets/css/bootstrap.min.css' %}" rel="stylesheet">
17-
18-
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
19-
<link href="{% static 'assets/css/ie10-viewport-bug-workaround.css' %}" rel="stylesheet">
20-
<!-- TODC Bootstrap core CSS -->
21-
<link href="{% static 'assets/css/todc-bootstrap.min.css' %}" rel="stylesheet">
22-
<!-- Custom styles for this template -->
23-
<link href="{% static 'assets/css/signin.css' %}" rel="stylesheet">
24-
25-
<script src="{% static 'assets/js/ie-emulation-modes-warning.js' %}"></script>
26-
19+
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
20+
<link href="{% static 'assets/css/ie10-viewport-bug-workaround.css' %}" rel="stylesheet">
21+
<!-- TODC Bootstrap core CSS -->
22+
<link href="{% static 'assets/css/todc-bootstrap.min.css' %}" rel="stylesheet">
23+
<!-- Custom styles for this template -->
24+
<link href="{% static 'assets/css/signin.css' %}" rel="stylesheet">
25+
{% endcompress %}
26+
{% compress js %}
27+
<script src="{% static 'assets/js/ie10-viewport-bug-workaround.js' %}"></script>
28+
<script src="{% static 'assets/js/ie-emulation-modes-warning.js' %}"></script>
29+
{% endcompress %}
2730
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
2831
<!--[if lt IE 9]>
2932
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
@@ -36,6 +39,6 @@
3639
{% endblock %}
3740

3841
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
39-
<script src="{% static 'assets/js/ie10-viewport-bug-workaround.js' %}"></script>
42+
4043
</body>
4144
</html>

0 commit comments

Comments
 (0)