From 39154bd430d2f45e50b53f6dda33e842eccab0cf Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 31 Oct 2014 10:40:40 +0100
Subject: [PATCH] SONAR-5718 Better usage of background process UI

---
 .../sonar-web/src/main/coffee/common/processes.coffee  |  2 +-
 server/sonar-web/src/main/coffee/issues/app.coffee     |  2 ++
 .../webapp/WEB-INF/app/views/issues/search.html.erb    |  4 +---
 .../src/main/resources/org/sonar/l10n/core.properties  | 10 ++++++++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/server/sonar-web/src/main/coffee/common/processes.coffee b/server/sonar-web/src/main/coffee/common/processes.coffee
index e99a2e479b1..74257fd7482 100644
--- a/server/sonar-web/src/main/coffee/common/processes.coffee
+++ b/server/sonar-web/src/main/coffee/common/processes.coffee
@@ -27,7 +27,7 @@ _.extend process,
     spinner = $ '<div></div>'
     spinner.addClass 'process-spinner'
     spinner.prop 'id', id
-    spinner.text 'still working... ' + uid
+    spinner.text t 'process.still_working'
     spinner.appendTo $('body')
     setTimeout (-> spinner.addClass 'shown'), 100
 
diff --git a/server/sonar-web/src/main/coffee/issues/app.coffee b/server/sonar-web/src/main/coffee/issues/app.coffee
index 775b26a4d9a..f4f62ef8508 100644
--- a/server/sonar-web/src/main/coffee/issues/app.coffee
+++ b/server/sonar-web/src/main/coffee/issues/app.coffee
@@ -56,6 +56,7 @@ requirejs [
 
   $ = jQuery
   App = new Marionette.Application
+  issuesAppProcess = window.process.addBackgroundProcess()
 
 
   App.addInitializer ->
@@ -108,6 +109,7 @@ requirejs [
       key.setScope 'list'
       @router = new Router app: @
       Backbone.history.start()
+      window.process.finishBackgroundProcess issuesAppProcess
 
 
   l10nXHR = window.requestMessages()
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index 70dcece4ae5..3643c208073 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -2,6 +2,4 @@
   <script data-main="<%= ApplicationController.root_context -%>/js/issues/app" src="<%= ApplicationController.root_context -%>/js/require.js"></script>
 <% end %>
 
-<div class="issues">
-  <i class="spinner"></i>
-</div>
+<div class="issues"></div>
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index d47b8900472..64609e256f8 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -524,6 +524,16 @@ design.page=Design
 libraries.page=Libraries
 
 
+
+#------------------------------------------------------------------------------
+#
+# ASYNC PROCESS
+#
+#------------------------------------------------------------------------------
+
+process.still_working=Still Working...
+
+
 #------------------------------------------------------------------------------
 #
 # SESSION
-- 
2.39.5