fix close on user messages

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

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 e179c3947e0d354e5836231db302f54ba0cca1e8..21a9872168d2749dcbc35f07b8257669e4c5521f 100644 (file)
--- 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
@@ -1,17 +1,17 @@
 <script id='alert-message-success' type='text/x-jquery-tmpl'>
-  <div class="alert-message fade in success">
+  <div class="alert-message fade in success" data-alert="alert">
     <a class="close" href="#">×</a>
     <p>${message}</p>
   </div>
 </script>
 <script id='alert-message-error' type='text/x-jquery-tmpl'>
-  <div class="alert-message fade in error">
+  <div class="alert-message fade in error" data-alert="alert">
     <a class="close" href="#">×</a>
     <p>${message}</p>
   </div>
 </script>
 <script id='alert-message-warning' type='text/x-jquery-tmpl'>
-  <div class="alert-message fade in warning">
+  <div class="alert-message fade in warning" data-alert="alert">
     <a class="close" href="#">×</a>
     <p>${message}</p>
   </div>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
index 382ab15fa00449eec1033ea1209cceb79e206357..fb301b0f9c34e0c1bb823de961c7a61cf11ed443 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
@@ -158,10 +158,10 @@ $(function() {
             type: "POST",
             dataType: 'json',
             success: function(result) {
-              var created = JSON.parse(result);
-              // FIXME use a message div and i18n
-              if (created == true) {
-                displaySuccessMessage("user updated:"+currentUser.username());
+              var updated = JSON.parse(result);
+              if (updated == true) {
+                displaySuccessMessage($.i18n.prop("user.updated",currentUser.username()));
+                $("#users-view-tabs-li-user-edit a").html($.i18n.prop("user.add"));
                 clearForm("#main-content #user-create");
                 activateUsersGridTab();
                 return this;