| Message ID | 1440440620-25937-2-git-send-email-damien.lespiau@intel.com |
|---|---|
| State | Changes Requested |
| Headers | show |
Looks good.
Acked-by: Stephen Finucane <stephen.finucane@intel.com>
On Wed, Sep 09, 2015 at 02:30:02PM +0100, Finucane, Stephen wrote: > Looks good. > > Acked-by: Stephen Finucane <stephen.finucane@intel.com> Pushed patche 1,2,3 and 6 for the next pull requests. Note I may just include the last two, given that hey add new tests that are passing on both my laptop and a jenkins instance.
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>
Bootstrap needs jquery for its own JS facilities, so include it on every page. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> --- patchwork/templates/patchwork/bundle.html | 1 - templates/base.html | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)