Author: dongxu
Date: Thu Sep 12 03:23:56 2013
New Revision: 1522196
URL: http://svn.apache.org/r1522196
Log:
make login form available
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java?rev=1522196&r1=1522195&r2=1522196&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
Thu Sep 12 03:23:56 2013
@@ -240,7 +240,7 @@ public class LoginView extends Composite
submitButton.getElement().setClassName(resetButton.getElement().getClassName());
loading = new Loading(constants.loading());
- mainContainer.setStyleName(HupaCSS.C_login_container);
+// mainContainer.setStyleName(HupaCSS.C_login_container);
flexTable.addStyleName(HupaCSS.C_login_form);
usernameTextBox.addStyleName(HupaCSS.C_login_box);
passwordTextBox.addStyleName(HupaCSS.C_login_box);
@@ -259,11 +259,14 @@ public class LoginView extends Composite
formPanel.add(flexTable);
mainContainer.add(rPanel);
mainContainer.add(loading);
+<<<<<<< HEAD
initWidget(mainContainer);
<<<<<<< HEAD
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
+=======
+>>>>>>> make login form available
usernameTextBox.addKeyUpHandler(this);
usernameTextBox.setFocus(true);
@@ -331,12 +334,16 @@ public class LoginView extends Composite
// loginButton must be in the document to handle the click()
method
mainContainer.add(loginButton);
loginButton.setVisible(false);
+<<<<<<< HEAD
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
// loginButton must be in the document to handle the click()
method
mainContainer.add(loginButton);
loginButton.setVisible(false);
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
+=======
+ initWidget(mainContainer);
+>>>>>>> make login form available
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
