From: Olivier Lamy Date: Tue, 1 Jan 2013 23:07:57 +0000 (+0000) Subject: [MRM-1723] Provide tooltips for action icons X-Git-Tag: archiva-1.4-M4~331 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=822bf24e6bcea06de20ec7344b07bf854411b41b;p=archiva.git [MRM-1723] Provide tooltips for action icons git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1427582 13f79535-47bb-0310-9956-ffa450edef68 --- 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}} - + + + {{else}} - + + + {{/if}} @@ -232,13 +236,13 @@ {{if row.passwordChangeRequired()==true}} - + {{else}} - + {{/if}}