From 8526ff7dbd8ab16f0c9d25888d9a5704af8cb674 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Fri, 9 Oct 2015 07:49:30 -0700
Subject: [PATCH 1/3] Fix tooltip and move replace in selected cells button.

---
 .../static/notebook/js/searchandreplace.js    | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/notebook/static/notebook/js/searchandreplace.js b/notebook/static/notebook/js/searchandreplace.js
index 8af53b2baf..7cc95e3923 100644
--- a/notebook/static/notebook/js/searchandreplace.js
+++ b/notebook/static/notebook/js/searchandreplace.js
@@ -69,7 +69,6 @@ define(function(require){
       body.append($('<p/>').addClass('bg-warning').text("Warning, too many matches ("+html.length+"+), some changes might not be shown or applied"));
     } else {
       body.append($('<p/>').addClass('bg-info').text(html.length+" match"+(html.length==1?'':'es')));
-
     }
     for(var rindex=0; rindex<html.length; rindex++){
       var pre = $('<pre/>')
@@ -135,7 +134,7 @@ define(function(require){
         res.push([match.index, match.index+match[0].length]);
         escape_hatch++;
         if(escape_hatch > 100){
-          console.warn("More than  100 matches, aborting");
+          console.warn("More than 100 matches, aborting");
           abort = true;
           break;
         }
@@ -156,7 +155,7 @@ define(function(require){
       .attr('id', 'isreg')
       .addClass("btn btn-default")
       .attr('data-toggle','button')
-      .attr('title', 'use regular expression (now you have N+1 problems)')
+      .attr('title', 'Use regex (JavaScript regex syntax)')
       .text('.*');
 
     var onlySelectedButton = $('<button/>')
@@ -166,14 +165,14 @@ define(function(require){
         .addClass("fa fa-check-square-o")
       )
       .attr('data-toggle','button')
-      .attr('title', 'replace only in selected cells');
+      .attr('title', 'Replace only in selected cells');
 
     var isCaseSensitiveButton = $('<button/>')
       .attr('type', 'button')
       .addClass("btn btn-default")
       .attr('data-toggle','button')
       .attr('tabindex', '0')
-      .attr('title', 'is search case sensitive')
+      .attr('title', 'Case sensitive')
       .text('a≠A');
 
     var repl = $("<input/>")
@@ -188,20 +187,19 @@ define(function(require){
           $('<div/>').addClass('input-group')
           .append(
             $('<div/>').addClass('input-group-btn')
-              .append(isCaseSensitiveButton)
-              .append(isRegExpButton)
+                .append(isCaseSensitiveButton)
+                .append(isRegExpButton)
+                .append(onlySelectedButton)
           )
           .append(search)
         )
       )
       .append($('<div/>').addClass('form-group')
         .append(
-          $('<div/>').addClass('input-group')
-          .append(repl)
-          .append(
-            $('<div/>').addClass('input-group-btn')
-              .append(onlySelectedButton)
-          )
+          $('<div/>')
+              .addClass('input-group')
+              .css('width', '100%')
+              .append(repl)
         )
       )
       .append(body);

From 85ebbd3a356821761104db2de4c9bdba905c321a Mon Sep 17 00:00:00 2001
From: Jason Grout <jgrout6@bloomberg.net>
Date: Mon, 12 Oct 2015 17:55:22 -0400
Subject: [PATCH 2/3] restore left border on last input

---
 notebook/static/notebook/less/searchandreplace.less | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/notebook/static/notebook/less/searchandreplace.less b/notebook/static/notebook/less/searchandreplace.less
index cccf08e920..9b99b11026 100644
--- a/notebook/static/notebook/less/searchandreplace.less
+++ b/notebook/static/notebook/less/searchandreplace.less
@@ -28,9 +28,4 @@
     max-height: 60vh;
     overflow: auto;
   }
-  
-  & input:last-child {
-    border-left:none;
-  }
-  
 }

From de157028abb10f7edc863dfcf4137e1ebcdcadad Mon Sep 17 00:00:00 2001
From: Jason Grout <jgrout6@bloomberg.net>
Date: Mon, 12 Oct 2015 18:06:22 -0400
Subject: [PATCH 3/3] simplify find/replace form

---
 notebook/static/notebook/js/searchandreplace.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/notebook/static/notebook/js/searchandreplace.js b/notebook/static/notebook/js/searchandreplace.js
index 7cc95e3923..8c7d550160 100644
--- a/notebook/static/notebook/js/searchandreplace.js
+++ b/notebook/static/notebook/js/searchandreplace.js
@@ -195,12 +195,7 @@ define(function(require){
         )
       )
       .append($('<div/>').addClass('form-group')
-        .append(
-          $('<div/>')
-              .addClass('input-group')
-              .css('width', '100%')
-              .append(repl)
-        )
+        .append(repl)
       )
       .append(body);