Merge branch 'master' into ribdashboard

This commit is contained in:
Axel Uhl committed 2014-11-06 15:39:51 +01:00
commit 94b1160628
1 file changed
+4
@@ -49,8 +49,12 @@ public class LoginView extends Composite {
LoginViewResources.INSTANCE.css().ensureInjected();
initWidget(uiBinder.createAndBindUi(this));
this.appName.setText(appName);
userNameTextBox.setWatermark(StringMessages.INSTANCE.username());
userNameTextBox.setWatermarkStyleName(LoginViewResources.INSTANCE.css().textInput_watermark());
passwordTextBox.setWatermark(StringMessages.INSTANCE.password());
passwordTextBox.setWatermarkStyleName(LoginViewResources.INSTANCE.css().passwordTextInput_watermark());
String registrationLink = EntryPointLinkFactory.createRegistrationLink(Collections.<String, String> emptyMap());
signUpAnchor.setHref(registrationLink);
oAuthPanel.add(new OAuthLogin(userManagementService));