X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/81707e982741b7ab100156c3390ae245b1e9f777..1bb9f9ca3ffe077f2d90d7de65fbee37a717ef23:/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 47498d34de..f62bd5d4e3 100644 --- a/apps/workbench/app/views/users/_tables.html.erb +++ b/apps/workbench/app/views/users/_tables.html.erb @@ -1,84 +1,83 @@ <% if current_user.andand.is_active %>
Recent jobs + <%= link_to '(refresh)', request.fullpath, class: 'refresh', remote: true, method: 'get' %> <%= link_to raw("Show all jobs →"), jobs_path, class: 'pull-right' %> <% if not current_user.andand.is_active or @my_jobs.empty? %>

(None)

<% else %> - - - - - - - + + + + + + + + - - - - - - + + + + + + + <% @my_jobs[0..6].each do |j| %> - + - + @@ -89,52 +88,57 @@
Recent pipeline instances - <%= link_to raw("Show all pipeline instances →"), jobs_path, class: 'pull-right' %> + <%= link_to '(refresh)', request.fullpath, class: 'refresh', remote: true, method: 'get' %> + <%= link_to raw("Show all pipeline instances →"), pipeline_instances_path, class: 'pull-right' %> <% if not current_user.andand.is_active or @my_pipelines.empty? %>

(None)

<% else %>
ScriptOutputLogAgeStatus
ScriptOutputLogAgeStatusProgress
- <%= 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| %> - <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %> - <% end %> - <% end %> - + + <% 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 %> + - <% end %> - + <% end %> + <% 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.is_a? String %> + <% buf = j.log_buffer.strip.split("\n").last %> + <%= buf %> <% end %> - <%= raw(distance_of_time_in_words(j.created_at, Time.now).sub('about -','~').sub(' ',' ')) if j.created_at %> + <%= raw(distance_of_time_in_words(j.created_at, Time.now).sub('about ','~').sub(' ',' ')) if j.created_at %> - <% 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} %> +
- - - + + + + + - - - + + + + + <% @my_pipelines[0..6].each do |p| %> - + + + + <% end %>
Pipeline templateAgeStatusInstanceTemplateAgeStatusProgress
- <% 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 %> - <%= raw(distance_of_time_in_words(p.created_at, Time.now).sub('about -','~').sub(' ',' ')) if p.created_at %> + <%= link_to_if_arvados_object p.pipeline_template_uuid, friendly_name: true %> - <% if p.success %> - finished - <% elsif p.success == false %> - failed - <% elsif p.active %> - running - <% else %> - queued - <% end %> + + <%= raw(distance_of_time_in_words(p.created_at, Time.now).sub('about ','~').sub(' ',' ')) if p.created_at %> + + + <%= render partial: 'pipeline_status_label', locals: {:p => p} %> +
+ <%= render partial: 'pipeline_progress', locals: {:p => p} %> +
+
@@ -143,15 +147,20 @@
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? %> @@ -160,25 +169,27 @@ - - + + + - - - + + + + <% @my_collections[0..6].each do |c| %> - + + <% end %>
ContentsTagsAgeContentsTagsAgeStorage
- - <% c.files.each do |file| %> - <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %> - <% end %> - + + <% c.files.each do |file| %> + <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %> + <% end %> + @@ -190,10 +201,12 @@ - <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about -','~').sub(' ',' ')) if c.created_at %> + <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about ','~').sub(' ',' ')) if c.created_at %> + <%= render partial: 'collections/toggle_persist', locals: { uuid: c.uuid, current_state: @persist_state[c.uuid] } %> +
@@ -201,5 +214,32 @@
<% 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 %> +setInterval(function(){$('a.refresh:eq(0)').click()}, 60000); <% end %>