diff --git a/.gitignore b/.gitignore index 9855f3d1..eaa2bf6e 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ config stamp-h1 src/hydra-evaluator/hydra-evaluator src/hydra-queue-runner/hydra-queue-runner +src/root/static/fontawesome/ diff --git a/src/root/Makefile.am b/src/root/Makefile.am index 52a14ef3..640296b1 100644 --- a/src/root/Makefile.am +++ b/src/root/Makefile.am @@ -3,14 +3,16 @@ STATIC = \ $(wildcard static/images/*) \ $(wildcard static/css/*) \ static/js/bootbox.min.js \ + static/js/popper.min.js \ static/js/common.js \ - static/js/jquery/jquery-1.12.3.min.js \ + static/js/jquery/jquery-3.4.1.min.js \ static/js/jquery/jquery-ui-1.10.4.min.js FLOT = flot-0.8.3.zip -BOOTSTRAP = bootstrap-2.3.1.zip +BOOTSTRAP = bootstrap-4.3.1-dist.zip +FONTAWESOME = fontawesome-free-5.10.2-web.zip -ZIPS = $(FLOT) $(BOOTSTRAP) +ZIPS = $(FLOT) $(BOOTSTRAP) $(FONTAWESOME) EXTRA_DIST = $(TEMPLATES) $(STATIC) $(ZIPS) @@ -20,10 +22,16 @@ nobase_hydra_DATA = $(EXTRA_DIST) all: mkdir -p $(srcdir)/static/js unzip -u -d $(srcdir)/static $(BOOTSTRAP) + mv $(srcdir)/static/$(basename $(BOOTSTRAP)) $(srcdir)/static/bootstrap unzip -u -d $(srcdir)/static/js $(FLOT) + unzip -u -d $(srcdir)/static $(FONTAWESOME) + mv $(srcdir)/static/$(basename $(FONTAWESOME)) $(srcdir)/static/fontawesome install-data-local: $(ZIPS) mkdir -p $(hydradir)/static/js cp -prvd $(srcdir)/static/js/* $(hydradir)/static/js mkdir -p $(hydradir)/static/bootstrap cp -prvd $(srcdir)/static/bootstrap/* $(hydradir)/static/bootstrap + mkdir -p $(hydradir)/static/fontawesome/{css,webfonts} + cp -prvd $(srcdir)/static/fontawesome/css/* $(hydradir)/static/fontawesome/css + cp -prvd $(srcdir)/static/fontawesome/webfonts/* $(hydradir)/static/fontawesome/webfonts diff --git a/src/root/auth.tt b/src/root/auth.tt index b2466019..360904d9 100644 --- a/src/root/auth.tt +++ b/src/root/auth.tt @@ -31,26 +31,26 @@ [% ELSE %]