From 230a0387d2d03eae851011fd77ea9a5d09108b7f Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Tue, 30 Jul 2019 17:51:24 -0400 Subject: [PATCH] Update boostrap to latest 4.3.1 Co-authored-by: Graham Christensen ... but just fixing up merge conflicts from the introduction of flakes and the removal of the Jobs table. --- src/root/Makefile.am | 4 +- src/root/auth.tt | 34 ++-- src/root/bootstrap-2.3.1.zip | Bin 85566 -> 0 bytes src/root/bootstrap-4.3.1-dist.zip | Bin 0 -> 713622 bytes src/root/build.tt | 82 +++++----- src/root/common.tt | 30 ++-- src/root/dashboard.tt | 6 +- src/root/edit-jobset.tt | 214 +++++++++++++------------ src/root/edit-project.tt | 114 +++++++------ src/root/job.tt | 8 +- src/root/jobset-eval.tt | 46 +++--- src/root/jobset-jobs-tab.tt | 15 +- src/root/jobset.tt | 23 ++- src/root/layout.tt | 38 ++--- src/root/news.tt | 26 ++- src/root/project.tt | 34 ++-- src/root/static/css/hydra.css | 5 - src/root/static/images/ajax-loader.gif | Bin 3208 -> 0 bytes src/root/static/js/common.js | 4 +- src/root/topbar.tt | 63 ++++---- src/root/user.tt | 190 +++++++++++----------- src/root/users.tt | 4 +- 22 files changed, 462 insertions(+), 478 deletions(-) delete mode 100644 src/root/bootstrap-2.3.1.zip create mode 100644 src/root/bootstrap-4.3.1-dist.zip delete mode 100644 src/root/static/images/ajax-loader.gif diff --git a/src/root/Makefile.am b/src/root/Makefile.am index 506bf597..f3e52cdd 100644 --- a/src/root/Makefile.am +++ b/src/root/Makefile.am @@ -8,7 +8,7 @@ STATIC = \ 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 ZIPS = $(FLOT) $(BOOTSTRAP) @@ -26,4 +26,4 @@ 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 + cp -prvd $(srcdir)/static/$(basename $(BOOTSTRAP))/* $(hydradir)/static/bootstrap 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 %]