Commit 47199c35 authored by Annabel Dunstone's avatar Annabel Dunstone

Add clock and calendar icons for duration and finished at; add finished at section in pipelines

parent 33b4fc31
...@@ -57,10 +57,12 @@ ...@@ -57,10 +57,12 @@
%td.duration %td.duration
- if build.duration - if build.duration
= icon("clock-o")
#{duration_in_words(build.finished_at, build.started_at)} #{duration_in_words(build.finished_at, build.started_at)}
%td.timestamp %td.timestamp
- if build.finished_at - if build.finished_at
= icon("calendar")
%span #{time_ago_with_tooltip(build.finished_at)} %span #{time_ago_with_tooltip(build.finished_at)}
- if defined?(coverage) && coverage - if defined?(coverage) && coverage
......
...@@ -45,7 +45,12 @@ ...@@ -45,7 +45,12 @@
%td %td
- if pipeline.started_at && pipeline.finished_at - if pipeline.started_at && pipeline.finished_at
%p.duration %p.duration
= icon("clock-o")
= duration_in_numbers(pipeline.finished_at, pipeline.started_at) = duration_in_numbers(pipeline.finished_at, pipeline.started_at)
- if pipeline.finished_at
%p.duration
= icon("calendar")
#{time_ago_with_tooltip(pipeline.finished_at)}
%td %td
.controls.hidden-xs.pull-right .controls.hidden-xs.pull-right
......
...@@ -50,10 +50,12 @@ ...@@ -50,10 +50,12 @@
%td.duration %td.duration
- if generic_commit_status.duration - if generic_commit_status.duration
= icon("clock-o")
#{duration_in_words(generic_commit_status.finished_at, generic_commit_status.started_at)} #{duration_in_words(generic_commit_status.finished_at, generic_commit_status.started_at)}
%td.timestamp %td.timestamp
- if generic_commit_status.finished_at - if generic_commit_status.finished_at
= icon("calendar")
%span #{time_ago_with_tooltip(generic_commit_status.finished_at)} %span #{time_ago_with_tooltip(generic_commit_status.finished_at)}
- if defined?(coverage) && coverage - if defined?(coverage) && coverage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment