Michael Hall has proposed merging lp:~mhall119/loco-directory/fixes-585306 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#585306 load Google Maps only where it's needed
https://bugs.launchpad.net/bugs/585306
Only include the maps javascript on the pages that show a map
--
https://code.launchpad.net/~mhall119/loco-directory/fixes-585306/+merge/31750
Your team loco-directory-dev is requested to review the proposed merge of
lp:~mhall119/loco-directory/fixes-585306 into lp:loco-directory.
=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html 2010-07-28 16:18:37 +0000
+++ loco_directory/templates/base.html 2010-08-04 13:08:46 +0000
@@ -7,10 +7,6 @@
{% block extrahead %}
<script type="text/javascript" src="{{MEDIA_URL}}/jquery/jquery.js"></script>
- <script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js";></script>
- <script src="http://maps.google.com/maps?file=api&v=2&key={{ google_api_key }}" type="text/javascript"></script>
- <script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js";></script>
- <script type="text/javascript" src="{{MEDIA_URL}}/js/common.js"></script>
{% endblock %}
{% block main_nav_links %}
=== modified file 'loco_directory/templates/venues/venue_detail.html'
--- loco_directory/templates/venues/venue_detail.html 2010-06-24 19:18:57 +0000
+++ loco_directory/templates/venues/venue_detail.html 2010-08-04 13:08:46 +0000
@@ -3,6 +3,14 @@
{% block title %}{% trans venue_object.name %}{% endblock %}
+{% block extrahead %}
+{{block.super}}
+<script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js";></script>
+<script src="http://maps.google.com/maps?file=api&v=2&key={{ google_api_key }}" type="text/javascript"></script>
+<script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js";></script>
+ <script type="text/javascript" src="{{MEDIA_URL}}/js/common.js"></script>
+{% endblock %}
+
{% block sub_nav_links %}
<a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Go back to Venue list" %}</a>
{% if user.is_authenticated %}
=== modified file 'loco_directory/templates/venues/venue_update.html'
--- loco_directory/templates/venues/venue_update.html 2010-07-20 19:04:19 +0000
+++ loco_directory/templates/venues/venue_update.html 2010-08-04 13:08:46 +0000
@@ -6,6 +6,14 @@
{% block sub_nav %}
{% endblock %}
+{% block extrahead %}
+{{block.super}}
+<script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js";></script>
+<script src="http://maps.google.com/maps?file=api&v=2&key={{ google_api_key }}" type="text/javascript"></script>
+<script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js";></script>
+<script type="text/javascript" src="{{MEDIA_URL}}/js/common.js"></script>
+{% endblock %}
+
{% block extrafooter %}
<script type="text/javascript"><!--
var lon = new Array();
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
