diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2014-08-31 22:31:02 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2015-09-18 16:48:39 +0100 |
| commit | 7e1437e8c455a2071e3d64d0cc7ea064b0607512 (patch) | |
| tree | 96031d875007919b646c8865258d3a25c1c9fe1b | |
| parent | 41552cccbac7de60394e78a2017e26b759ac5157 (diff) | |
| download | patchwork-7e1437e8c455a2071e3d64d0cc7ea064b0607512.tar patchwork-7e1437e8c455a2071e3d64d0cc7ea064b0607512.tar.gz | |
templates: Pull jquery into base.html
Bootstrap needs jquery for its own JS facilities, so include it on every
page.
Acked-by: Stephen Finucane <stephen.finucane@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
| -rw-r--r-- | patchwork/templates/patchwork/bundle.html | 1 | ||||
| -rw-r--r-- | templates/base.html | 1 |
2 files changed, 1 insertions, 1 deletions
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 c2053d4..72dab34 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,6 +7,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> |