X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ce02e1cb45e3189e5dbf9f517cc09ab3aaf1934f..6232434d6b86192b0531bacd7e4f0d5ae589f368:/apps/workbench/app/views/users/_tables.html.erb diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb index cec0d87e6d..9e1c220fd6 100644 --- a/apps/workbench/app/views/users/_tables.html.erb +++ b/apps/workbench/app/views/users/_tables.html.erb @@ -1,18 +1,20 @@ <% if current_user.andand.is_active %>
(None)
<% else %> -Script | @@ -20,23 +22,24 @@Log | Age | Status | +Progress | |
---|---|---|---|---|---|
- <%= link_to j.script[0..31], job_path(j.uuid) %> + <%= link_to((j.script.andand[0..31] || j.uuid), job_path(j.uuid)) %> |
- <% if j.success %>
+ <% if j.success and j.output %>
- <% Collection.limit(1).where(uuid: j.output).each do |c|
- c.files.each do |file| %>
+ <% Collection.limit(1).where(uuid: j.output).each do |c| %>
+ <% c.files.each do |file| %>
<%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %>
<% end %>
<% end %>
@@ -49,7 +52,15 @@
<% if j.log %>
- Log
+ <% fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(j.log)%>
+ <% Collection.limit(1).where(uuid: fixup[1]).each do |c| %>
+ <% c.files.each do |file| %>
+ Log
+ <% end %>
+ <% end %>
+ <% elsif j.respond_to? :log_buffer and j.log_buffer %>
+ <% buf = j.log_buffer.strip.split("\n").last %>
+ <%= buf %>
<% end %>
|
@@ -62,19 +73,12 @@
|
- <% if j.success %>
- finished
- <% elsif j.success == false %>
- failed
- <% elsif j.running and j.started_at and not j.finished_at %>
- <% percent_total_tasks = 100 / (j.tasks_summary[:running] + j.tasks_summary[:done] + j.tasks_summary[:todo]) rescue 0 %>
-
-
-
-
- <% else %>
- queued
- <% end %>
+ <%= render partial: 'job_status_label', locals: {:j => j} %>
+ |
+
+
+ <%= render partial: 'job_progress', locals: {:j => j} %>
+
|
Pipeline template | +Instance | +Template | Age | Status | +Progress |
---|---|---|---|---|---|
- <% PipelineTemplate.limit(1).where(uuid: p.pipeline_template_uuid).each do |i| %> - <%= link_to i.name, pipeline_instance_path(p.uuid) %> - <% end %> + <%= link_to_if_arvados_object p.uuid, friendly_name: true %> + + | + ++ + <%= link_to_if_arvados_object p.pipeline_template_uuid, friendly_name: true %> | @@ -120,17 +133,14 @@- <% if p.success %> - finished - <% elsif p.success == false %> - failed - <% elsif p.active %> - running - <% else %> - queued - <% end %> + <%= render partial: 'pipeline_status_label', locals: {:p => p} %> | +
+
+ <%= render partial: 'pipeline_progress', locals: {:p => p} %>
+
+ |
(None)
<% else %> -Contents | +Tags | Age | + <% if @my_tag_links[c.uuid] %> + + <%= @my_tag_links[c.uuid].collect(&:name).join(", ") %> + + <% end %> + |
<%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about
@@ -178,5 +212,32 @@
<% else %>
- <%= image_tag "dax.png", style: "max-width=40%" %>
+
+
+
+<% end %>
+
+<% content_for :js do %>
+setInterval(function(){$('a.refresh:eq(0)').click()}, 60000);
<% end %>
+ <%= image_tag "dax.png", style: "max-width:100%" %>
+
+
+
+ Welcome to Arvados, <%= current_user.first_name %>!+
+
+ + Your account must be activated by an Arvados administrator. If this + is your first time accessing Arvados and would like to request + access, or you believe you are seeing the page in error, please + <%= link_to "contact us", Rails.configuration.activation_contact_link %>. + You should receive an email at the address you used to log in when + your account is activated. In the mean time, you can + <%= link_to "learn more about Arvados", "https://arvados.org/projects/arvados/wiki/Introduction_to_Arvados" %>, + and <%= link_to "read the Arvados user guide", "http://doc.arvados.org/user" %>. + ++ <%= link_to raw('Contact us ✉'), + Rails.configuration.activation_contact_link, class: "pull-right btn btn-primary" %> + |
---|