Skip to content

Commit 1dd661a

Browse files
tobamitobami
committed
Use static template tag
1 parent 8059689 commit 1dd661a

5 files changed

Lines changed: 36 additions & 32 deletions

File tree

‎codespeed/templates/codespeed/base.html‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
{% load static %}
12
<!DOCTYPE html>
23
<html>
34
<head>
45
<title>{% block title %}MyProject's Speed Center{% endblock %}</title>
56
<meta name="description" content="{% block description %}A performance analysis tool for software projects. It shows performance regresions and allows comparing different applications or implementations{% endblock %}">
67
<meta name="keywords" content="performance, test, plots, charts">
78
<meta charset="UTF-8">
8-
<link href="{{ STATIC_URL }}css/main.css" rel="stylesheet" type="text/css">
9+
<link href="{% static 'css/main.css' %}" rel="stylesheet" type="text/css">
910
{% block extra_head %}{% endblock %}
1011
</head>
1112
<body>
@@ -15,7 +16,7 @@
1516
{% block page_header %}
1617
<a href="{% url 'home' %}">
1718
{% block logo %}
18-
<img src="{{ STATIC_URL }}images/logo.png" height="48" alt="logo"/>
19+
<img src="{% static 'images/logo.png' %}" height="48" alt="logo"/>
1920
{% endblock logo %}
2021
</a>
2122
<h2>{% block page_title %}SPEED CENTER{% endblock page_title %}</h2>
@@ -48,11 +49,8 @@ <h2>{% block page_title %}SPEED CENTER{% endblock page_title %}</h2>
4849
{% endblock %}
4950
</div>
5051

51-
<script type='text/javascript'>
52-
var STATIC_URL = '{{ STATIC_URL }}';
53-
</script>
54-
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery-1.12.3.min.js"></script>
55-
<script type="text/javascript" src="{{ STATIC_URL }}js/codespeed.js"></script>
52+
<script type="text/javascript" src="{% static 'js/jquery-1.12.3.min.js' %}"></script>
53+
<script type="text/javascript" src="{% static 'js/codespeed.js' %}"></script>
5654
{% block extra_body %}{% endblock %}
5755
</body>
5856
</html>

‎codespeed/templates/codespeed/changes.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{% extends "codespeed/base_site.html" %}
22

3+
{% load static %}
4+
35
{% block title %}{{ block.super }}: Changes{% endblock %}
46
{% block description %}{% if pagedesc %}{{ pagedesc }}{% else %}{{ block.super }}{% endif %}{% endblock %}
57

@@ -65,8 +67,8 @@
6567

6668
{% block extra_body %}
6769
{{ block.super }}
68-
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.tablesorter.min.js"></script>
69-
<script type="text/javascript" src="{{ STATIC_URL }}js/changes.js"></script>
70+
<script type="text/javascript" src="{% static 'js/jquery.tablesorter.min.js' %}"></script>
71+
<script type="text/javascript" src="{% static 'js/changes.js' %}"></script>
7072
<script type="text/javascript">
7173
var TIMELINE_URL = "{% url "timeline" %}";
7274

‎codespeed/templates/codespeed/comparison.html‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{% extends "codespeed/base_site.html" %}
22

3+
{% load static %}
4+
35
{% block title %}{{ block.super }}: Comparison{% endblock %}
46

57
{% block extra_head %}
68
{{ block.super }}
7-
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}js/jqplot/jquery.jqplot.min.css" />
9+
<link rel="stylesheet" type="text/css" href="{% static 'js/jqplot/jquery.jqplot.min.css' %}" />
810
{% endblock %}
911

1012
{% block navigation %}
@@ -80,14 +82,14 @@
8082

