Hide review panel also on diff and topic pages

Sanity review radio buttons panel now hidden from start.
All review panels has toggle visibility capability.

Task-number: QTQAINFRA-355
Change-Id: I69c28719547d8d55b669dd1cea49efe0b52bfe7c
Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com>

3 files changed, 18 insertions, 14 deletions

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
index 4385e0160f..4c57e0e2cc 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
@@ -37,7 +37,6 @@ import com.google.gerrit.reviewdb.Patch;
 import com.google.gerrit.reviewdb.PatchLineComment;
 import com.google.gerrit.reviewdb.PatchSet;
 import com.google.gerrit.reviewdb.PatchSetApproval;
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.Button;
@@ -74,7 +73,6 @@ public class PublishCommentScreen extends AccountScreen implements
   private Panel approvalPanel;
   private NpTextArea message;
   private FlowPanel draftsPanel;
-  private DisclosurePanel approvalTypePanel;
   private Button send;
   private Button submit;
   private Button staging;
@@ -285,11 +283,11 @@ public class PublishCommentScreen extends AccountScreen implements
       approvalButtons.add(b);
       vp.add(b);
     }
-    approvalTypePanel = new DisclosurePanel(ct.getCategory().getName());
-    approvalTypePanel.setContent(vp);
-    approvalTypePanel.setOpen(!ApprovalCategory.SANITY_REVIEW.equals(ct
+    DisclosurePanel atp = new DisclosurePanel(ct.getCategory().getName());
+    atp.setContent(vp);
+    atp.setOpen(!ApprovalCategory.SANITY_REVIEW.equals(ct
         .getCategory().getId()));
-    body.add(approvalTypePanel);
+    body.add(atp);
   }
 
   private void display(final PatchSetPublishDetail r) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishTopicCommentScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishTopicCommentScreen.java
index d4bfa9090b..4b1974dac9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishTopicCommentScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishTopicCommentScreen.java
@@ -36,6 +36,7 @@ import com.google.gerrit.reviewdb.Topic;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.DisclosurePanel;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.FormPanel;
 import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
@@ -213,8 +214,6 @@ public class PublishTopicCommentScreen extends AccountScreen implements
 
   private void initApprovalType(final ChangeSetPublishDetail r,
       final Panel body, final ApprovalType ct, final PermissionRange range) {
-    body.add(new SmallHeading(ct.getCategory().getName() + ":"));
-
     final VerticalPanel vp = new VerticalPanel();
     vp.setStyleName(Gerrit.RESOURCES.css().approvalCategoryList());
     final List<ApprovalCategoryValue> lst =
@@ -244,7 +243,11 @@ public class PublishTopicCommentScreen extends AccountScreen implements
       approvalButtons.add(b);
       vp.add(b);
     }
-    body.add(vp);
+
+    DisclosurePanel atp = new DisclosurePanel(ct.getCategory().getName());
+    atp.setContent(vp);
+    atp.setOpen(!ApprovalCategory.SANITY_REVIEW.equals(ct.getCategory().getId()));
+    body.add(atp);
   }
 
   private void display(final ChangeSetPublishDetail r) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Approvals.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Approvals.java
index d8a348dade..41fad4890b 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Approvals.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Approvals.java
@@ -31,6 +31,7 @@ import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.DisclosurePanel;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.RadioButton;
@@ -80,7 +81,7 @@ public class Approvals extends Composite {
 
   private static SavedState lastState;
   private boolean saveState = true;
-  private final VerticalPanel body;
+  private final Panel body;
   private final PatchSet.Id patchSetId;
   private Collection<ValueRadioButton> approvalButtons;
   private Message message;
@@ -90,7 +91,7 @@ public class Approvals extends Composite {
 
   public Approvals(final PatchSet.Id patchSetId) {
     this.patchSetId = patchSetId;
-    body = new VerticalPanel();
+    body = new FlowPanel();
     approvalButtons = new ArrayList<ValueRadioButton>();
     message = new Message(patchSetId);
 
@@ -155,8 +156,6 @@ public class Approvals extends Composite {
 
   private void initApprovalType(final PatchSetPublishDetail r,
       final Panel body, final ApprovalType ct, final PermissionRange range) {
-    body.add(new SmallHeading(ct.getCategory().getName() + ":"));
-
     final VerticalPanel vp = new VerticalPanel();
     vp.setStyleName(Gerrit.RESOURCES.css().approvalCategoryList());
     final List<ApprovalCategoryValue> lst =
@@ -186,7 +185,11 @@ public class Approvals extends Composite {
       approvalButtons.add(b);
       vp.add(b);
     }
-    body.add(vp);
+    DisclosurePanel atp = new DisclosurePanel(ct.getCategory().getName());
+    atp.setContent(vp);
+    atp.setOpen(!ApprovalCategory.SANITY_REVIEW.equals(ct
+        .getCategory().getId()));
+    body.add(atp);
   }
 
   private void populateActions(final PatchSetPublishDetail result) {