Hide sanity review radio buttons

Sanity review category box now starts in hidden mode. All
review categories are now expandable boxes.

Task-number: QTQAINFRA-355
Originally-by: Ola Bjuremo <ola.bjuremo@tieto.com>
Change-Id: I28ba61d00aec52da95d2ae6f890d18ed13fce2ac
Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>

6 files changed, 55 insertions, 6 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 84253f7cdf..16cfd1af25 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
@@ -32,6 +32,7 @@ public interface GerritCss extends CssResource {
   String addReviewer();
   String addSshKeyPanel();
   String addWatchPanel();
+  String allInOnePatchScreen();
   String approvalTable();
   String approvalhint();
   String approvalrole();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
index 8ae85f54c8..7e201da5f0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
@@ -69,4 +69,6 @@ public interface ChangeMessages extends Messages {
   String years0MonthsAgo(long years, String yearLabel);
   String yearsMonthsAgo(long years, String yearLabel, long months,
       String monthLabel);
+
+  String labelSanityReview();
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
index 138156f298..15d0b53878 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
@@ -51,3 +51,4 @@ yearsMonthsAgo = {0} {1}, {2} {3} ago
 yearsAgo = {0} years ago
 
 mergeToStagingPatchSet = Merge Patch Set {0} to Staging
+labelSanityReview = Sanity-Review
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 4a8f06365a..46607c4749 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
@@ -44,6 +44,7 @@ import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 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;
@@ -295,8 +296,6 @@ public class PublishCommentScreen extends AccountScreen implements
     Collections.reverse(values);
     LabelInfo label = change.label(labelName);
 
-    body.add(new SmallHeading(label.name() + ":"));
-
     VerticalPanel vp = new VerticalPanel();
     vp.setStyleName(Gerrit.RESOURCES.css().labelList());
 
@@ -326,7 +325,10 @@ public class PublishCommentScreen extends AccountScreen implements
       approvalButtons.add(b);
       vp.add(b);
     }
-    body.add(vp);
+    DisclosurePanel atp = new DisclosurePanel(label.name());
+    atp.setContent(vp);
+    atp.setOpen(!Util.M.labelSanityReview().equals(labelName));
+    body.add(atp);
   }
 
   private void display(final PatchSetPublishDetail r) {
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 8fc4825849..cd2ce9b9f0 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
@@ -1434,7 +1434,47 @@ a:hover.downloadLink {
 .publishCommentsScreen .commentPanelDateCell {
   display: none;
 }
+.publishCommentsScreen .gwt-DisclosurePanel .header td {
+  font-weight: bold;
+  white-space: nowrap;
+}
+.publishCommentsScreen .gwt-DisclosurePanel .complexHeader {
+  white-space: nowrap;
+}
+.publishCommentsScreen .gwt-DisclosurePanel .complexHeader span {
+  white-space: nowrap;
+}
 
+/** AllInOnePatchScreen **/
+.allInOnePatchScreen .labelList {
+  margin-bottom: 10px;
+  margin-left: 10px;
+  background: trimColor;
+  width: 25em;
+  white-space: nowrap;
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
+.allInOnePatchScreen .coverMessage {
+  margin-left: 10px;
+  padding: 5px 5px 5px 5px;
+}
+.allInOnePatchScreen .coverMessage textarea {
+  font-size: small;
+}
+.allInOnePatchScreen .labelList .gwt-RadioButton {
+  font-size: smaller;
+}
+.allInOnePatchScreen .gwt-DisclosurePanel .header td {
+  font-weight: bold;
+  white-space: nowrap;
+}
+.allInOnePatchScreen .gwt-DisclosurePanel .complexHeader {
+  white-space: nowrap;
+}
+.allInOnePatchScreen .gwt-DisclosurePanel .complexHeader span {
+  white-space: nowrap;
+}
 
 /** CommentedActionDialog **/
 .commentedActionDialog .gwt-DisclosurePanel .header td {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java
index 6c088cb6e9..d4e9d046aa 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java
@@ -54,6 +54,7 @@ import com.google.gwt.event.dom.client.KeyPressEvent;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 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.Panel;
@@ -536,6 +537,7 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements
   @Override
   protected void onInitUI() {
     super.onInitUI();
+    addStyleName(Gerrit.RESOURCES.css().allInOnePatchScreen());
 
     Window.scrollTo(0, getAbsoluteTop());
 
@@ -655,8 +657,6 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements
     Collections.reverse(values);
     LabelInfo label = change.label(labelName);
 
-    body.add(new SmallHeading(label.name() + ":"));
-
     VerticalPanel vp = new VerticalPanel();
     vp.setStyleName(Gerrit.RESOURCES.css().labelList());
 
@@ -686,7 +686,10 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements
       approvalButtons.add(b);
       vp.add(b);
     }
-    body.add(vp);
+    DisclosurePanel atp = new DisclosurePanel(label.name());
+    atp.setContent(vp);
+    atp.setOpen(!Util.M.labelSanityReview().equals(labelName));
+    body.add(atp);
   }
 
   @Override