[ARVADOS] updated: 6a9589b47e553bc3576c3f12492de68962af50d3

git at public.curoverse.com git at public.curoverse.com
Thu Oct 2 20:09:04 EDT 2014


Summary of changes:
 .../views/application/_title_and_buttons.html.erb  |  12 +-
 apps/workbench/app/views/jobs/show.html.erb        |   8 +-
 .../app/views/pipeline_templates/show.html.erb     |   4 +-
 apps/workbench/app/views/projects/show.html.erb    |   6 +-
 apps/workbench/test/integration/projects_test.rb   |   2 +-
 services/api/config/application.default.yml        |  26 +++-
 services/api/script/crunch-dispatch.rb             | 158 ++++++++++++++-------
 7 files changed, 141 insertions(+), 75 deletions(-)

       via  6a9589b47e553bc3576c3f12492de68962af50d3 (commit)
       via  e8b1da0f4cf859ba6bc34e4390fbad097d7a00d9 (commit)
       via  60998a3875f79482533976e6e0ee0f99a9589c46 (commit)
       via  89e7c751bc5eb9ac467f607c9e172e44c1690f4c (commit)
       via  2fcc6fabb45befcc2ee4fe237744d6e3df5c4e39 (commit)
       via  9378424698db0e02856d09586333cac9142331b2 (commit)
       via  bd99df2e6c5f7bb0b75c7fa2f1a9c1c2defeca8a (commit)
       via  e910d13fc5fc63a86f20be3b758c08db3d429bc6 (commit)
       via  3ff644b461b69c38418384e532e3741a07333daf (commit)
       via  54a951255316417a42a3bd8c77aaa0b58d180440 (commit)
      from  62790d76daf181a457d8f47741721967cd9cb7d9 (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 6a9589b47e553bc3576c3f12492de68962af50d3
Merge: e8b1da0 60998a3
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 2 20:08:54 2014 -0400

    Merge branch 'master' into 4025-move-project-button-label


commit e8b1da0f4cf859ba6bc34e4390fbad097d7a00d9
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 2 20:07:11 2014 -0400

    4025: add tooltips to some of the tab line buttons and also adjust the title of the "Move" button.

diff --git a/apps/workbench/app/views/application/_title_and_buttons.html.erb b/apps/workbench/app/views/application/_title_and_buttons.html.erb
index e1ec160..c2bd726 100644
--- a/apps/workbench/app/views/application/_title_and_buttons.html.erb
+++ b/apps/workbench/app/views/application/_title_and_buttons.html.erb
@@ -1,3 +1,4 @@
+<% object_class = @object.class_for_display.downcase %>
 <% content_for :page_title do %>
   <%= (@object.respond_to?(:properties) and !@object.properties.nil? ? @object.properties[:page_title] : nil) ||
       @name_link.andand.name ||
@@ -15,7 +16,7 @@
     <% if @object.class.copies_to_projects? %>
       <%= link_to(
           choose_projects_path(
-           title: 'Copy to project...',
+           title: "Copy this #{object_class} to:",
            action_name: 'Copy',
            action_href: actions_path,
            action_method: 'post',
@@ -25,14 +26,14 @@
              selection_param: 'uuid',
              success: 'redirect-to-created-object'
            }.to_json),
-          { class: "btn btn-sm btn-primary", remote: true, method: 'get' }) do %>
+          { class: "btn btn-sm btn-primary", remote: true, method: 'get', title: "Copy this #{object_class} to a different project" }) do %>
         <i class="fa fa-fw fa-copy"></i> Copy to project...
       <% end %>
     <% end %>
     <% if @object.owner_uuid == current_user.uuid or (Group.find(@object.owner_uuid).writable_by.include?(current_user.uuid) rescue nil) %>
       <%= link_to(
           choose_projects_path(
-           title: 'Move to project...',
+           title: "Move this #{object_class} to:",
            action_name: 'Move',
            action_href: actions_path,
            action_method: 'post',
@@ -42,10 +43,9 @@
              selection_param: 'uuid',
              success: 'redirect-to-created-object'
            }.to_json),
-          { class: "btn btn-sm btn-primary", remote: true, method: 'get' }) do %>
-        <i class="fa fa-fw fa-truck"></i> Move to project...
+          { class: "btn btn-sm btn-primary", remote: true, method: 'get', title: "Move this #{object_class} to a different project"}) do %>
+        <i class="fa fa-fw fa-truck"></i> Move...
       <% end %>
     <% end %>
   <% end %>
 <% end %>
