[ARVADOS] updated: b74393c5dbd061bc6d249a6ce5ecbd5dcb8fd633

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/application.js          |  7 ++++++
 .../app/views/application/_choose.html.erb         |  3 ++-
 apps/workbench/app/views/projects/_choose.html.erb |  3 ++-
 .../app/views/users/_setup_popup.html.erb          |  3 ++-
 docker/build_tools/Makefile                        |  6 +++++
 docker/bwa-samtools/Dockerfile                     | 21 +++++++++++++++++
 services/fuse/bin/arv-mount                        | 26 +++++++++++++---------
 7 files changed, 55 insertions(+), 14 deletions(-)
 create mode 100644 docker/bwa-samtools/Dockerfile

       via  b74393c5dbd061bc6d249a6ce5ecbd5dcb8fd633 (commit)
       via  0edc5b2af65e41a247f373ffd206d8283b6cbc55 (commit)
       via  cd5dd98b4b660085586693cdc2cf350fcc06a074 (commit)
       via  71035a6ed21e5acf4604b04bd7e046734efd650b (commit)
      from  f12986389693d4155847204210d9c84492ac6837 (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 b74393c5dbd061bc6d249a6ce5ecbd5dcb8fd633
Merge: 0edc5b2 cd5dd98
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 1 10:50:29 2014 -0400

    Merge branch 'master' into 3106-modal-loading-indicator


commit 0edc5b2af65e41a247f373ffd206d8283b6cbc55
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 1 10:49:10 2014 -0400

    3106: display spinner when modal dialogs are communicating with server.

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 1ade33f..d21c4b5 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -29,6 +29,13 @@ jQuery(function($){
             'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
         }
     });
+
+    $(document).ajaxStart(function(){
+      $('.modal-with-loading-spinner .spinner').show();
+    }).ajaxStop(function(){
+      $('.modal-with-loading-spinner .spinner').hide();
+    });
+
     $('[data-toggle=tooltip]').tooltip();
 
     $('.expand-collapse-row').on('click', function(event) {
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index fdd3d3c..488863d 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -1,4 +1,4 @@
-<div class="modal arv-choose">
+<div class="modal arv-choose modal-with-loading-spinner">
   <div class="modal-dialog" style="width:80%">
     <div class="modal-content">
       <div class="modal-header">
@@ -6,6 +6,7 @@
         <h4 class="modal-title"><%= params[:title] || "Choose #{@objects.first.andand.class_for_display}" %></h4>
       </div>
       <div class="modal-body">
+        <div class="spinner spinner-32px spinner-h-center spinner-v-center" hidden="true"></div>
         <nav class="navbar navbar-default breadcrumbs" role="navigation">
           <ul class="nav navbar-nav navbar-left">
             <li class="dropdown">
diff --git a/apps/workbench/app/views/projects/_choose.html.erb b/apps/workbench/app/views/projects/_choose.html.erb
index de72c41..3914624 100644
--- a/apps/workbench/app/views/projects/_choose.html.erb
+++ b/apps/workbench/app/views/projects/_choose.html.erb
@@ -1,4 +1,4 @@
-<div class="modal">
+<div class="modal modal-with-loading-spinner">
   <div class="modal-dialog">
     <div class="modal-content">
 
@@ -8,6 +8,7 @@
       </div>
 
       <div class="modal-body">
+        <div class="spinner spinner-32px spinner-h-center spinner-v-center" hidden="true"></div>
         <div class="selectable-container" style="height: 15em; overflow-y: scroll">
           <% [my_project_tree, shared_project_tree].each do |tree| %>
             <% tree.each do |projectnode| %>
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index f7f7914..7757298 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -1,4 +1,4 @@
-<div class="modal-dialog">
+<div class="modal-dialog modal-with-loading-spinner">
   <div class="modal-content">
 
     <%= form_tag setup_user_path, {id: 'setup_form', name: 'setup_form', method: 'get',
@@ -10,6 +10,7 @@
     </div>
 
     <div class="modal-body">
+      <div class="spinner spinner-32px spinner-h-center spinner-v-center" hidden="true"></div>
       <% if @object%>
         <% uuid = @object.uuid %>
         <% email = @object.email %>

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


hooks/post-receive
--