Skip to content

Commit 48790e1

Browse files
committed
vectorial icons in login password change
1 parent 847bb75 commit 48790e1

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

logicaldoc-gui/src/main/java/com/logicaldoc/gui/login/client/ChangePassword.java

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
import com.smartgwt.client.widgets.form.DynamicForm;
2323
import com.smartgwt.client.widgets.form.ValuesManager;
2424
import com.smartgwt.client.widgets.form.fields.ButtonItem;
25-
import com.smartgwt.client.widgets.form.fields.FormItemIcon;
2625
import com.smartgwt.client.widgets.form.fields.PasswordItem;
2726
import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
28-
import com.smartgwt.client.widgets.form.fields.events.FormItemIconClickEvent;
2927
import com.smartgwt.client.widgets.form.validator.MatchesFieldValidator;
3028

3129
/**
@@ -61,31 +59,18 @@ public ChangePassword(final GUIUser user, final LoginPanel loginPanel) {
6159
form.setWidth(300);
6260
form.setMargin(5);
6361

64-
PasswordItem password = ItemFactory.newPasswordItemPreventAutocomplete(PASSWORD, "currentpassword", null);
62+
PasswordItem password = ItemFactory.newPasswordItemPreventAutocomplete(PASSWORD, PASSWORD, null);
6563
password.setRequired(true);
6664

6765
MatchesFieldValidator equalsValidator = new MatchesFieldValidator();
6866
equalsValidator.setOtherField(NEWPASSWORDAGAIN);
6967
equalsValidator.setErrorMessage(I18N.message("passwordnotmatch"));
7068

71-
PasswordItem newPass = ItemFactory.newPasswordItemPreventAutocomplete(NEWPASSWORD, NEWPASSWORD, null);
69+
PasswordItem newPass = ItemFactory.newPasswordItemPreventAutocomplete(NEWPASSWORD, NEWPASSWORD, null, true);
70+
newPass.setWrapTitle(false);
7271
newPass.setRequired(true);
7372
newPass.setValidators(equalsValidator, new MinLengthValidator(user.getPasswordMinLenght()));
7473

75-
FormItemIcon generator = new FormItemIcon();
76-
generator.setName("generator");
77-
generator.setWidth(16);
78-
generator.setHeight(16);
79-
80-
generator.setSrc("[SKIN]/key.png");
81-
generator.setPrompt(I18N.message("passwordgenerator"));
82-
generator.addFormItemClickHandler((FormItemIconClickEvent event) -> {
83-
PasswordGenerator pswGenerator = new PasswordGenerator(user.getUsername());
84-
pswGenerator.show();
85-
});
86-
newPass.setIcons(generator);
87-
newPass.setIconVAlign(VerticalAlignment.CENTER);
88-
8974
PasswordItem newPassAgain = ItemFactory.newPasswordItemPreventAutocomplete(NEWPASSWORDAGAIN, NEWPASSWORDAGAIN,
9075
null);
9176
newPassAgain.setWrapTitle(false);
@@ -167,7 +152,7 @@ else if (ret == 3) {
167152
}
168153
});
169154
}
170-
155+
171156
@Override
172157
public boolean equals(Object other) {
173158
return super.equals(other);

0 commit comments

Comments
 (0)