svn commit: r1233616 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva: repositories.js templates/message.html utils.js

[ol...@apache.org]

Author: olamy
Date: Thu Jan 19 22:39:14 2012
New Revision: 1233616

URL: http://svn.apache.org/viewvc?rev=1233616&view=rev
Log:
add a method to display info messages and use it when call scanRepo

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1233616&r1=1233615&r2=1233616&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Thu Jan 19 22:39:14 2012
@@ -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);

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html?rev=1233616&r1=1233615&r2=1233616&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html Thu Jan 19 22:39:14 2012
@@ -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>
 

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1233616&r1=1233615&r2=1233616&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js Thu Jan 19 22:39:14 2012
@@ -73,6 +73,12 @@ displayWarningMessage=function(text,idTo
   $(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
   */