Merge "Set proper spacing between UI controls in group screens"

5 files changed, 76 insertions, 0 deletions

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
index 7d03bbb4..f9569a82 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
@@ -30,6 +30,7 @@ public interface GerritCss extends CssResource {
   String accountUsername();
   String accountPassword();
   String activeRow();
+  String addMemberTextBox();
   String addReviewer();
   String removeReviewer();
   String removeReviewerCell();
@@ -113,7 +114,19 @@ public interface GerritCss extends CssResource {
   String filePathCell();
   String gerritTopMenu();
   String gerritBody();
+  String groupDescriptionPanel();
+  String groupExternalNameFilterTextBox();
+  String groupIncludesTable();
+  String groupMembersTable();
   String groupName();
+  String groupNamePanel();
+  String groupNameTextBox();
+  String groupOptionsPanel();
+  String groupOptionsNotificationsDescriptionPanel();
+  String groupOwnerPanel();
+  String groupOwnerTextBox();
+  String groupTypePanel();
+  String groupTypeSelectListBox();
   String groupUUIDPanel();
   String header();
   String hyperlink();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java
index 11969f5d..ab4ab7fb 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java
@@ -114,7 +114,9 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
 
   private void initName() {
     final VerticalPanel groupNamePanel = new VerticalPanel();
+    groupNamePanel.setStyleName(Gerrit.RESOURCES.css().groupNamePanel());
     groupNameTxt = new NpTextBox();
+    groupNameTxt.setStyleName(Gerrit.RESOURCES.css().groupNameTextBox());
     groupNameTxt.setVisibleLength(60);
     groupNamePanel.add(groupNameTxt);
 
@@ -141,12 +143,14 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
 
   private void initOwner() {
     final VerticalPanel ownerPanel = new VerticalPanel();
+    ownerPanel.setStyleName(Gerrit.RESOURCES.css().groupOwnerPanel());
     ownerPanel.add(new SmallHeading(Util.C.headingOwner()));
 
     ownerTxtBox = new NpTextBox();
     ownerTxtBox.setVisibleLength(60);
     ownerTxt = new SuggestBox(new RPCSuggestOracle(
         new AccountGroupSuggestOracle()), ownerTxtBox);
+    ownerTxt.setStyleName(Gerrit.RESOURCES.css().groupOwnerTextBox());
     ownerPanel.add(ownerTxt);
 
     saveOwner = new Button(Util.C.buttonChangeGroupOwner());
@@ -173,6 +177,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
 
   private void initDescription() {
     final VerticalPanel vp = new VerticalPanel();
+    vp.setStyleName(Gerrit.RESOURCES.css().groupDescriptionPanel());
     vp.add(new SmallHeading(Util.C.headingDescription()));
 
     descTxt = new NpTextArea();
@@ -202,6 +207,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
 
   private void initGroupOptions() {
     groupOptionsPanel = new VerticalPanel();
+    groupOptionsPanel.setStyleName(Gerrit.RESOURCES.css().groupOptionsPanel());
     groupOptionsPanel.add(new SmallHeading(Util.C.headingGroupOptions()));
 
     visibleToAllCheckBox = new CheckBox(Util.C.isVisibleToAll());
@@ -210,6 +216,8 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
     emailOnlyAuthors = new CheckBox(Util.C.emailOnlyAuthors());
 
     final VerticalPanel vp = new VerticalPanel();
+    vp.setStyleName(Gerrit.RESOURCES.css()
+        .groupOptionsNotificationsDescriptionPanel());
     vp.add(new Label(Util.C.descriptionNotifications()));
     vp.add(emailOnlyAuthors);
     groupOptionsPanel.add(vp);
@@ -243,6 +251,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
     typeSystem = new Label(Util.C.groupType_SYSTEM());
 
     typeSelect = new ListBox();
+    typeSelect.setStyleName(Gerrit.RESOURCES.css().groupTypeSelectListBox());
     typeSelect.addItem(Util.C.groupType_INTERNAL(), AccountGroup.Type.INTERNAL.name());
     typeSelect.addItem(Util.C.groupType_LDAP(), AccountGroup.Type.LDAP.name());
     typeSelect.addChangeHandler(new ChangeHandler() {
@@ -272,6 +281,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
     }
 
     final VerticalPanel fp = new VerticalPanel();
+    fp.setStyleName(Gerrit.RESOURCES.css().groupTypePanel());
     fp.add(new SmallHeading(Util.C.headingGroupType()));
     fp.add(typeSystem);
     fp.add(typeSelect);
@@ -283,6 +293,8 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
     externalName = new Label();
 
     externalNameFilter = new NpTextBox();
+    externalNameFilter.setStyleName(Gerrit.RESOURCES.css()
+        .groupExternalNameFilterTextBox());
     externalNameFilter.setVisibleLength(30);
     externalNameFilter.addKeyPressHandler(new KeyPressHandler() {
       @Override
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java
index 62ebb314..4e13ab57 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java
@@ -91,6 +91,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen {
     });
 
     members = new MemberTable();
+    members.addStyleName(Gerrit.RESOURCES.css().groupMembersTable());
 
     delMember = new Button(Util.C.buttonDeleteGroupMembers());
     delMember.addClickHandler(new ClickHandler() {
@@ -121,6 +122,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen {
     });
 
     includes = new IncludeTable();
+    includes.addStyleName(Gerrit.RESOURCES.css().groupIncludesTable());
 
     delInclude = new Button(Util.C.buttonDeleteIncludedGroup());
     delInclude.addClickHandler(new ClickHandler() {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
index a9c27e06..2aa93f47 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
@@ -1315,3 +1315,50 @@ a:hover.downloadLink {
 .groupUUIDPanel {
   margin-bottom: 10px;
 }
+.groupDescriptionPanel {
+  margin-bottom: 3px;
+}
+.groupExternalNameFilterTextBox {
+  margin-right: 2px;
+  margin-bottom: 2px;
+}
+.groupNamePanel {
+  margin-bottom: 3px;
+}
+.groupNameTextBox {
+  margin-bottom: 2px;
+}
+.groupOptionsPanel {
+  margin-bottom: 3px;
+}
+.groupOptionsNotificationsDescriptionPanel {
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+.groupOwnerPanel {
+  margin-bottom: 3px;
+}
+.groupOwnerTextBox {
+  margin-bottom: 2px;
+}
+.groupTypePanel {
+  margin-bottom: 3px;
+}
+.groupTypeSelectListBox {
+  margin-bottom: 2px;
+}
+
+
+/** AccountGroupMembersScreen **/
+.groupMembersTable {
+  margin-bottom: 2px;
+}
+.groupIncludesTable {
+  margin-bottom: 2px;
+}
+
+
+/** AddMemberBox **/
+.addMemberTextBox {
+  margin-right: 2px;
+  margin-bottom: 2px;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java
index f28a3843..72a011fd 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.client.ui;
 
+import com.google.gerrit.client.Gerrit;
 import com.google.gerrit.client.admin.Util;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -49,6 +50,7 @@ public class AddMemberBox extends Composite {
     nameTxtBox = new HintTextBox();
     nameTxt = new SuggestBox(new RPCSuggestOracle(
         suggestOracle), nameTxtBox);
+    nameTxt.setStyleName(Gerrit.RESOURCES.css().addMemberTextBox());
 
     nameTxtBox.setVisibleLength(50);
     nameTxtBox.setHintText(hint);