snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Fixes NixOS/hydra#402 (#424)

Browse source
This commit is contained in:
montag451 2017-08-10 14:16:24 +02:00 committed by Domen Kožar
parent 7e9b6acbce
commit 48609664a5
6 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

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

8
src/root/Makefile.am
View file

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

BIN
src/root/jquery-ui-1.8.5.custom.zip
View file

Binary file not shown.

9
src/root/layout.tt
View file

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

5
src/root/static/js/jquery/jquery-1.12.3.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

7
src/root/static/js/jquery/jquery-ui-1.10.4.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long