From 780f53e226e36bd7062de04d78b6fff6769b55a9 Mon Sep 17 00:00:00 2001
From: Peter Cottle <pcottle@fb.com>
Date: Sun, 30 Sep 2018 21:47:09 -0700
Subject: [PATCH] Resolves #486 -- easier to understand button labels when
 interactive rebasing

---
 src/js/views/rebaseView.js |  1 -
 src/style/main.css         | 13 +++++++++++++
 src/template.index.html    | 11 ++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/js/views/rebaseView.js b/src/js/views/rebaseView.js
index ed19ca8f..49403561 100644
--- a/src/js/views/rebaseView.js
+++ b/src/js/views/rebaseView.js
@@ -164,7 +164,6 @@ var RebaseEntryView = Backbone.View.extend({
   },
 
   render: function() {
-    var json = this.model.toJSON();
     this.$el.append(this.template(this.model.toJSON()));
 
     // hacky :( who would have known jquery barfs on ids with %'s and quotes
diff --git a/src/style/main.css b/src/style/main.css
index a5ee34cf..15a23383 100644
--- a/src/style/main.css
+++ b/src/style/main.css
@@ -770,6 +770,19 @@ li.rebaseEntry a#toggleButton {
 li.rebaseEntry.notPicked {
   opacity: 0.2;
 }
+
+li.rebaseEntry.notPicked span.showWhenPicked {
+  display: none;
+}
+
+li.rebaseEntry span.showWhenNotPicked {
+  display: none;
+}
+
+li.rebaseEntry.notPicked span.showWhenNotPicked {
+  display: inline;
+}
+
 /* Modal Views */
 
 div.modalView.box.inFront.show {
diff --git a/src/template.index.html b/src/template.index.html
index c5312f4f..e788eb41 100644
--- a/src/template.index.html
+++ b/src/template.index.html
@@ -394,7 +394,7 @@
       <% if (solutionOrder && solutionOrder.length) { %>
         <p class="solutionText">
           For the solution, order the commits as
-            <%= solutionOrder.join(', ') %>
+            <%= solutionOrder.join(', ') %>. You may need to omit or pick commits.
         </p>
       <% } %>
       <p class="helperText">
@@ -452,8 +452,13 @@
           <%= id %>
         </span>
         <a id="toggleButton" class="uiButton uiButtonPink">
-          Pick
-        </a>
+          <span class="showWhenPicked">
+            Omit
+          </span>
+          <span class="showWhenNotPicked">
+            Pick
+          </span>
+        </a>  
       </div>
     </li>
   </script>