X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4294d04bb1a79fed6c0d0adf812b6e9918722a2a..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 37aabe3006..9e1c220fd6 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -12,7 +12,8 @@
-
+
+
@@ -21,19 +22,20 @@
Log |
Age |
Status |
+ Progress |
<% @my_jobs[0..6].each do |j| %>
- <%= 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| %>
@@ -50,11 +52,15 @@
<% if j.log %>
- <% Collection.limit(1).where(uuid: j.log).each do |c| %>
+ <% 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 %>
|
@@ -67,29 +73,11 @@
|
- <% if j.success %>
- finished
- <% elsif j.success == false %>
- failed
- <% elsif j.finished_at %>
- finished?
- <% elsif j.started_at %>
- running
- <% else %>
- queued
- <% end %>
- <% percent_total_tasks = 100 / (j.tasks_summary[:running] + j.tasks_summary[:done] + j.tasks_summary[:todo]) rescue 0 %>
-
-
-
-
-
-
- <% if j.success == false %>
-
-
- <% end %>
-
+ <%= render partial: 'job_status_label', locals: {:j => j} %>
+ |
+
+
+ <%= render partial: 'job_progress', locals: {:j => j} %>
|
@@ -111,7 +99,8 @@
-
+
+
@@ -119,6 +108,7 @@
Template |
Age |
Status |
+ Progress |
<% @my_pipelines[0..6].each do |p| %>
@@ -143,38 +133,14 @@
- <% if p.success %>
- finished
- <% elsif p.success == false %>
- failed
- <% elsif p.active and p.modified_at < 30.minutes.ago %>
- stopped
- <% elsif p.active %>
- running
- <% else %>
- queued
- <% end %>
+ <%= render partial: 'pipeline_status_label', locals: {:p => p} %>
+ |
- <% summary = pipeline_summary p %>
-
-
-
-
- <% if p.success == false %>
-
-
- <% else %>
-
-
-
-
-
-
- <% end %>
-
+
+
+ <%= render partial: 'pipeline_progress', locals: {:p => p} %>
|
-
<% end %>
@@ -185,14 +151,18 @@
Recent collections
<%= link_to '(refresh)', request.fullpath, class: 'refresh', remote: true, method: 'get' %>
<%= link_to raw("Show all collections →"), collections_path, class: 'pull-right' %>
-
+
<%= form_tag collections_path,
method: 'get',
class: 'form-search small-form-margin' do %>
-
- <%= text_field_tag :search, params[:search], class: 'search-query search-mini' %>
- <%= submit_tag "Search", name: nil, class: 'btn btn-mini btn-info' %>
-
+
+ <%= text_field_tag :search, params[:search], class: 'form-control', placeholder: 'Search' %>
+
+ <%= button_tag(class: 'btn btn-info') do %>
+
+ <% end %>
+
+
<% end %>
<% if not current_user.andand.is_active or @my_collections.empty? %>
@@ -242,7 +212,30 @@
<% else %>
- <%= image_tag "dax.png", style: "max-width=40%" %>
+
+
+
+ <%= 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" %>
+
+
+
<% end %>
<% content_for :js do %>