[ARVADOS] updated: 177a1468e06674e7ff0ff0730b8607fbbd78000b
git at public.curoverse.com
git at public.curoverse.com
Mon Sep 15 09:45:02 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/dates.js | 11 +
.../app/assets/javascripts/pipeline_instances.js | 2 +-
apps/workbench/app/assets/javascripts/tab_panes.js | 130 ++++-----
.../assets/stylesheets/pipeline_instances.css.scss | 10 +
apps/workbench/app/controllers/jobs_controller.rb | 6 +-
.../controllers/pipeline_instances_controller.rb | 35 ++-
apps/workbench/app/helpers/jobs_helper.rb | 1 +
.../app/helpers/pipeline_components_helper.rb | 1 +
.../app/helpers/pipeline_instances_helper.rb | 83 ++++++
apps/workbench/app/models/job.rb | 21 ++
.../app/views/application/_content.html.erb | 9 +-
.../views/application/_job_status_label.html.erb | 24 +-
.../app/views/application/_show_advanced.html.erb | 12 +-
.../pipeline_instances/_show_components.html.erb | 10 +-
.../_show_components_running.html.erb | 300 ++++++++++++++++-----
.../{show.html.erb => _show_tab_buttons.html.erb} | 35 +--
.../app/views/pipeline_instances/show.html.erb | 83 +++---
apps/workbench/app/views/projects/index.html.erb | 64 +----
.../pipeline_instances_controller_test.rb | 40 +++
services/api/app/models/job.rb | 11 +
20 files changed, 626 insertions(+), 262 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/dates.js
copy apps/workbench/app/views/pipeline_instances/{show.html.erb => _show_tab_buttons.html.erb} (51%)
create mode 100644 apps/workbench/test/controllers/pipeline_instances_controller_test.rb
via 177a1468e06674e7ff0ff0730b8607fbbd78000b (commit)
via f91bae113a348bb049f6391043f8ba9529def694 (commit)
via 8b9f3b877a6aa7ed81db48f83f3feb5ef4388164 (commit)
via 004e528060e42b45c8207e43892289b14f5aa2e5 (commit)
via 6386f2aca83b477210bda19a3284ea31463d2efc (commit)
via 9be9761666fd091496bee885b37598db9a6ab38a (commit)
via a0fc519db4f3664366c356d21a8478495f2ae78b (commit)
via 08b9ee71323c22fb04c183b09991ca3e6db712fd (commit)
via aadca3ff41a12a7a52a2a072696564b90537b9b3 (commit)
via 0313c6ef5ac52fc483718690b1a5902ad1c11e16 (commit)
from dcf5e0cef46e3aa3baba27da3f922b1c357ba3f3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 177a1468e06674e7ff0ff0730b8607fbbd78000b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Sep 15 09:44:57 2014 -0400
Remove projects panels from dashboard
diff --git a/apps/workbench/app/views/projects/index.html.erb b/apps/workbench/app/views/projects/index.html.erb
index 4288c69..1e6b333 100644
--- a/apps/workbench/app/views/projects/index.html.erb
+++ b/apps/workbench/app/views/projects/index.html.erb
@@ -1,62 +1,12 @@
<div>
- <div class="row">
- <div class="col-sm-6">
- <% if my_projects.empty? %>
- <div class="panel panel-info">
- <div class="panel-heading">
- <h3 class="panel-title">
- Welcome to <b><%= Rails.configuration.site_name %></b>.
- </h3>
- </div>
- <div class="panel-body">
- <img src="/favicon.ico" class="pull-right" alt="" style="opacity: 0.3"/>
- <p>
- This site runs Arvados, the open source biomedical analysis platform. <a href="https://arvados.org" target="_blank">Learn more…</a>
- </p>
- <p>
- <b>To get started,</b> create a project using the "Add new project" button below.
- </p>
- </div>
- </div>
- <% end %>
- <div class="panel panel-default">
- <div class="panel-heading">
- <div class="pull-right">
- <%= button_to projects_path(method: 'post'), class: 'btn btn-xs btn-primary' do %>
- <i class="fa fa-fw fa-plus"></i>
- Add new project
- <% end %>
- </div>
- <h3 class="panel-title">
- My projects
- </h3>
- </div>
- <div class="panel-body scroll-20em">
- <%= render partial: 'index_projects', locals: {tree: my_project_tree, show_root_node: true} %>
- </div>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">
- Projects shared with me
- </h3>
- </div>
- <div class="panel-body scroll-20em">
- <%= render partial: 'index_projects', locals: {tree: shared_project_tree, show_root_node: false} %>
- </div>
- </div>
- </div>
- </div>
<%= render partial: 'compute_node_status' %>
<div class="row">
- <div class="col-md-3">
+ <div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Pipelines running</div>
- <div class="panel-body">
+ <div class="panel-body" style="overflow-x: scroll;">
<% running_pipelines.each do |p| %>
<div>
<%= link_to_if_arvados_object p, friendly_name: true %>
@@ -67,11 +17,10 @@
<% end %>
</div>
</div>
- </div>
- <div class="col-md-4">
+
<div class="panel panel-default">
<div class="panel-heading">Recently finished pipelines</div>
- <div class="panel-body">
+ <div class="panel-body" style="overflow-x: scroll;">
<% finished_pipelines(8).each do |p| %>
<div>
<%= link_to_if_arvados_object p, friendly_name: true %>
@@ -80,7 +29,7 @@
</div>
</div>
</div>
- <div class="col-md-5">
+ <div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Recent collections</div>
<div class="panel-body" style="overflow-x: scroll;">
@@ -90,8 +39,7 @@
<i class="fa fa-fw fa-folder-o"></i><%= link_to_if_arvados_object r[:owners][p[:owner_uuid]], friendly_name: true %>/
<span class="pull-right"><%= p[:modified_at] %></span>
</div>
- <div style="margin-left: 1em">
- <i class="fa fa-fw fa-archive"></i><%= link_to_if_arvados_object p, friendly_name: true %>
+ <div style="margin-left: 1em"><%= link_to_if_arvados_object p, friendly_name: true %>
</div>
<% end %>
</div>
commit f91bae113a348bb049f6391043f8ba9529def694
Merge: dcf5e0c 8b9f3b8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Sep 15 09:41:46 2014 -0400
Merge branch '3187-pipeline-instance-page' into 3605-improved-dashboard
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list