altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Fix double includes of jQuery 1.8.2 in meeting templates, make sure

Browse source 
script includes are put in the "js" block rather than the "scripts"
block, the latter is for inline scripts, not script includes (this
fixes a couple of weird syntax errors)
 - Legacy-Id: 6815
This commit is contained in:
Ole Laursen 2013-12-06 15:46:51 +00:00
parent e63ac36b8f
commit 415768bb54
4 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ietf/templates/meeting/agenda_list.html
View file

@ -13,8 +13,7 @@
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
{% endblock pagehead %}
{% block scripts %}
<script type='text/javascript' src='/js/lib/jquery-1.8.2.min.js'></script>
{% block js %}
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
@ -28,7 +27,7 @@
<script type='text/javascript' src='/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_property_utils.js'></script>
<script type='text/javascript' src='/js/agenda/agendas_edit.js'></script>
{% endblock scripts %}
{% endblock js %}
{% block start_content_table %}{% endblock %}

6
ietf/templates/meeting/landscape_edit.html
View file

@ -1,4 +1,3 @@
{# -*- html -*- #}
{% extends "base.html" %}
{% load ietf_filters %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
@ -25,8 +24,7 @@
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
{% endblock pagehead %}
{% block scripts %}
<script type='text/javascript' src='/js/lib/jquery-1.8.2.min.js'></script>
{% block js %}
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery-ui.custom.min.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.widget.min.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.droppable.min.js'></script>
@ -114,7 +112,7 @@ area_directors["{{ad.area}}"].push(find_person_by_href("{{ad.defurl}}"));
<style type='text/css'>
</style>
{% endblock scripts %}
{% endblock js %}
{% block start_content_table %}{% endblock %}

5
ietf/templates/meeting/properties_edit.html
View file

@ -13,8 +13,7 @@
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
{% endblock pagehead %}
{% block scripts %}
<script type='text/javascript' src='/js/lib/jquery-1.8.2.min.js'></script>
{% block js %}
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
@ -28,7 +27,7 @@
<script type='text/javascript' src='/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_property_utils.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_properties_edit.js'></script>
{% endblock scripts %}
{% endblock js %}
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}

11
ietf/templates/meeting/timeslot_edit.html
View file

@ -13,8 +13,7 @@
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
{% endblock pagehead %}
{% block scripts %}
<script type='text/javascript' src='/js/lib/jquery-1.8.2.min.js'></script>
{% block js %}
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
@ -22,10 +21,8 @@
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
{% if server_mode %}
{% ifnotequal server_mode "production" %}
<script src="https://towtruck.mozillalabs.com/towtruck.js"></script>
{% endifnotequal %}
{% if server_mode and server_mode != "production" %}
<script src="https://towtruck.mozillalabs.com/towtruck.js"></script>
{% endif %}
{% dajaxice_js_import %}
@ -67,7 +64,7 @@ function setup_slots(){
<style type='text/css'>
</style>
{% endblock scripts %}
{% endblock js %}
{% block start_content_table %}{% endblock %}