3781: Merge branch 'master' into 3781-browser-upload

Conflicts:
	apps/workbench/app/assets/javascripts/application.js
	apps/workbench/app/views/projects/show.html.erb

diff --cc apps/workbench/Gemfile
Simple merge

diff --cc apps/workbench/Gemfile.lock
Simple merge

diff --cc apps/workbench/app/assets/javascripts/application.js
index 6b98fd93cc44cfd67023e12800294c501f74d5c0,796053b8cd3b4de8dd3205cee5ef5642f000da67..63887b3ab970f3d75f4035169790e05752ea15a8
--- 1/apps/workbench/app/assets/javascripts/application.js
--- 2/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@@ -23,7 -23,9 +23,10 @@@
  //= require bootstrap3-editable/bootstrap-editable
  //= require bootstrap-tab-history
  //= require wiselinks
 +//= require angular
+ //= require raphael
+ //= require morris
+ //= require jquery.number.min
  //= require_tree .
  
  jQuery(function($){

diff --cc apps/workbench/app/assets/stylesheets/application.css.scss
Simple merge

diff --cc apps/workbench/app/controllers/collections_controller.rb
Simple merge

diff --cc apps/workbench/app/views/projects/_show_dashboard.html.erb
index 0d71f947c758aca3829326ef4230f280a529fbd3,40f319f6da3ab364d730cf2a6cfffcb00b04f26a..1fbe5057be0a9cf528553eda276297770d437010
--- 1/apps/workbench/app/views/projects/_show_dashboard.html.erb
--- 2/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@@ -5,13 -5,13 +5,13 @@@
          <div class="panel-heading"><span class="panel-title">Active pipelines</span>
            <span class="pull-right">
      <%= link_to(
--        choose_pipeline_templates_path(
--          title: 'Choose a pipeline to run:',
--          action_name: 'Next: choose inputs <i class="fa fa-fw fa-arrow-circle-right"></i>',
--          action_href: pipeline_instances_path,
--          action_method: 'post',
--          action_data: {'selection_param' => 'pipeline_instance[pipeline_template_uuid]', 'pipeline_instance[owner_uuid]' => current_user.uuid, 'success' => 'redirect-to-created-object'}.to_json),
-         { class: "btn btn-primary btn-xs", remote: true, method: 'get' }) do %>
 -        { class: "btn btn-primary btn-xs", remote: true }) do %>
++          choose_pipeline_templates_path(
++            title: 'Choose a pipeline to run:',
++            action_name: 'Next: choose inputs <i class="fa fa-fw fa-arrow-circle-right"></i>',
++            action_href: pipeline_instances_path,
++            action_method: 'post',
++            action_data: {'selection_param' => 'pipeline_instance[pipeline_template_uuid]', 'pipeline_instance[owner_uuid]' => current_user.uuid, 'success' => 'redirect-to-created-object'}.to_json),
++          { class: "btn btn-primary btn-xs", remote: true }) do %>
        <i class="fa fa-fw fa-gear"></i> Run a pipeline...
      <% end %>
      </span>

diff --cc apps/workbench/app/views/projects/show.html.erb
index 58d8f4e95482d1d44adae8128692a5546db8292e,7a9eda00f46653f889a1a3fb1f7e87166e367b4f..02e34d80f259463f4ba118083e59dda3abd1de7d
--- 1/apps/workbench/app/views/projects/show.html.erb
--- 2/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@@ -6,43 -6,28 +6,43 @@@
  
  <% content_for :tab_line_buttons do %>
    <% if @object.editable? %>
-                 { remote: true, method: 'get', title: "Copy a collection from another project into this one", data: {'event-after-select' => 'page-refresh', 'toggle' => 'dropdown'} }) do %>
 +    <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">
 +        <li>
 +          <%= link_to(
 +                choose_collections_path(
 +                  title: 'Choose a collection to copy into this project:',
 +                  multiple: true,
 +                  action_name: 'Copy',
 +                  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
 +          <% 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
 +          <% end %>
 +        </li>
 +      </ul>
 +    </div>
      <%= link_to(
 -        choose_collections_path(
 -          title: 'Add data to project:',
 -          multiple: true,
 -          action_name: 'Add',
 -          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, 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(
--        choose_pipeline_templates_path(
--          title: 'Choose a pipeline to run:',
--          action_name: 'Next: choose inputs <i class="fa fa-fw fa-arrow-circle-right"></i>',
--          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', title: "Run a pipeline in this project" }) do %>
 -        { class: "btn btn-primary btn-sm", remote: true, title: "Run a pipeline in this project" }) do %>
++          choose_pipeline_templates_path(
++            title: 'Choose a pipeline to run:',
++            action_name: 'Next: choose inputs <i class="fa fa-fw fa-arrow-circle-right"></i>',
++            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, 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', title: "Add a subproject to this project", 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 --cc apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
index efa8cae5c98f7356b92216fb0c71d1d5d0b16811,3bfaf6982ecccb777b22d50a230f9102060d41c0..98f54ef252ed97b61ec5b9b66cf7e2449e2e4e14
--- 1/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
--- 2/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
+++ b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
@@@ -14,9 -14,9 +14,9 @@@
  
        <div class="modal-body">
          <div> <%= link_to "Click here to learn about SSH keys in Arvados.",
-                 "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html", 
 -                "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
--                style: "font-weight: bold",
--                target: "_blank" %>
++                  "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
++                  style: "font-weight: bold",
++                  target: "_blank" %>
          </div>
          <div class="form-group">
            <label for="public_key">Public Key</label>

diff --cc apps/workbench/app/views/users/_manage_ssh_keys.html.erb
index 17b64b27f9f7c7d74141bc55ea52de7ba3b080ff,34dbb591aefc859d78445b02d97d2669cd269bab..1ea8f0bf87f698a5199cd357163c7f07df973796
--- 1/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
--- 2/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@@ -2,9 -2,9 +2,9 @@@
    <% if !@my_ssh_keys.any? %>
       <p> You have not yet set up an SSH public key for use with Arvados. </p>
       <p>  <%= link_to "Click here",
-                 "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html", 
 -                "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
--                style: "font-weight: bold",
--                target: "_blank" %>  to learn about SSH keys in Arvados.
++                  "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
++                  style: "font-weight: bold",
++                  target: "_blank" %>  to learn about SSH keys in Arvados.
       </p>
       <p> When you have an SSH key you would like to use, add it using the <b>Add</b> button. </p>
    <% else %>