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

[arvados.git] / apps / workbench / app / views / application / _title_and_buttons.html.erb

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 c2bd726775ccdfcfd085168580553bced1d5af58..822c9048579487366ef2591a7a055454b7dd586e 100644 (file)
--- a/apps/workbench/app/views/application/_title_and_buttons.html.erb
+++ b/apps/workbench/app/views/application/_title_and_buttons.html.erb
@@ -26,7 +26,8 @@
              selection_param: 'uuid',
              success: 'redirect-to-created-object'
            }.to_json),
-          { class: "btn btn-sm btn-primary", remote: true, method: 'get', title: "Copy this #{object_class} to a different project" }) do %>
+          { class: "btn btn-sm btn-primary", remote: true, method: 'get',
+            title: "Make a copy this #{object_class}" }) do %>
         <i class="fa fa-fw fa-copy"></i> Copy to project...
       <% end %>
     <% end %>
@@ -43,9 +44,23 @@
              selection_param: 'uuid',
              success: 'redirect-to-created-object'
            }.to_json),
-          { 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...
+          { 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 <%=object_class%>...
       <% end %>
     <% end %>
   <% end %>
 <% end %>
+
+<%
+  # Display any flash messages in an alert. If there is any entry with "error" key, alert-danger is used. 
+  flash_msg = ''
+  flash_msg_is_error = false
+  flash.each do |msg|
+    flash_msg_is_error ||= (msg[0]=='error')
+    flash_msg += ('<p class="contain-align-left">' + msg[1] + '</p>')
+  end
+  if flash_msg != ''
+%>
+<div class="flash-message alert <%= flash_msg_is_error ? 'alert-danger' : 'alert-warning' %>"><%=flash_msg.html_safe%></div>
+<% end %>