From 94a8d09dfce980f36dfca7b9a93a4b6b9341dc43 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 2 Mar 2015 17:27:23 -0800
Subject: [PATCH 1/5] Move upload to the right and dynamic buttons to the left.

---
 .../html/static/tree/less/altuploadform.less  | 37 +++++++++----------
 IPython/html/static/tree/less/tree.less       |  1 +
 IPython/html/templates/tree.html              | 29 +++++++--------
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/IPython/html/static/tree/less/altuploadform.less b/IPython/html/static/tree/less/altuploadform.less
index bc107ff7a..be608cf5b 100644
--- a/IPython/html/static/tree/less/altuploadform.less
+++ b/IPython/html/static/tree/less/altuploadform.less
@@ -1,29 +1,26 @@
 /* We need an invisible input field on top of the sentense*/
 /* "Drag file onto the list ..." */
 
-.alternate_upload
-{
+.alternate_upload {
     background-color:none;
     display: inline;
-}
 
-.alternate_upload.form
-{
-    padding: 0;
-    margin:0;
-}
+    &.form
+    {
+        padding: 0;
+        margin:0;
+    }
 
-.alternate_upload input.fileinput
-{
-    display: inline;
-    opacity: 0;
-    z-index: 2;
-    width: 12ex;
-    margin-right: -12ex;
-}
+    input.fileinput
+    {
+        display: inline;
+        opacity: 0;
+        z-index: 2;
+        width: 12ex;
+        margin-right: -12ex;
+    }
 
-.alternate_upload .input-overlay {
-    display: inline-block;
-    font-weight: bold;
-    line-height:1em;
+    .btn-upload {
+        height: @btn_mini_height;
+    }
 }
diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less
index ba2236e81..1d8b2465d 100644
--- a/IPython/html/static/tree/less/tree.less
+++ b/IPython/html/static/tree/less/tree.less
@@ -49,6 +49,7 @@ ul.breadcrumb {
 }
 
 .dynamic-buttons {
+    padding-top: @dashboard_tb_pad - 1px;
     display: inline-block;
 }
 
diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html
index fa22adccc..c95dc6346 100644
--- a/IPython/html/templates/tree.html
+++ b/IPython/html/templates/tree.html
@@ -25,24 +25,23 @@ data-terminals-available="{{terminals_available}}"
         <div id="notebooks" class="tab-pane active">
           <div id="notebook_toolbar" class="row">
             <div class="col-sm-8 no-padding">
-              <form id='alternate_upload'  class='alternate_upload'>
-                <span id="notebook_list_info">
-                To import a notebook, drag the file onto the listing below or
-                <span class="input-overlay">
-                <input type="file" name="datafile" class="fileinput" multiple='multiple'>
-                click here.
-                </span>
-                </span>
-              </form>
+              <div class="dynamic-buttons">
+                  <button title="Duplicate selected" class="duplicate-button btn btn-default btn-xs">Duplicate</button>
+                  <button title="Rename selected" class="rename-button btn btn-default btn-xs">Rename</button>
+                  <button title="Shutdown selected notebook(s)" class="shutdown-button btn btn-default btn-xs btn-warning">Shutdown</button>
+                  <button title="Deleted selected" class="delete-button btn btn-default btn-xs btn-danger"><i class="fa fa-trash"></i></button>
+              </div>
             </div>
             <div class="col-sm-4 no-padding tree-buttons">
               <div class="pull-right">
-                <div class="dynamic-buttons">
-                    <button title="Duplicate selected" class="duplicate-button btn btn-default btn-xs">Duplicate</button>
-                    <button title="Rename selected" class="rename-button btn btn-default btn-xs">Rename</button>
-                    <button title="Shutdown selected notebook(s)" class="shutdown-button btn btn-default btn-xs btn-warning">Shutdown</button>
-                    <button title="Deleted selected" class="delete-button btn btn-default btn-xs btn-danger"><i class="fa fa-trash"></i></button>
-                </div>
+                <form id='alternate_upload'  class='alternate_upload'>
+                  <span id="notebook_list_info">
+                  <span class="btn btn-xs btn-default btn-upload">
+                  <input type="file" name="datafile" class="fileinput" multiple='multiple'>
+                  Upload
+                  </span>
+                  </span>
+                </form>
                 <div id="new-buttons" class="btn-group">
                   <button class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown">
                   <span>New</span>

From f283754df07b291292da7f18ba723c0491e67150 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 2 Mar 2015 17:27:43 -0800
Subject: [PATCH 2/5] invoke css

---
 IPython/html/static/style/style.min.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 56d6f319b..45c27ff90 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -8621,10 +8621,8 @@ span#login_widget > .button .badge,
   width: 12ex;
   margin-right: -12ex;
 }
