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 2013/01/02 00:07:58 UTC
svn commit: r1427582 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
Author: olamy
Date: Tue Jan 1 23:07:57 2013
New Revision: 1427582
URL: http://svn.apache.org/viewvc?rev=1427582&view=rev
Log:
[MRM-1723] Provide tooltips for action icons
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1427582&r1=1427581&r2=1427582&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Tue Jan 1 23:07:57 2013
@@ -256,6 +256,10 @@ password.reset=Reset Password
password.reset.success=Password reset.
rememberme=Remember Me
user.login.welcome=Welcome {0}
+users.grid.unlock=Unlock
+users.grid.lock=Lock
+users.grid.unforceChangePassword=Not force password change
+users.grid.forceChangePassword=Force password change
#roles management
roles.management.header=Roles Management
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html?rev=1427582&r1=1427581&r2=1427582&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html Tue Jan 1 23:07:57 2013
@@ -218,11 +218,15 @@
{{if row.locked()==true}}
<td>
- <a href="#" data-bind="click: function(){ unlock(row) }"><img src="images/system-lock-screen-22-22.png"/></a>
+ <a href="#" data-bind="click: function(){ unlock(row) }">
+ <img src="images/system-lock-screen-22-22.png" title="${$.i18n.prop('users.grid.unlock')}"/>
+ </a>
</td>
{{else}}
<td>
- <a href="#" data-bind="click: function(){ lock(row) }"><img src="images/weather-clear-22-22.png"/></a>
+ <a href="#" data-bind="click: function(){ lock(row) }">
+ <img src="images/weather-clear-22-22.png" title="${$.i18n.prop('users.grid.lock')}"/>
+ </a>
</td>
{{/if}}
@@ -232,13 +236,13 @@
{{if row.passwordChangeRequired()==true}}
<td>
<a href="#" data-bind="click: function(){ passwordChangeRequire(row,false) }">
- <img src="images/dialog-error-22-22.png"/>
+ <img src="images/dialog-error-22-22.png" title="${$.i18n.prop('users.grid.unforceChangePassword')}"/>
</a>
</td>
{{else}}
<td>
<a href="#" data-bind="click: function(){ passwordChangeRequire(row,true) }">
- <img src="images/weather-clear-22-22.png"/>
+ <img src="images/weather-clear-22-22.png" title="${$.i18n.prop('users.grid.forceChangePassword')}"/>
</a>
</td>
{{/if}}