Author: dongxu
Date: Thu Sep 12 03:54:56 2013
New Revision: 1522271
URL: http://svn.apache.org/r1522271
Log:
dealing with login panel's loading progress ajax loader
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
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=1522271&r1=1522270&r2=1522271&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:54:56 2013
@@ -385,12 +385,16 @@ public class LoginView extends Composite
// loginButton must be in the document to handle the click()
method
innerBox.add(loginButton);
loginButton.setVisible(false);
+<<<<<<< HEAD
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
initWidget(mainContainer);
>>>>>>> make login form available
=======
>>>>>>> replace with uibinder
+=======
+ setLoading(false);
+>>>>>>> dealing with login panel's loading progress ajax loader
}
private void createLoginPrompt() {
@@ -475,6 +479,7 @@ public class LoginView extends Composite
} else {
message.removeStyleName(style.loading());
<<<<<<< HEAD
+<<<<<<< HEAD
message.removeStyleName(style.display());
message.addStyleName(style.hidden());
=======
@@ -497,6 +502,10 @@ public class LoginView extends Composite
message.addStyleName(style.loading());
} else {
message.removeStyleName(style.loading());
+=======
+ message.removeStyleName(style.display());
+ message.addStyleName(style.hidden());
+>>>>>>> dealing with login panel's loading progress ajax loader
}
>>>>>>> prepare for places and do something for loading related to issue #18
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml?rev=1522271&r1=1522270&r2=1522271&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
Thu Sep 12 03:54:56 2013
@@ -166,7 +166,6 @@
@sprite .loading {
gwt-image: 'loading';
- background-position: 2px 6px;
}
</ui:style>
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
