From cc8817846a1ec55b9711d08c4a8a6a261bbd64e3 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 3 Oct 2013 05:40:41 +0000
Subject: [PATCH] Applied the same patch to other templates which use the same
 approach.  Fixed 2 typos.  - Legacy-Id: 6347

---
 ietf/templates/meeting/agenda.html          | 2 +-
 ietf/templates/meeting/agenda_list.html     | 5 +++--
 ietf/templates/meeting/landscape_edit.html  | 4 ++--
 ietf/templates/meeting/properties_edit.html | 6 +++---
 ietf/templates/meeting/timeslot_edit.html   | 4 +++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 9ca7db711..7b002ab0c 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -68,7 +68,7 @@ img.hidden { display: none; }
 
 {% endblock morecss %}
 
-{% block pagehead %}
+{% block scripts %}
 <script type="text/javascript" src='/js/agenda2.js'></script>
 <script type="text/javascript" src='/js/lib/jquery-1.8.2.min.js'></script>
 <script type="text/javascript" src='/js/browsertime.js'></script>
diff --git a/ietf/templates/meeting/agenda_list.html b/ietf/templates/meeting/agenda_list.html
index 1c599e1e8..ae01e50e0 100644
--- a/ietf/templates/meeting/agenda_list.html
+++ b/ietf/templates/meeting/agenda_list.html
@@ -11,7 +11,9 @@
 <link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
 <link rel='stylesheet' type='text/css' href='/css/base2.css' />
 <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>
 <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>
@@ -26,8 +28,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 pagehead %}
+{% endblock scripts %}
 
 {% block noTable %}
 </tr></table></div>
diff --git a/ietf/templates/meeting/landscape_edit.html b/ietf/templates/meeting/landscape_edit.html
index c4bac370f..c3decfc49 100644
--- a/ietf/templates/meeting/landscape_edit.html
+++ b/ietf/templates/meeting/landscape_edit.html
@@ -23,9 +23,9 @@
 <link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
 <link rel="stylesheet" type="text/css" href="/css/base2.css"></link>
 <link rel='stylesheet' type='text/css' href='/css/agenda.css' />
-+{% endblock pagehead %}
+{% endblock pagehead %}
 
-+{% block scripts %}
+{% block scripts %}
 <script type='text/javascript' src='/js/lib/jquery-1.8.2.min.js'></script>
 <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>
diff --git a/ietf/templates/meeting/properties_edit.html b/ietf/templates/meeting/properties_edit.html
index 29d1f0c56..30f3ed516 100644
--- a/ietf/templates/meeting/properties_edit.html
+++ b/ietf/templates/meeting/properties_edit.html
@@ -11,8 +11,9 @@
 <link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
 <link rel='stylesheet' type='text/css' href='/css/base2.css' />
 <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>
 <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>
@@ -27,8 +28,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 pagehead %}
+{% endblock scripts %}
 
 {% block noTable %}
 </tr></table></div>
diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html
index 34887b57b..f729dc84d 100644
--- a/ietf/templates/meeting/timeslot_edit.html
+++ b/ietf/templates/meeting/timeslot_edit.html
@@ -11,7 +11,9 @@
 <link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
 <link rel='stylesheet' type='text/css' href='/css/base2.css' />
 <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>
 <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>
@@ -65,7 +67,7 @@ function setup_slots(){
 <style type='text/css'>
 
 </style>
-{% endblock pagehead %}
+{% endblock scripts %}
 
 
 {% block noTable %}