Skip to content

Commit 10eb2a3

Browse files
committed
Merge branch 'feature/create_file_structure' of https://github.com/cloudcomputingproject/main_repo into feature/create_file_structure
Conflicts: application/static/js/home.js application/templates/home/home_base.html
2 parents 7a923ef + 01150a0 commit 10eb2a3

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

application/static/js/home.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
2+
3+
/* Your custom JavaScript here */
14
var map = L.map('map').setView([-37.87, 175.475], 5);
25
var tiles = L.tileLayer('http://{s}.tiles.mapbox.com/v3/{id}/{z}/{x}/{y}.png',
36
{
47
id: 'examples.map-i86nkdio'
5-
}).addTo(map);
6-
7-
/* Your custom JavaScript here */
8+
}).addTo(map);

application/templates/home/home.html

+1-7
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,5 @@ <h1 id="">THIS IS HOME</h1>
1919

2020

2121
{% block tail_script %}
22-
<script>
23-
var map = L.map('map').setView([-37.87, 175.475], 5);
24-
var tiles = L.tileLayer('http://{s}.tiles.mapbox.com/v3/{id}/{z}/{x}/{y}.png',
25-
{
26-
id: 'examples.map-i86nkdio'
27-
}).addTo(map);
28-
</script>
22+
<script src="/static/js/home.js"></script>
2923
{% endblock tail_script %}

application/templates/home/home_base.html

-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,3 @@
55
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
66
<script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
77
{% endblock head_script %}
8-
{% block javascript %}
9-
<SCRIPT SRC="{url_for(templates/home/home.js)}"></SCRIPT>
10-
{% endblock %}

0 commit comments

Comments
 (0)