Skip to content

Commit 5f0d8f2

Browse files
iromliiromli
committed
use url_for to render static files
1 parent 663d909 commit 5f0d8f2

3 files changed

Lines changed: 25 additions & 33 deletions

File tree

‎runserver.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import optparse
77

88
from users import APP, LOGGER
9-
from users.static import static_file
109

1110
if __name__ == '__main__':
1211
parser = optparse.OptionParser()
@@ -19,8 +18,6 @@
1918
print 'Running in debug mode'
2019
LOGGER.info('Running in debug mode')
2120
APP.debug = True
22-
# set up flask to serve static content
23-
APP.add_url_rule('/<path:path>', 'static_file', static_file)
2421
else:
2522
print 'Running in production mode'
2623
LOGGER.info('Running in production mode')

‎users/templates/html/base.html‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,24 @@
66
<link rel="shortcut icon" href="{{ project_favicon_file }}">
77
<title>{% block title %}{{ project_name | safe }} User Map{% endblock %}</title>
88
{% block head_resources %}
9-
<link rel="stylesheet" href="/users/static/css/bootstrap.css"
10-
type="text/css" static="screen, projection"/>
11-
<link rel="stylesheet" href="/users/static/css/leaflet.css"/>
12-
<!--[if lte IE 8]>
13-
<link rel="stylesheet" href="/users/static/css/leaflet.ie.css" />
14-
<![endif]-->
15-
<link rel="stylesheet" href="/users/static/css/leaflet.label.css"/>
16-
<link rel="stylesheet" href="/users/static/css/user-map.css"
17-
type="text/css"/>
18-
<script language="javascript"
19-
type="text/javascript" src="/users/static/js/jquery.js"></script>
20-
<script language="javascript"
21-
type="text/javascript" src="/users/static/js/bootstrap.min.js"></script>
22-
<script src="/users/static/js/leaflet.js"></script>
23-
<script src="/users/static/js/leaflet.label.js"></script>
24-
<script language="javascript"
25-
type="text/javascript" src="/users/static/js/user-map.js"></script>
26-
<script language="javascript"
27-
type="text/javascript" src="/users/static/js/user-map-component.js"></script>
28-
<script language="javascript"
29-
type="text/javascript" src="/users/static/js/user-map-state.js"></script>
30-
<script language="javascript"
31-
type="text/javascript" src="/users/static/js/user-map-utilities.js"></script>
32-
<script language="javascript"
33-
type="text/javascript" src="/users/static/js/validate.js"></script>
9+
<link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.css') }}" type="text/css" static="screen, projection"/>
10+
<link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.css') }}"/>
11+
<!--[if lte IE 8]>
12+
<link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.ie.css') }}"/>
13+
<![endif]-->
14+
<link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.label.css') }}"/>
15+
<link rel="stylesheet" href="{{ url_for('static', filename='css/user-map.css') }}" />
16+
17+
<script language="javascript" type="text/javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
18+
<script language="javascript" type="text/javascript" src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
19+
<script language="javascript" type="text/javascript" src="{{ url_for('static', filename='js/leaflet.js') }}"></script>
20+
<script language="javascript" type="text/javascript" src="{{ url_for('static', filename='js/leaflet.label.js') }}"></script>
21+
22+
<script language="javascript" type="text/javascript" src="{{ url_for('static', filename='js/user-map.js') }}"></script>
23+
<script language="javascript" type="text/javascript" src="{{ url_for('static', filename='js/user-map-component.js') }}"></script>
24+
<script language="javascript" type="text/javascript" src="{{ url_for('static', filename='js/user-map-state.js') }}"></script>
25+
<script language="javascript" type="text/javascript" src="{{ url_for('static', filename='js/user-map-utilities.js') }}"></script>
26+
<script language="javascript" type="text/javascript" src="{{ url_for('static', filename='js/validate.js') }}"></script>
3427
{% endblock head_resources %}
3528
</head>
3629
<body>

‎users/templates/html/index.html‎

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

33
{% block head_resources %}
4-
{{ super() }}
5-
<link rel="stylesheet" href="/users/static/css/MarkerCluster.css"/>
6-
<link rel="stylesheet" href="/users/static/css/MarkerCluster.user-map.css"/>
7-
<!--[if lte IE 8]><link rel="stylesheet" href="/users/static/css//MarkerCluster.user-map.ie.css" /><![endif]-->
8-
<script src="/users/static/js/leaflet.markercluster-src.js"></script>
4+
{{ super() }}
5+
<link rel="stylesheet" href="{{ url_for('static', filename='css/MarkerCluster.css') }}" />
6+
<link rel="stylesheet" href="{{ url_for('static', filename='css/MarkerCluster.user-map.css') }}" />
7+
<!--[if lte IE 8]>
8+
<link rel="stylesheet" href="{{ url_for('static', filename='css/MarkerCluster.user-map.ie.css') }}" />
9+
<![endif]-->
10+
<script src="{{ url_for('static', filename='js/leaflet.markercluster-src.js') }}"></script>
911
{% endblock head_resources %}
1012

1113
{% block body %}

0 commit comments

Comments
 (0)