[ARVADOS] created: f8b2e8039c96c6ad101f83012d7abf1c45b12ab2

[Git user]

        at  f8b2e8039c96c6ad101f83012d7abf1c45b12ab2 (commit)


commit f8b2e8039c96c6ad101f83012d7abf1c45b12ab2
Author: radhika <radhika at curoverse.com>
Date:   Thu Jan 12 22:45:56 2017 -0500

    5666: Use "warning" bootstrap style for Cancel button display.

diff --git a/apps/workbench/app/views/work_units/_show_child.html.erb b/apps/workbench/app/views/work_units/_show_child.html.erb
index 8bb33b5..b9010a1 100644
--- a/apps/workbench/app/views/work_units/_show_child.html.erb
+++ b/apps/workbench/app/views/work_units/_show_child.html.erb
@@ -42,7 +42,7 @@
           <% if current_obj.can_cancel? and @object.editable? %>
               <%= form_tag "#{current_obj.uri}/cancel", remote: true, style: "display:inline; padding-left: 1em" do |f| %>
                 <%= hidden_field_tag :return_to, url_for(@object) %>
-                <%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-child-button"} %>
+                <%= button_tag "Cancel", {class: 'btn btn-xs btn-warning', id: "cancel-child-button"} %>
               <% end %>
           <% end %>
           </div>
diff --git a/apps/workbench/app/views/work_units/_show_component.html.erb b/apps/workbench/app/views/work_units/_show_component.html.erb
index 8f0c2d7..e8c4f13 100644
--- a/apps/workbench/app/views/work_units/_show_component.html.erb
+++ b/apps/workbench/app/views/work_units/_show_component.html.erb
@@ -25,7 +25,7 @@
       <% if wu.can_cancel? and @object.editable? %>
         <%= form_tag "#{wu.uri}/cancel", remote: true, style: "display:inline; padding-left: 1em" do |f| %>
           <%= hidden_field_tag :return_to, url_for(@object) %>
-          <%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-obj-button"} %>
+          <%= button_tag "Cancel", {class: 'btn btn-xs btn-warning', id: "cancel-obj-button"} %>
         <% end %>
       <% end %>
     </div>

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


hooks/post-receive
--