Author: dongxu
Date: Thu Sep 12 02:45:06 2013
New Revision: 1522137
URL: http://svn.apache.org/r1522137
Log:
constantly changed by manolo
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/client/src/main/webapp/Hupa.html
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java?rev=1522137&r1=1522136&r2=1522137&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
Thu Sep 12 02:45:06 2013
@@ -78,8 +78,13 @@ public class HupaCSS extends WidgetsCSS
public static final String C_validate = "hupa-validate-error";
<<<<<<< HEAD
+<<<<<<< HEAD
public static final String C_button = "hupa-button";
=======
>>>>>>> first commit
+=======
+
+ public static final String C_button = "hupa-button";
+>>>>>>> constantly changed by manolo
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java?rev=1522137&r1=1522136&r2=1522137&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
Thu Sep 12 02:45:06 2013
@@ -476,6 +476,7 @@ public class IMAPMessageListView extends
cTableModel.setRowCount(CachedTableModel.UNKNOWN_ROW_COUNT);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
mailTable.gotoPage(0, false);
=======
mailTable.gotoFirstPage();
@@ -483,6 +484,9 @@ public class IMAPMessageListView extends
=======
// mailTable.gotoFirstPage();
>>>>>>> constantly changed by manolo
+=======
+ mailTable.gotoPage(0, false);
+>>>>>>> constantly changed by manolo
}
/*
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java?rev=1522137&r1=1522136&r2=1522137&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
Thu Sep 12 02:45:06 2013
@@ -24,16 +24,22 @@ import org.apache.hupa.client.HupaConsta
import org.apache.hupa.widgets.ui.Loading;
import org.apache.hupa.widgets.ui.RndPanel;
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import org.cobogw.gwt.user.client.ui.Button;
import org.cobogw.gwt.user.client.ui.ButtonBar;
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.KeyUpEvent;
import com.google.gwt.event.dom.client.KeyUpHandler;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
@@ -46,6 +52,7 @@ import com.google.gwt.user.client.ui.Has
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.PasswordTextBox;
import com.google.gwt.user.client.ui.SubmitButton;
+<<<<<<< HEAD
=======
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
@@ -53,6 +60,8 @@ import com.google.gwt.user.client.ui.Foc
import com.google.gwt.user.client.ui.HasValue;
import com.google.gwt.user.client.ui.PasswordTextBox;
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -65,6 +74,7 @@ import com.google.inject.Inject;
public class LoginView extends Composite implements
KeyUpHandler,LoginPresenter.Display{
<<<<<<< HEAD
+<<<<<<< HEAD
private Button loginButton = new Button();
private SubmitButton submitButton;
private Button resetButton;
@@ -80,17 +90,34 @@ public class LoginView extends Composite
=======
private Button loginButton;
+=======
+ private Button loginButton = new Button();
+ private SubmitButton submitButton;
+>>>>>>> constantly changed by manolo
private Button resetButton;
- private TextBox usernameTextBox = new TextBox();
- private PasswordTextBox passwordTextBox = new PasswordTextBox();
private Loading loading;
+<<<<<<< HEAD
>>>>>>> first commit
+=======
+
+ // We wrap login/password boxes with a form which must be in the html
document,
+ // in this way, the browser knows that we are sending a login form and
+ // offers the save password dialog to the user
+ private TextBox usernameTextBox =
TextBox.wrap(DOM.getElementById("email"));
+ private PasswordTextBox passwordTextBox =
PasswordTextBox.wrap(DOM.getElementById("password"));
+ // wrap the form after inputs so as they are in the dom when are wrapped
+ final private FormPanel formPanel =
FormPanel.wrap(DOM.getElementById("loginForm"), true);
+
+>>>>>>> constantly changed by manolo
@Inject
public LoginView(HupaConstants constants) {
VerticalPanel mainContainer = new VerticalPanel();
RndPanel rPanel = new RndPanel();
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
FlexTable flexTable = new FlexTable();
Panel buttonBar = new FlowPanel();
submitButton = new SubmitButton(constants.loginButton());
@@ -98,6 +125,7 @@ public class LoginView extends Composite
submitButton.getElement().setClassName(HupaCSS.C_button);
resetButton.getElement().setClassName(HupaCSS.C_button);
submitButton.getElement().setClassName(resetButton.getElement().getClassName());
+<<<<<<< HEAD
loading = new Loading(constants.loading());
mainContainer.setStyleName(HupaCSS.C_login_container);
@@ -122,25 +150,33 @@ public class LoginView extends Composite
ButtonBar buttonBar = new ButtonBar();
loginButton = new Button(constants.loginButton());
resetButton = new Button(constants.resetButton());
+=======
+>>>>>>> constantly changed by manolo
loading = new Loading(constants.loading());
mainContainer.setStyleName(HupaCSS.C_login_container);
- formPanel.addStyleName(HupaCSS.C_login_form);
+ flexTable.addStyleName(HupaCSS.C_login_form);
usernameTextBox.addStyleName(HupaCSS.C_login_box);
+ usernameTextBox.setName("user");
passwordTextBox.addStyleName(HupaCSS.C_login_box);
+ usernameTextBox.setName("password");
- buttonBar.add(loginButton);
+ buttonBar.add(submitButton);
buttonBar.add(resetButton);
- formPanel.setText(0, 0, constants.usernameLabel());
- formPanel.setWidget(0, 1, usernameTextBox);
- formPanel.setText(1, 0, constants.passwordLabel());
- formPanel.setWidget(1, 1, passwordTextBox);
- formPanel.getFlexCellFormatter().setColSpan(2, 0, 2);
- formPanel.setWidget(2, 0, buttonBar);
+ flexTable.setText(0, 0, constants.usernameLabel());
+ flexTable.setWidget(0, 1, usernameTextBox);
+ flexTable.setText(1, 0, constants.passwordLabel());
+ flexTable.setWidget(1, 1, passwordTextBox);
+ flexTable.getFlexCellFormatter().setColSpan(2, 0, 2);
+ flexTable.setWidget(2, 0, buttonBar);
rPanel.add(formPanel);
+<<<<<<< HEAD
>>>>>>> first commit
+=======
+ formPanel.add(flexTable);
+>>>>>>> constantly changed by manolo
mainContainer.add(rPanel);
mainContainer.add(loading);
initWidget(mainContainer);
@@ -151,23 +187,34 @@ public class LoginView extends Composite
loading.hide();
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
// The user submits the form so as the browser detect it and displays
// the save password dialog. Then we click on the hidden loginButton
which
// stores the presenter clickHandler.
formPanel.addSubmitHandler(new FormPanel.SubmitHandler() {
public void onSubmit(SubmitEvent event) {
+<<<<<<< HEAD
if (!usernameTextBox.getValue().trim().isEmpty() &&
!passwordTextBox.getValue().trim().isEmpty()) {
loginButton.click();
}
// event.cancel();
+=======
+ event.cancel();
+ loginButton.click();
+>>>>>>> constantly changed by manolo
}
});
// loginButton must be in the document to handle the click() method
mainContainer.add(loginButton);
loginButton.setVisible(false);
+<<<<<<< HEAD
=======
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
}
/*
@@ -183,11 +230,15 @@ public class LoginView extends Composite
passwordTextBox.setFocus(true);
} else if (event.getSource().equals(passwordTextBox)) {
<<<<<<< HEAD
+<<<<<<< HEAD
submitButton.click();
// formPanel.submit();
=======
loginButton.click();
>>>>>>> first commit
+=======
+ submitButton.click();
+>>>>>>> constantly changed by manolo
}
}
}
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1522137&r1=1522136&r2=1522137&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Thu Sep 12 02:45:06 2013
@@ -875,9 +875,12 @@ div.hupa-main {
/**** HTML5 shadows and gradients ****/
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
body {
background: #eaeaea;
}
@@ -922,8 +925,11 @@ div.hupa-main {
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> first commit
=======
+=======
+>>>>>>> constantly changed by manolo
.hupa-button {
background: #FFFFFF;
@@ -958,6 +964,9 @@ div.hupa-main {
+<<<<<<< HEAD
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1522137&r1=1522136&r2=1522137&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 02:45:06 2013
@@ -75,7 +75,13 @@
top: 50%;
left: 50%;
}
+<<<<<<< HEAD
>>>>>>> first commit
+=======
+ #login {
+ display: none;
+ }
+>>>>>>> constantly changed by manolo
</style>
</head>
@@ -118,6 +124,14 @@
>>>>>>> first commit
</div>
+ <!-- We need this because passwords in forms rendered by js are not saved
in browsers -->
+ <div id="login">
+ <form id="loginForm" action="hupa/hupa.nocache.js" method="post">
+ <input id="email" name="email" type="text">
+ <input id="password" name="password" type="password">
+ </form>
+ </div>
+
<!-- Necessary for history support -->
<iframe src="javascript:''" id="__gwt_historyFrame"
style="width:0;height:0;border:0"></iframe>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
