4951: Rearrange js to make use of Rails built-ins. Add generic AJAX error handler.

[arvados.git] / apps / workbench / app / views / projects / show.html.erb

diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index 02e34d80f259463f4ba118083e59dda3abd1de7d..5dd1017c8d4724844bdd802a3328dd79cd9f6494 100644 (file)
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -1,4 +1,4 @@
-<% if @object.uuid != current_user.uuid # Not the "Home" project %>
+<% if @object.uuid != current_user.andand.uuid # Not the "Home" project %>
 <% content_for :content_top do %>
   <%= render partial: 'name_and_description' %>
 <% end %>
@@ -7,8 +7,8 @@
 <% content_for :tab_line_buttons do %>
   <% if @object.editable? %>
     <div class="btn-group btn-group-sm">
-      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Add data <span class="caret"></span></button>
-      <ul class="dropdown-menu" role="menu">
+      <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-plus"></i> Add data <span class="caret"></span></button>
+      <ul class="dropdown-menu pull-right" role="menu">
         <li>
           <%= link_to(
                 choose_collections_path(
@@ -18,16 +18,15 @@
                   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),
-                { remote: true, title: "Copy a collection from another project into this one", data: {'event-after-select' => 'page-refresh', 'toggle' => 'dropdown'} }) do %>
-            <i class="fa fa-fw fa-clipboard"></i> ...from a different project
+                { remote: true, data: {'event-after-select' => 'page-refresh', 'toggle' => 'dropdown'} }) do %>
+            <i class="fa fa-fw fa-clipboard"></i> Copy data from another project
           <% end %>
         </li>
         <li>
           <%= link_to(collections_path(options: {ensure_unique_name: true}, collection: {manifest_text: "", name: "New collection", owner_uuid: @object.uuid}, redirect_to_anchor: 'Upload'), {
               method: 'post',
-              title: "Upload files into a new collection",
               data: {toggle: 'dropdown'}}) do %>
-            <i class="fa fa-fw fa-upload"></i> ...from your computer
+            <i class="fa fa-fw fa-upload"></i> Upload files from my computer
           <% end %>
         </li>
       </ul>