Add Close button to OpenId dialog

Change-Id: I73d9beb4730a863fb2942e06973f89ee1c734356
Signed-off-by: Shawn O. Pearce <sop@google.com>

2 files changed, 19 insertions, 3 deletions

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java
index 37369459c1..df229a60c1 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java
@@ -166,6 +166,8 @@ public class OpenIdSignInDialog extends SignInDialog implements
   }
 
   private void createIdentBox() {
+    boolean remember = mode == SignInMode.SIGN_IN || mode == SignInMode.REGISTER;
+
     final FlowPanel group = new FlowPanel();
     group.setStyleName(OpenIdResources.I.css().loginLine());
 
@@ -206,10 +208,20 @@ public class OpenIdSignInDialog extends SignInDialog implements
         form.submit();
       }
     });
-    login.setTabIndex(2);
+    login.setTabIndex(remember ? 2 : 1);
     line1.add(login);
 
-    if (mode == SignInMode.SIGN_IN) {
+    Button close = new Button(Gerrit.C.signInDialogClose());
+    close.addClickHandler(new ClickHandler() {
+      @Override
+      public void onClick(ClickEvent event) {
+        hide();
+      }
+    });
+    close.setTabIndex(remember ? 3 : 2);
+    line1.add(close);
+
+    if (remember) {
       rememberId = new CheckBox(OpenIdUtil.C.rememberMe());
       rememberId.setTabIndex(1);
       group.add(rememberId);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openid.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openid.css
index 6331848a5f..07133918fe 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openid.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openid.css
@@ -13,6 +13,8 @@
  * limitations under the License.
  */
 
+@external .gwt-Button;
+
 @url identifierBackground identifierBackground;
 
 .loginForm {
@@ -31,12 +33,14 @@
 .loginLine div {
   white-space: nowrap;
 }
+.loginLine .gwt-Button {
+  margin-left: 2px;
+}
 
 .identifier {
   background: #ffffff identifierBackground no-repeat scroll 5px 50%;
   padding-left: 25px;
   border: 1px solid #999999;
-  margin-right: 5px;
 }
 
 .directLink {