[PATCH 01/51] templates: Pull jquery into base.html

Damien Lespiau damien.lespiau at intel.com
Tue Aug 25 04:22:50 AEST 2015


Bootstrap needs jquery for its own JS facilities, so include it on every
page.

Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
---
 patchwork/templates/patchwork/bundle.html | 1 -
 templates/base.html                       | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/patchwork/templates/patchwork/bundle.html b/patchwork/templates/patchwork/bundle.html
index 4a96b6b..d71132d 100644
--- a/patchwork/templates/patchwork/bundle.html
+++ b/patchwork/templates/patchwork/bundle.html
@@ -4,7 +4,6 @@
 {% load static %}
 
 {% block headers %}
-  <script type="text/javascript" src="{% static "js/jquery-1.10.1.min.js" %}"></script>
   <script type="text/javascript" src="{% static "js/jquery.tablednd.js" %}"></script>
   <script type="text/javascript" src="{% static "js/bundle.js" %}"></script>
 {% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 3d289fb..48ea4f0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,6 +8,7 @@
   <title>{% block title %}Patchwork{% endblock %} - Patchwork</title>
   <link rel="stylesheet" type="text/css" href="{% static "css/style.css" %}"/>
   <script type="text/javascript" src="{% static "js/common.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/jquery-1.10.1.min.js" %}"></script>
 {% block headers %}{% endblock %}
  </head>
  <body>
-- 
2.1.0



More information about the Patchwork mailing list