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

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 1ade33f0cc9ae81ecd534ecf01d1533f0e2bf354..d21c4b5625447617b9f4ceaea33f8762e8f69f26 100644 (file)
--- 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 fdd3d3c44478cf2ae8b654f558655b7626cc1670..488863df4ce87b51b0dd16742e1d12efa917c1e3 100644 (file)
--- 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 de72c41c180f4c8aa7d08e77c7b653f3d5438a0a..3914624e96857bf174475d23e6726968dd501768 100644 (file)
--- 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 f7f7914b0becf87ef1dc09f47318678bd56d3405..7757298f9ab43dd1c0013b623e2aab08d04a4b19 100644 (file)
--- 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 %>