From: Olivier Lamy <olamy@apache.org>
Date: Thu, 19 Jan 2012 22:39:14 +0000 (+0000)
Subject: add a method to display info messages and use it when call scanRepo
X-Git-Tag: archiva-1.4-M3~1538
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=38b64bd49dc3348de807a8d2ff1344637272f708;p=archiva.git

add a method to display info messages and use it when call scanRepo

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1233616 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
index 04bdca456..09d691411 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
@@ -267,10 +267,11 @@ $(function() {
             $.ajax(url,
               {
                 type: "GET",
+                  beforeSend:function(){
+                    displayInfoMessage($.i18n.prop("managedrepository.scan.started"));
+                  },
                   success: function(data) {
-                    self.managedRepositories.remove(managedRepository);
                     displaySuccessMessage($.i18n.prop("managedrepository.scanned",managedRepository.name()));
-
                   },
                   error: function(data) {
                     var res = $.parseJSON(data.responseText);
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html
index e49808b84..62ca14631 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html
@@ -34,4 +34,10 @@
     <p>${message}</p>
   </div>
 </script>
+<script id='alert-message-info' type='text/x-jquery-tmpl'>
+  <div class="alert-message fade in info" data-alert="alert">
+    <a class="close" href="#" id='alert-message-info-close-a'>&#215;</a>
+    <p>${message}</p>
+  </div>
+</script>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
index 9e6fc7af9..179b07313 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
@@ -73,6 +73,12 @@ displayWarningMessage=function(text,idToAppend){
   $(textId).focus();
 }
 
+displayInfoMessage=function(text,idToAppend){
+  var textId = idToAppend ? $("#"+idToAppend) : $("#user-messages");
+  $.tmpl($("#alert-message-info").html(), { "message" : text }).appendTo( textId );
+  $(textId).focus();
+}
+
 /**
  * clear #main-content and call clearUserMessages
   */