From 2196e7555082b8153d2123e0542a02dc4a0ac2fc Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Fri, 10 Jan 2014 14:57:45 +0000
Subject: [PATCH] Remove more Javascript left-over includes from nomcom/ and
one in community/ - Legacy-Id: 7100
---
ietf/templates/community/manage_clist.html | 19 ++++++-------------
ietf/templates/nomcom/edit_nominee.html | 7 -------
ietf/templates/nomcom/questionnaires.html | 7 -------
ietf/templates/nomcom/requirements.html | 7 -------
.../nomcom/view_feedback_nominee.html | 7 -------
.../nomcom/view_feedback_unrelated.html | 7 -------
6 files changed, 6 insertions(+), 48 deletions(-)
diff --git a/ietf/templates/community/manage_clist.html b/ietf/templates/community/manage_clist.html
index 2c57d77b0..cbaf0a5a4 100644
--- a/ietf/templates/community/manage_clist.html
+++ b/ietf/templates/community/manage_clist.html
@@ -1,13 +1,5 @@
{% extends "base.html" %}
-{% block pagehead %}
-{{ block.super }}
-<script type="text/javascript" src="/js/lib/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
-<script type="text/javascript" src="/js/base.js"></script>
-<script type="text/javascript" src="/js/community.js"></script>
-{% endblock pagehead %}
-
{% block title %}{{ cl.long_name }}{% endblock %}
{% block content %}
@@ -110,9 +102,13 @@ In order to add some individual documents to your list you have to:
</div>
</div>
+{% endblock %}
-<script type="text/javascript">
-//<![CDATA[
+{% block js %}
+ <script type="text/javascript" src="/js/community.js"></script>
+{% endblock js %}
+
+{% block scripts %}
var tabView = new YAHOO.widget.TabView('mytabs');
var url = location.href.split('#');
if (url[1]) {
@@ -125,7 +121,4 @@ if (url[1]) {
}
}
}
-//]]>
-</script>
-
{% endblock %}
diff --git a/ietf/templates/nomcom/edit_nominee.html b/ietf/templates/nomcom/edit_nominee.html
index e57f75d25..ca309ff79 100644
--- a/ietf/templates/nomcom/edit_nominee.html
+++ b/ietf/templates/nomcom/edit_nominee.html
@@ -2,13 +2,6 @@
{% load nomcom_tags %}
-{% block pagehead %}
- {{ block.super }}
- <script type="text/javascript" src="/js/lib/jquery-1.4.2.min.js"></script>
- <script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
- <script type="text/javascript" src="/js/base.js"></script>
-{% endblock pagehead %}
-
{% block subtitle %} - Edit nominee {{ nominee }}{% endblock %}
{% block nomcom_content %}
diff --git a/ietf/templates/nomcom/questionnaires.html b/ietf/templates/nomcom/questionnaires.html
index c61fe8660..ddd1fbc46 100644
--- a/ietf/templates/nomcom/questionnaires.html
+++ b/ietf/templates/nomcom/questionnaires.html
@@ -1,12 +1,5 @@
{% extends "nomcom/nomcom_public_base.html" %}
-{% block pagehead %}
- {{ block.super }}
- <script type="text/javascript" src="/js/lib/jquery-1.4.2.min.js"></script>
- <script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
- <script type="text/javascript" src="/js/base.js"></script>
-{% endblock pagehead %}
-
{% block subtitle %} - Questionnaires {% endblock %}
{% block nomcom_content %}
diff --git a/ietf/templates/nomcom/requirements.html b/ietf/templates/nomcom/requirements.html
index 3594d5dd4..c8cc0614d 100644
--- a/ietf/templates/nomcom/requirements.html
+++ b/ietf/templates/nomcom/requirements.html
@@ -1,12 +1,5 @@
{% extends "nomcom/nomcom_public_base.html" %}
-{% block pagehead %}
- {{ block.super }}
- <script type="text/javascript" src="/js/lib/jquery-1.4.2.min.js"></script>
- <script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
- <script type="text/javascript" src="/js/base.js"></script>
-{% endblock pagehead %}
-
{% block subtitle %} - Desired Expertise {% endblock %}
{% block nomcom_content %}
diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
index ecfd0edfa..1cdb73155 100644
--- a/ietf/templates/nomcom/view_feedback_nominee.html
+++ b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -2,13 +2,6 @@
{% load nomcom_tags %}
-{% block pagehead %}
- {{ block.super }}
- <script type="text/javascript" src="/js/lib/jquery-1.4.2.min.js"></script>
- <script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
- <script type="text/javascript" src="/js/base.js"></script>
-{% endblock pagehead %}
-
{% block subtitle %} - View comments of {{ nominee.email.person.name }}{% endblock %}
{% block nomcom_content %}
diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html
index 414ec52a7..9418f1d81 100644
--- a/ietf/templates/nomcom/view_feedback_unrelated.html
+++ b/ietf/templates/nomcom/view_feedback_unrelated.html
@@ -2,13 +2,6 @@
{% load nomcom_tags %}
-{% block pagehead %}
- {{ block.super }}
- <script type="text/javascript" src="/js/lib/jquery-1.4.2.min.js"></script>
- <script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
- <script type="text/javascript" src="/js/base.js"></script>
-{% endblock pagehead %}
-
{% block subtitle %} - View unrelated feedback{% endblock %}
{% block nomcom_content %}