From ea133382b05b7010abd36a3ad9a02e652cea2b01 Mon Sep 17 00:00:00 2001 From: Oliver Giles Date: Sat, 2 Dec 2017 18:30:45 +0200 Subject: [PATCH] improve run status icon consistency --- CMakeLists.txt | 2 +- src/resources.cpp | 4 +++- src/resources/cross.gif | Bin 0 -> 178 bytes src/resources/index.html | 4 ++-- src/resources/js/app.js | 2 +- src/resources/progress.gif | Bin 2545 -> 0 bytes src/resources/progress.png | Bin 816 -> 0 bytes src/resources/spin.gif | Bin 0 -> 3475 bytes src/resources/tick.gif | Bin 0 -> 114 bytes 9 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 src/resources/cross.gif delete mode 100644 src/resources/progress.gif delete mode 100644 src/resources/progress.png create mode 100644 src/resources/spin.gif create mode 100644 src/resources/tick.gif 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 0000000000000000000000000000000000000000..5edbccb6d36b45954ee1aaf4c792c0f79fad2ad8 GIT binary patch literal 178 zcmZ?wbh9u|1`3=>J98!tD3S)$MI_K+00NL*46Nn~3Vq5>N}a}H?FL#0mBbva`5YZCnB9EB m*xb!>;3{{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 b6cab7ef3d9a609c7312adf46e60fd6c9951956b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2545 zcma*pYg82H83*u}xzFs(Fe_@5+IE>8!m z|L2(}Os@-Am@o&-0WSe~^XAR`C9z*T{POkd|9tz`XBRGAd;Z<`?OmsC-~H3^f%9KJ z`gZ8t@g#Q|H^Hg{AyL8 z_uSc~MXS@Q8eG>bFET12lq6Be$Yf(oiMiZbQD|y_KWX4G8cp1_p@~9Ky2&%U9y{#K zL-inaQFzcm`q8N54V#n*Z2{DY)qQH3E`&zI^uY{$^ZKc-J;K=eW-LwZ_M^&aI^m>) zFrpF(NZ!0oRaZxrtmCmYvU9Q{R$_PYdFo#mmFju zdTU{=3GoOh-JcIIj}VXKQ<@UlGwtv7zR@A}sbSCms2csi!Xfsqj+23tE*@agJ^Qf#TQPTaoJet(q* zKaU-$ZXY2o0SjF8h0KQW~qQ(|atL zq=eNPCRJbViBTR@u%2_4N}V}dWwmC1U4zBmX7NIrt%pnG4070l^_0OU{kwtJv7YYJ zy}Vi5e0uM3fCcxKY5u4+_8T?*Wj({Ao@Yne&rkdWK&AsuI{kU@D*lXloq;y3!o}A+I^neoPHO3^`vLg`oa;MTchvGo<*{H78 zl`71S3GkY5hvU^uvc5FO@%c;CG|sX(&4`tutg5LsA3T)O$iw9ZPw~RC{47U2VNu7) zVM{V*1f6n@l}4Wx%G-FWK%MCc!ahUV-7WE!j=MW=Ezf6sO3&O7u9=H}$`v|Ya>^mm za7j%Igrce|_6l3Pl~yY+FR?&Qk}8+ERPk36vPg3ruN&>I`3~uKiI1H0K5qPcGI5qa z7cPUqbe42=wzR~!CT=LshnOn$j}TY?D^$4P=I#mdxTZ4@^)GPUxYyyX&h zyE~I%fJNfQ^_w@T$Qat0U9(=bqXjThX8|$#*#Q=WOF5HA%sN0x*)C+uO~6Tq)W$2q z$4%#2-KR2zO@|zJK;q{lHL;!TRb7E>sG7PIt{U{3fy@RTX{tFFqKw?GGK4N#q3{h~ z+2sT~x!g&U!?PwQ%4QZXv(j;^=01HdHGcO|4lP--*46sTpp99vME|Z+F-EL7sI<&d zSXakX?b@wJaY^j*9R;u`jN>;IZ&pc`5l8G>Vt9^AWbqBk2p?x>o@B!dG|QyYV0J|B zS3Du7S$ni_(R*LPV8N6CpDyTi2qyg;f`qpMnj23c2CV}_EqYniDDiAm8t1}(ViOS#liPBJH%Cp&` zmGF*aPnzUvlhSvK4OqKz-9|DQLp6|u+?L}kRcwAAC%tpzoD}ErGeCk9xvVr6uq=+yrxeHl{*V!GjNoTdytfh?k&G5&z-qrdiPG1vdAY>#M2?7F)5 z+BZ+@7vIcW;GP}nPaqF}-S#ZH;41jXgK$pKue%3adw<)!W!P$nS8@Ki*j{D9Cx$&` zVJ20!oWiA~jzH-YPAu;Vl_;d-kd);@B#8{|L)rCkyBuc~1d&Rj-mNsdACMy)3GH@f zwK%?llw=_+J@6S1ktyzd!X;sGIT*^Cf{@c8Z{zgKAoJcq{_-Mw_*m~#lmF#z_1%f| zvrbiE!aohC7^+Z{V7~P{CoexGLl+$cZ<8Y=E73tTw3esEGB0-*JFgZ{tTP>gZf1z3 zt$II!#1(r1jCKb45_ly*(K?jcf#Z6TTycIoh7!(}WJj=JMP}I7_a%UzSNy&xl&|bP_Ehj>t4)1R>!NHwoGZ`D3}ERzW;@1+ zcTr?ou-BI33#Z8u36AOzh_dp8SnDW}hlmimg@HC4UXUQ5ZGeh`>0^Pu5E%#P zLIBZPorKh*4eyWTVq`CWV}Fm%Png_blMm-kF(lI&13xm>u~6z9aR6D4*bpDb08(LI zCJrFw!BSx-cfJK#^DKOCXru?f{Rym?=Un2`=U<<9UOM(DAUnCFWoARBS54MfbM4C4 zZ+Oq9*Z4; diff --git a/src/resources/progress.png b/src/resources/progress.png deleted file mode 100644 index 5f548c3bbec0675822783d4bd3bfaa0f4a139b26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 816 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 literal 0 HcmV?d00001 diff --git a/src/resources/tick.gif b/src/resources/tick.gif new file mode 100644 index 0000000000000000000000000000000000000000..d862b8e2f9e889fb7784bc0721f35a6d0e636017 GIT binary patch literal 114 zcmZ?wbh9u|