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

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

Author: OleLaursen

ietf/templates/meeting/agenda_list.html

@@ -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 %}

ietf/templates/meeting/landscape_edit.html

@@ -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 @@
 <style type='text/css'>
 
 </style>
-{% endblock scripts %}
+{% endblock js %}
 
 
 {% block start_content_table %}{% endblock %}

ietf/templates/meeting/properties_edit.html

@@ -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 %}

ietf/templates/meeting/timeslot_edit.html

@@ -13,19 +13,16 @@
 <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>
 <script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
 <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 @@
 <style type='text/css'>
 
 </style>
-{% endblock scripts %}
+{% endblock js %}
 
 
 {% block start_content_table %}{% endblock %}