From 3b239afcdab5c4e4e56380e3f6b5bec3312a3118 Mon Sep 17 00:00:00 2001
From: fabihaahmed <fabiha.ahmed@icloud.com>
Date: Tue, 11 Jun 2019 14:48:12 +0100
Subject: [PATCH] Fixes issue #3998, #3971 and  #3968

---
 notebook/templates/notebook.html |  6 +++---
 notebook/templates/tree.html     | 17 +++++++++--------
 package.json                     |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html
index 579cc45c5..a31387894 100644
--- a/notebook/templates/notebook.html
+++ b/notebook/templates/notebook.html
@@ -80,7 +80,7 @@ data-notebook-path="{{notebook_path | urlencode}}"
                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans %}File{% endtrans %}</a>
                     <ul id="file_menu" class="dropdown-menu">
                         <li id="new_notebook" class="dropdown-submenu">
-                            <a href="#">{% trans %}New Notebook{% endtrans %}</a>
+                            <a href="#">{% trans %}New Notebook{% endtrans %}<span class="sr-only">Toggle Dropdown</span></a>
                             <ul class="dropdown-menu" id="menu-new-notebook-submenu"></ul>
                         </li>
                         <li id="open_notebook"
@@ -98,7 +98,7 @@ data-notebook-path="{{notebook_path | urlencode}}"
                         <li id="save_checkpoint"><a href="#">{% trans %}Save and Checkpoint{% endtrans %}</a></li>
                         <!-- <hr/> -->
                         <li class="divider"></li>
-                        <li id="restore_checkpoint" class="dropdown-submenu"><a href="#">{% trans %}Revert to Checkpoint{% endtrans %}</a>
+                        <li id="restore_checkpoint" class="dropdown-submenu"><a href="#">{% trans %}Revert to Checkpoint{% endtrans %}<span class="sr-only">Toggle Dropdown</span></a>
                           <ul class="dropdown-menu">
                             <li><a href="#"></a></li>
                             <li><a href="#"></a></li>
@@ -109,7 +109,7 @@ data-notebook-path="{{notebook_path | urlencode}}"
                         </li>
                         <li class="divider"></li>
                         <li id="print_preview"><a href="#">{% trans %}Print Preview{% endtrans %}</a></li>
-                        <li class="dropdown-submenu"><a href="#">{% trans %}Download as{% endtrans %}</a>
+                        <li class="dropdown-submenu"><a href="#">{% trans %}Download as{% endtrans %}<span class="sr-only">Toggle Dropdown</span></a>
                             <ul id="download_menu" class="dropdown-menu">
                                 {% for exporter in get_frontend_exporters() %}
                                 <li id="download_{{ exporter.name }}">
diff --git a/notebook/templates/tree.html b/notebook/templates/tree.html
index d84a973c1..d7a1e01c7 100644
--- a/notebook/templates/tree.html
+++ b/notebook/templates/tree.html
@@ -41,13 +41,13 @@ data-server-root="{{server_root}}"
                 {% trans %}Select items to perform actions on them.{% endtrans %}
               </div>
               <div class="dynamic-buttons">
-                  <button title="{% trans %}Duplicate selected{% endtrans %}" aria-label="{% trans %}Duplicate selected{% endtrans %}" class="duplicate-button btn btn-default btn-xs">{% trans %}Duplicate{% endtrans %}</button>
-                  <button title="{% trans %}Rename selected{% endtrans %}" aria-label="{% trans %}Rename selected{% endtrans %}" class="rename-button btn btn-default btn-xs">{% trans %}Rename{% endtrans %}</button>
-                  <button title="{% trans %}Move selected{% endtrans %}" aria-label="{% trans %}Move selected{% endtrans %}" class="move-button btn btn-default btn-xs">{% trans %}Move{% endtrans %}</button>
-                  <button title="{% trans %}Download selected{% endtrans %}" aria-label="{% trans %}Download selected{% endtrans %}" class="download-button btn btn-default btn-xs">{% trans %}Download{% endtrans %}</button>
-                  <button title="{% trans %}Shutdown selected notebook(s){% endtrans %}" aria-label="{% trans %}Shutdown selected notebook(s){% endtrans %}" class="shutdown-button btn btn-default btn-xs btn-warning">{% trans %}Shutdown{% endtrans %}</button>
-                  <button title="{% trans %}View selected{% endtrans %}" aria-label="{% trans %}View selected{% endtrans %}" class="view-button btn btn-default btn-xs">{% trans %}View{% endtrans %}</button>
-                  <button title="{% trans %}Edit selected{% endtrans %}" aria-label="{% trans %}Edit selected{% endtrans %}" class="edit-button btn btn-default btn-xs">{% trans %}Edit{% endtrans %}</button>
+                  <button title="{% trans %}Duplicate selected{% endtrans %}" aria-label="{% trans %}Duplicate{% endtrans %}" class="duplicate-button btn btn-default btn-xs">{% trans %}Duplicate{% endtrans %}</button>
+                  <button title="{% trans %}Rename selected{% endtrans %}" aria-label="{% trans %}Rename{% endtrans %}" class="rename-button btn btn-default btn-xs">{% trans %}Rename{% endtrans %}</button>
+                  <button title="{% trans %}Move selected{% endtrans %}" aria-label="{% trans %}Move{% endtrans %}" class="move-button btn btn-default btn-xs">{% trans %}Move{% endtrans %}</button>
+                  <button title="{% trans %}Download selected{% endtrans %}" aria-label="{% trans %}Download{% endtrans %}" class="download-button btn btn-default btn-xs">{% trans %}Download{% endtrans %}</button>
+                  <button title="{% trans %}Shutdown selected notebook(s){% endtrans %}" aria-label="{% trans %}Shutdown{% endtrans %}" class="shutdown-button btn btn-default btn-xs btn-warning">{% trans %}Shutdown{% endtrans %}</button>
+                  <button title="{% trans %}View selected{% endtrans %}" aria-label="{% trans %}View{% endtrans %}" class="view-button btn btn-default btn-xs">{% trans %}View{% endtrans %}</button>
+                  <button title="{% trans %}Edit selected{% endtrans %}" aria-label="{% trans %}Edit{% endtrans %}" class="edit-button btn btn-default btn-xs">{% trans %}Edit{% endtrans %}</button>
                   <button title="{% trans %}Delete selected{% endtrans %}" aria-label="{% trans %}Delete selected{% endtrans %}" class="delete-button btn btn-default btn-xs btn-danger"><i class="fa fa-trash"></i></button>
               </div>
             </div>
@@ -99,7 +99,8 @@ data-server-root="{{server_root}}"
                 <button title="{% trans %}Select All / None{% endtrans %}" aria-label="{% trans %}Select All / None{% endtrans %}" type="button" class="btn btn-default btn-xs" id="button-select-all">
                   <input type="checkbox" class="pull-left tree-selector" id="select-all"><span id="counter-select-all">&nbsp;</span></input>
                 </button>
-                <button title="{% trans %}Select...{% endtrans %}" class="btn btn-default btn-xs dropdown-toggle" type="button" id="tree-selector-btn" data-toggle="dropdown" aria-expanded="true">
+                <button title="{% trans %}Select Folders/All Notebooks/Running/Files {% endtrans %}" class="btn btn-default btn-xs dropdown-toggle" type="button" id="tree-selector-btn" data-toggle="dropdown" aria-expanded="true">
+                  <span class="sr-only">checkbox</span>
                   <span class="caret"></span>
                   <span class="sr-only">Toggle Dropdown</span>
                 </button>
diff --git a/package.json b/package.json
index 062978e8a..43c2f526e 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "bower": "bower install",
-    "build": "python setup.py js css",
+    "build": "python3 setup.py js css",
     "build:watch": "set -e; while true; do npm run build; sleep 3; done"
   },
   "devDependencies": {