diff --git a/CMakeLists.txt b/CMakeLists.txt index f7cfb96..634ea3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ add_custom_command(OUTPUT laminar.capnp.c++ laminar.capnp.h # Zip and compile statically served resources generate_compressed_bins(${CMAKE_SOURCE_DIR}/src/resources index.html js/app.js - favicon.ico favicon-152.png icon.png progress.gif) + favicon.ico favicon-152.png icon.png tick.gif cross.gif spin.gif) # Download 3rd-party frontend JS libs... file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js diff --git a/src/resources.cpp b/src/resources.cpp index 90e3662..f2e3931 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -36,8 +36,10 @@ Resources::Resources() INIT_RESOURCE("/", index_html, CONTENT_TYPE_HTML); INIT_RESOURCE("/favicon.ico", favicon_ico, CONTENT_TYPE_ICO); INIT_RESOURCE("/favicon-152.png", favicon_152_png, CONTENT_TYPE_PNG); - INIT_RESOURCE("/progress.gif", progress_gif, CONTENT_TYPE_GIF); INIT_RESOURCE("/icon.png", icon_png, CONTENT_TYPE_PNG); + INIT_RESOURCE("/tick.gif", tick_gif, CONTENT_TYPE_GIF); + INIT_RESOURCE("/cross.gif", cross_gif, CONTENT_TYPE_GIF); + INIT_RESOURCE("/spin.gif", spin_gif, CONTENT_TYPE_GIF); INIT_RESOURCE("/js/app.js", js_app_js, CONTENT_TYPE_JS); INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js, CONTENT_TYPE_JS); INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js, CONTENT_TYPE_JS); diff --git a/src/resources/cross.gif b/src/resources/cross.gif new file mode 100644 index 0000000..5edbccb Binary files /dev/null and b/src/resources/cross.gif differ diff --git a/src/resources/index.html b/src/resources/index.html index ab52b56..a8f306d 100644 --- a/src/resources/index.html +++ b/src/resources/index.html @@ -48,7 +48,7 @@ {{job.name}} queued - {{job.name}} #{{job.number}} + {{job.name}} #{{job.number}} {{formatDuration(job.started, job.completed)}}
@@ -149,7 +149,7 @@ {{nQueued}} run(s) queued - #{{job.number}} + #{{job.number}} {{formatDate(job.started)}} {{formatDuration(job.started, job.completed)}} {{job.reason}} diff --git a/src/resources/js/app.js b/src/resources/js/app.js index c843542..b75e5ac 100644 --- a/src/resources/js/app.js +++ b/src/resources/js/app.js @@ -54,7 +54,7 @@ const WebsocketHandler = function() { const Utils = { methods: { runIcon(result) { - return result === "success" ? '' : result === "failed" || result === "aborted" ? '' : ''; + return result === "success" ? '' : result === "failed" || result === "aborted" ? '' : ''; }, formatDate: function(unix) { // TODO: reimplement when toLocaleDateString() accepts formatting options on most browsers diff --git a/src/resources/progress.gif b/src/resources/progress.gif deleted file mode 100644 index b6cab7e..0000000 Binary files a/src/resources/progress.gif and /dev/null differ diff --git a/src/resources/progress.png b/src/resources/progress.png deleted file mode 100644 index 5f548c3..0000000 Binary files a/src/resources/progress.png and /dev/null differ diff --git a/src/resources/spin.gif b/src/resources/spin.gif new file mode 100644 index 0000000..40fa944 Binary files /dev/null and b/src/resources/spin.gif differ diff --git a/src/resources/tick.gif b/src/resources/tick.gif new file mode 100644 index 0000000..d862b8e Binary files /dev/null and b/src/resources/tick.gif differ