-.alternate_upload .input-overlay {
-  display: inline-block;
-  font-weight: bold;
-  line-height: 1em;
+.alternate_upload .btn-upload {
+  height: 22px;
 }
 /**
  * Primary styles
@@ -8657,6 +8655,7 @@ ul.breadcrumb span {
   padding-top: 1px;
 }
 .dynamic-buttons {
+  padding-top: 3px;
   display: inline-block;
 }
 .list_toolbar [class*="span"] {

From a6ceb828aa6ff725efad1ded5f34a37e8bcf7fd3 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Wed, 4 Mar 2015 11:31:36 -0800
Subject: [PATCH 3/5] Add dynamic instructions

---
 IPython/html/static/tree/js/notebooklist.js | 7 +++++++
 IPython/html/static/tree/less/tree.less     | 5 +++++
 IPython/html/templates/tree.html            | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
index 4ccb2d97d..7ed824e5d 100644
--- a/IPython/html/static/tree/js/notebooklist.js
+++ b/IPython/html/static/tree/js/notebooklist.js
@@ -493,6 +493,13 @@ define([
         }
         // Update total counter
         $('#counter-select-all').html(checked===0 ? '&nbsp;' : checked);
+
+        // If at aleast on item is selected, hide the selection instructions.
+        if (checked > 0) {
+            $('.dynamic-instructions').hide();
+        } else {
+            $('.dynamic-instructions').show();
+        }
     };
 
     NotebookList.prototype.add_link = function (model, item) {
diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less
index 1d8b2465d..e75587f8f 100644
--- a/IPython/html/static/tree/less/tree.less
+++ b/IPython/html/static/tree/less/tree.less
@@ -322,3 +322,8 @@ ul#new-menu {
 .shutdown-button {
     display: none;
 }
+
+.dynamic-instructions {
+    display: inline-block;
+    padding-top: @dashboard_tb_pad;
+}
diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html
index c95dc6346..853bb8e99 100644
--- a/IPython/html/templates/tree.html
+++ b/IPython/html/templates/tree.html
@@ -25,6 +25,9 @@ data-terminals-available="{{terminals_available}}"
         <div id="notebooks" class="tab-pane active">
           <div id="notebook_toolbar" class="row">
             <div class="col-sm-8 no-padding">
+              <div class="dynamic-instructions">
+                Select items to perform actions on them.
+              </div>
               <div class="dynamic-buttons">
                   <button title="Duplicate selected" class="duplicate-button btn btn-default btn-xs">Duplicate</button>
                   <button title="Rename selected" class="rename-button btn btn-default btn-xs">Rename</button>

From a840383a38e8849a34b7b9c325dd3029a5d8f029 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Wed, 4 Mar 2015 11:33:32 -0800
Subject: [PATCH 4/5] Add tooltip on the upload button.

---
 IPython/html/templates/tree.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html
index 853bb8e99..498b7de82 100644
--- a/IPython/html/templates/tree.html
+++ b/IPython/html/templates/tree.html
@@ -40,7 +40,7 @@ data-terminals-available="{{terminals_available}}"
                 <form id='alternate_upload'  class='alternate_upload'>
                   <span id="notebook_list_info">
                   <span class="btn btn-xs btn-default btn-upload">
-                  <input type="file" name="datafile" class="fileinput" multiple='multiple'>
+                  <input  title="Click to browse for a file to upload." type="file" name="datafile" class="fileinput" multiple='multiple'>
                   Upload
                   </span>
                   </span>

From dfa2804887c2a1a147cf57b876a0cf1cb7a418b9 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Wed, 4 Mar 2015 11:35:35 -0800
Subject: [PATCH 5/5] invoke css

---
 IPython/html/static/style/style.min.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 45c27ff90..f505adbf0 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -8939,6 +8939,10 @@ ul#new-menu {
 .shutdown-button {
   display: none;
 }
+.dynamic-instructions {
+  display: inline-block;
+  padding-top: 4px;
+}
 /*!
 *
 * IPython text editor webapp