Fixes NixOS/hydra#402 (#424)

.gitignore

@@ -22,7 +22,6 @@ Makefile.in
 /src/hydra-eval-jobs/hydra-eval-jobs
 /src/root/static/bootstrap
 /src/root/static/js/flot
-/src/root/static/js/jquery
 /doc/manual/images
 /doc/manual/manual.html
 /doc/manual/manual.pdf

src/root/Makefile.am

@@ -3,13 +3,14 @@ STATIC = \
   $(wildcard static/images/*) \
   $(wildcard static/css/*) \
   static/js/bootbox.min.js \
-  static/js/common.js
+  static/js/common.js \
+  static/js/jquery/jquery-1.12.3.min.js \
+  static/js/jquery/jquery-ui-1.10.4.min.js
 
 FLOT = flot-0.8.3.zip
-JQUERY = jquery-ui-1.8.5.custom.zip
 BOOTSTRAP = bootstrap-2.3.1.zip
 
-ZIPS = $(FLOT) $(JQUERY) $(BOOTSTRAP)
+ZIPS = $(FLOT) $(BOOTSTRAP)
 
 EXTRA_DIST = $(TEMPLATES) $(STATIC) $(ZIPS)
 
@@ -18,7 +19,6 @@ nobase_hydra_DATA = $(EXTRA_DIST)
 
 all:
 	mkdir -p $(srcdir)/static/js
-	unzip -u -d $(srcdir)/static/js/jquery $(JQUERY)
 	unzip -u -d $(srcdir)/static $(BOOTSTRAP)
 	unzip -u -d $(srcdir)/static/js $(FLOT)
 

src/root/layout.tt

@@ -11,13 +11,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
 
-    <script src="https://code.jquery.com/jquery-1.12.3.js"
-            integrity="sha256-1XMpEtA4eKXNNpXcJ1pmMPs8JV+nwLdEqwiJeCQEkyc="
-            crossorigin="anonymous"></script>
-
-    <script src="https://code.jquery.com/ui/1.10.4/jquery-ui.js"
-            integrity="sha256-tp8VZ4Y9dg702r7D6ynzSavKSwB9zjariSZ4Snurvmw="
-            crossorigin="anonymous"></script>
+    <script type="text/javascript" src="[% c.uri_for("/static/js/jquery/jquery-1.12.3.min.js") %]"></script>
+    <script type="text/javascript" src="[% c.uri_for("/static/js/jquery/jquery-ui-1.10.4.min.js") %]"></script>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />