You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/12/19 23:38:01 UTC
svn commit: r1220980 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/templates/message.html redback/user.js
Author: olamy
Date: Mon Dec 19 22:38:00 2011
New Revision: 1220980
URL: http://svn.apache.org/viewvc?rev=1220980&view=rev
Log:
fix close on user messages
Modified:
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/redback/user.js
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=1220980&r1=1220979&r2=1220980&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 Mon Dec 19 22:38:00 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1220980&r1=1220979&r2=1220980&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js Mon Dec 19 22:38:00 2011
@@ -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;