8183
{% block extra_body %}
8284
{{ block.super }}
83-
<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="{{ STATIC_URL }}js/jqplot/excanvas.min.js"></script><![endif]-->
84-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jquery.jqplot.min.js"></script>
85-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.barRenderer.min.js"></script>
86-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.categoryAxisRenderer.min.js"></script>
87-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasTextRenderer.min.js"></script>
88-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasAxisTickRenderer.min.js"></script>
89-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasAxisLabelRenderer.min.js"></script>
90-
<script type="text/javascript" src="{{ STATIC_URL }}js/comparison.js"></script>
85+
<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="{% static 'js/jqplot/excanvas.min.js' %}"></script><![endif]-->
86+
<script type="text/javascript" src="{% static 'js/jqplot/jquery.jqplot.min.js' %}"></script>
87+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.barRenderer.min.js' %}"></script>
88+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.categoryAxisRenderer.min.js' %}"></script>
89+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.canvasTextRenderer.min.js' %}"></script>
90+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.canvasAxisTickRenderer.min.js' %}"></script>
91+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.canvasAxisLabelRenderer.min.js' %}"></script>
92+
<script type="text/javascript" src="{% static 'js/comparison.js' %}"></script>
9193

9294
<script type="text/javascript">
9395
$(function() {

‎codespeed/templates/codespeed/timeline.html‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{% extends "codespeed/base_site.html" %}
22

3+
{% load static %}
4+
35
{% block title %}{{ block.super }}: Timeline{% endblock %}
46
{% block description %}{% if pagedesc %}{{ pagedesc }}{% else %}{{ block.super }}{% endif %}{% endblock %}
57

68
{% block extra_head %}
79
{{ block.super }}
8-
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/css/timeline.css" />
9-
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}js/jqplot/jquery.jqplot.min.css" />
10+
<link rel="stylesheet" type="text/css" href="{% static '/css/timeline.css' %}" />
11+
<link rel="stylesheet" type="text/css" href="{% static 'js/jqplot/jquery.jqplot.min.css' %}" />
1012
{% endblock %}
1113

1214
{% block navigation %}
@@ -106,19 +108,19 @@
106108

107109
{% block extra_body %}
108110
{{ block.super }}
109-
<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="{{ STATIC_URL }}js/jqplot/excanvas.min.js"></script><![endif]-->
110-
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.address-1.6.min.js?autoUpdate=0"></script>
111-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jquery.jqplot.min.js"></script>
112-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.cursor.min.js"></script>
113-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.highlighter.min.js"></script>
114-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.dateAxisRenderer.min.js"></script>
115-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.categoryAxisRenderer.min.js"></script>
116-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasTextRenderer.min.js"></script>
117-
<script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasAxisLabelRenderer.min.js"></script>
111+
<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="{% static 'js/jqplot/excanvas.min.js' %}"></script><![endif]-->
112+
<script type="text/javascript" src="{% static 'js/jquery.address-1.6.min.js?autoUpdate=0' %}"></script>
113+
<script type="text/javascript" src="{% static 'js/jqplot/jquery.jqplot.min.js' %}"></script>
114+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.cursor.min.js' %}"></script>
115+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.highlighter.min.js' %}"></script>
116+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.dateAxisRenderer.min.js' %}"></script>
117+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.categoryAxisRenderer.min.js' %}"></script>
118+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.canvasTextRenderer.min.js' %}"></script>
119+
<script type="text/javascript" src="{% static 'js/jqplot/jqplot.canvasAxisLabelRenderer.min.js' %}"></script>
118120
<script type="text/javascript">
119121
var CHANGES_URL = "{% url "changes" %}";
120122
</script>
121-
<script type="text/javascript" src="{{ STATIC_URL }}js/timeline.js"></script>
123+
<script type="text/javascript" src="{% static 'js/timeline.js' %}"></script>
122124
<script type="text/javascript">
123125
$(function() {
124126
Timeline.init({
@@ -135,4 +137,3 @@
135137
});
136138
</script>
137139
{% endblock %}
138-

‎sample_project/settings.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
},
6767
]
6868

69-
7069
INSTALLED_APPS = (
7170
'django.contrib.auth',
7271
'django.contrib.contenttypes',
@@ -77,11 +76,13 @@
7776
'codespeed',
7877
)
7978

79+
8080
STATIC_URL = '/static/'
8181
STATIC_ROOT = os.path.join(BASEDIR, "sitestatic")
8282
STATICFILES_DIRS = (
8383
os.path.join(BASEDIR, 'static'),
8484
)
8585

86+
8687
# Codespeed settings that can be overwritten here.
8788
from codespeed.settings import *

0 commit comments

Comments
 (0)