X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/27f5c1635d56c3f3cb6c5ef069c28db939eec2a1..ec75fda0fc2c86a77d831dcd7962ece7a2d6ae6d:/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb diff --git a/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb b/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb index e9a01dc253..f918e24e9d 100644 --- a/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb @@ -1,10 +1,3 @@ -<%= content_for :tab_line_buttons do %> -<%= form_tag({action: 'compare', controller: params[:controller], method: 'get'}, {method: 'get', id: 'compare', class: 'pull-right small-form-margin'}) do |f| %> - <%= submit_tag 'Compare 2 or 3 selected', {class: 'btn btn-primary', disabled: true, style: 'display: none'} %> -   -<% end rescue nil %> -<% end %> - <%= render partial: "paging", locals: {results: @objects, object: @object} %> <%= form_tag do |f| %> @@ -31,7 +24,7 @@ Owner - Age + Created at @@ -52,20 +45,20 @@ <%= link_to_if_arvados_object ob.owner_uuid, friendly_name: true %> - <%= distance_of_time_in_words(ob.created_at, Time.now) %> + <%= ob.created_at.to_s %> <%= render partial: 'delete_object_button', locals: {object:ob} %> - + <% ob.components.each do |cname, c| %> - <% if c[:job] %> - <%= render partial: "job_status_label", locals: {:j => c[:job], :title => cname.to_s } %> + <% if c.is_a?(Hash) and c[:job] %> + <%= render partial: "job_progress", locals: {:j => c[:job], :title => cname.to_s, :show_progress_bar => false } %> <% else %> - <%= cname.to_s %> + <%= cname.to_s %> <% end %> <% end %> @@ -78,22 +71,3 @@ <% end %> <%= render partial: "paging", locals: {results: @objects, object: @object} %> - -<% content_for :footer_js do %> -var showhide_compare = function() { - var form = $('form#compare')[0]; - $('input[type=hidden][name="uuids[]"]', form).remove(); - $('input[type=submit]', form).prop('disabled',true).show(); - var checked_inputs = $('input[name="uuids[]"]:checked'); - if (checked_inputs.length >= 2 && checked_inputs.length <= 3) { - checked_inputs.each(function(){ - if(this.checked) { - $('input[type=submit]', form).prop('disabled',false).show(); - $(form).append($('').val(this.value)); - } - }); - } -}; -$('form input[name="uuids[]"]').on('click', showhide_compare); -showhide_compare(); -<% end %>