aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-01-01 23:07:57 +0000
committerOlivier Lamy <olamy@apache.org>2013-01-01 23:07:57 +0000
commit822bf24e6bcea06de20ec7344b07bf854411b41b (patch)
treec1ff73300d3bc8d478a2b8e86fb1139727b48bd4
parent28dd45591acb00d29c6d2fd23e03cf176bbbb83f (diff)
downloadarchiva-822bf24e6bcea06de20ec7344b07bf854411b41b.tar.gz
archiva-822bf24e6bcea06de20ec7344b07bf854411b41b.zip
[MRM-1723] Provide tooltips for action icons
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1427582 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties4
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html12
2 files changed, 12 insertions, 4 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index b54425c6c..dab5d4415 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -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
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
index 9102ce2f0..3db9d88ce 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
@@ -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}}