-
diff --git a/apps/workbench/app/views/jobs/show.html.erb b/apps/workbench/app/views/jobs/show.html.erb
index 276aec5..f452372 100644
--- a/apps/workbench/app/views/jobs/show.html.erb
+++ b/apps/workbench/app/views/jobs/show.html.erb
@@ -11,7 +11,9 @@
       <% [:script_parameters, :runtime_constraints].each do |d| %>
         <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
       <% end %>
-      <%= button_tag "Re-run same version", {class: 'btn btn-sm btn-primary', id: "re-run-same-job-button"} %>
+      <%= button_tag "Re-run same version", {class: 'btn btn-sm btn-primary', id: "re-run-same-job-button", title: 'Re-run job using the same script version as this run'} do %>
+        <i class="fa fa-gear"></i> Re-run same version
+      <% end %>
     <% end %>
   <% if @object.respond_to? :supplied_script_version and !@object.supplied_script_version.nil? and !@object.supplied_script_version.empty? and @object.script_version != @object.supplied_script_version%>
       <%= form_tag '/jobs', style: "display:inline" do |f| %>
@@ -22,7 +24,9 @@
       <% [:script_parameters, :runtime_constraints].each do |d| %>
         <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
       <% end %>
-      <%= button_tag "Re-run latest version", {class: 'btn btn-sm btn-primary', id: "re-run-latest-job-button"} %>
+      <%= button_tag "Re-run latest version", {class: 'btn btn-sm btn-primary', id: "re-run-latest-job-button", title: 'Re-run job using the latest script version'} do%>
+        <i class="fa fa-gear"></i> Re-run latest version
+      <% end %>
     <% end %>
   <% end %>
 <% end %>
diff --git a/apps/workbench/app/views/pipeline_templates/show.html.erb b/apps/workbench/app/views/pipeline_templates/show.html.erb
index 57129df..02ebd6d 100644
--- a/apps/workbench/app/views/pipeline_templates/show.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/show.html.erb
@@ -10,9 +10,9 @@
                                                    'pipeline_instance[description]' => "Created at #{Time.now.localtime}" + (@object.name.andand.size.andand>0 ? " using the pipeline template *#{@object.name}*" : ""),
                                                    'success' => 'redirect-to-created-object'
                                                   }.to_json),
-                { class: "btn btn-primary btn-sm", remote: true, method: 'get' }
+                { class: "btn btn-primary btn-sm", remote: true, method: 'get', title: 'Run this pipeline' }
                ) do %>
-                   Run this pipeline
+                   <i class="fa fa-gear"></i> Run this pipeline
                  <% end %>
 <% end %>
 
diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index cff8bbd..0429f33 100644
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -14,7 +14,7 @@
 	    action_href: actions_path(id: @object.uuid),
 	    action_method: 'post',
 	    action_data: {selection_param: 'selection[]', copy_selections_into_project: @object.uuid, success: 'page-refresh'}.to_json),
-	  { class: "btn btn-primary btn-sm", remote: true, method: 'get', data: {'event-after-select' => 'page-refresh'} }) do %>
+	  { class: "btn btn-primary btn-sm", remote: true, method: 'get', title: "Add data to this project", data: {'event-after-select' => 'page-refresh'} }) do %>
       <i class="fa fa-fw fa-plus"></i> Add data...
     <% end %>
     <%= link_to(
@@ -24,10 +24,10 @@
 	    action_href: pipeline_instances_path,
 	    action_method: 'post',
 	    action_data: {'selection_param' => 'pipeline_instance[pipeline_template_uuid]', 'pipeline_instance[owner_uuid]' => @object.uuid, 'success' => 'redirect-to-created-object'}.to_json),
-	  { class: "btn btn-primary btn-sm", remote: true, method: 'get' }) do %>
+	  { class: "btn btn-primary btn-sm", remote: true, method: 'get', title: "Run a pipeline in this project" }) do %>
       <i class="fa fa-fw fa-gear"></i> Run a pipeline...
     <% end %>
-    <%= link_to projects_path({'project[owner_uuid]' => @object.uuid, 'options' => {'ensure_unique_name' => true}}), method: 'post', class: 'btn btn-sm btn-primary' do %>
+    <%= link_to projects_path({'project[owner_uuid]' => @object.uuid, 'options' => {'ensure_unique_name' => true}}), method: 'post', title: "Add a subproject to this project", class: 'btn btn-sm btn-primary' do %>
       <i class="fa fa-fw fa-plus"></i>
       Add a subproject
     <% end %>
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index ae156b8..d4b21b1 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -161,7 +161,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
     end
     wait_for_ajax
 
-    click_link 'Move to project...'
+    click_link 'Move...'
     find('.selectable', text: 'Project 1234').click
     find('.modal-footer a,button', text: 'Move').click
     wait_for_ajax

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list