From 37d795e5917e3a7ab8e97e2619826d9c0ad99302 Mon Sep 17 00:00:00 2001
From: Joshua Zeltser <joshua.zeltser@gmail.com>
Date: Wed, 5 Jun 2019 17:05:02 +0100
Subject: [PATCH 1/3] Solved Issue 4015

---
 notebook/static/base/js/dialog.js | 1 +
 notebook/templates/tree.html      | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/notebook/static/base/js/dialog.js b/notebook/static/base/js/dialog.js
index b59d9908b..e016077a4 100644
--- a/notebook/static/base/js/dialog.js
+++ b/notebook/static/base/js/dialog.js
@@ -60,6 +60,7 @@ define(['jquery',
                 })
                 .append($("<button>")
                     .attr("type", "button")
+                    .attr("aria-label","close")
                     .addClass("close")
                     .attr("data-dismiss", "modal")
                     .attr("aria-hidden", "true")
diff --git a/notebook/templates/tree.html b/notebook/templates/tree.html
index d84a973c1..f54920be7 100644
--- a/notebook/templates/tree.html
+++ b/notebook/templates/tree.html
@@ -61,6 +61,7 @@ data-server-root="{{server_root}}"
                   </span>
                   </span>
                 </form>
+
                 <div id="new-buttons" class="btn-group">
                   <button class="dropdown-toggle btn btn-default btn-xs" id="new-dropdown-button" data-toggle="dropdown">
                   <span>{% trans %}New{% endtrans %}</span>
@@ -87,6 +88,7 @@ data-server-root="{{server_root}}"
                     {% endif %}
                   </ul>
                 </div>
+
                 <div class="btn-group">
                     <button id="refresh_notebook_list" title="{% trans %}Refresh notebook list{% endtrans %}"  aria-label="{% trans %}Refresh notebook list{% endtrans %}" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
                 </div>
@@ -112,7 +114,7 @@ data-server-root="{{server_root}}"
               </div>
               <div id="project_name">
                 <ul class="breadcrumb">
-                  <li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-folder" alt="folder icon"></i></a></li>
+                  <li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-folder" alt="folder icon"></i>we</a></li>
                 {% for crumb in breadcrumbs[1:] %}
                   <li><a href="{{crumb[0]}}">{{crumb[1]}}</a></li>
                 {% endfor %}

From 42ba2b0a409df95af6cd7ee2721326cc425abc43 Mon Sep 17 00:00:00 2001
From: Joshua Zeltser <joshua.zeltser@gmail.com>
Date: Tue, 18 Jun 2019 18:30:32 +0100
Subject: [PATCH 2/3] Removed extra lines

---
 notebook/templates/tree.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/notebook/templates/tree.html b/notebook/templates/tree.html
index f54920be7..d84a973c1 100644
--- a/notebook/templates/tree.html
+++ b/notebook/templates/tree.html
@@ -61,7 +61,6 @@ data-server-root="{{server_root}}"
                   </span>
                   </span>
                 </form>
-
                 <div id="new-buttons" class="btn-group">
                   <button class="dropdown-toggle btn btn-default btn-xs" id="new-dropdown-button" data-toggle="dropdown">
                   <span>{% trans %}New{% endtrans %}</span>
@@ -88,7 +87,6 @@ data-server-root="{{server_root}}"
                     {% endif %}
                   </ul>
                 </div>
-
                 <div class="btn-group">
                     <button id="refresh_notebook_list" title="{% trans %}Refresh notebook list{% endtrans %}"  aria-label="{% trans %}Refresh notebook list{% endtrans %}" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
                 </div>
@@ -114,7 +112,7 @@ data-server-root="{{server_root}}"
               </div>
               <div id="project_name">
                 <ul class="breadcrumb">
-                  <li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-folder" alt="folder icon"></i>we</a></li>
+                  <li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-folder" alt="folder icon"></i></a></li>
                 {% for crumb in breadcrumbs[1:] %}
                   <li><a href="{{crumb[0]}}">{{crumb[1]}}</a></li>
                 {% endfor %}

From 5387cabd50dc15b7cdf341641c7c010383a35cf1 Mon Sep 17 00:00:00 2001
From: Joshua Zeltser <joshua.zeltser@gmail.com>
Date: Tue, 25 Jun 2019 12:10:32 +0100
Subject: [PATCH 3/3] Added translation function call to close button

---
 notebook/static/base/js/dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notebook/static/base/js/dialog.js b/notebook/static/base/js/dialog.js
index e016077a4..2fbf5feff 100644
--- a/notebook/static/base/js/dialog.js
+++ b/notebook/static/base/js/dialog.js
@@ -60,7 +60,7 @@ define(['jquery',
                 })
                 .append($("<button>")
                     .attr("type", "button")
-                    .attr("aria-label","close")
+                    .attr("aria-label", i18n.msg._("close"))
                     .addClass("close")
                     .attr("data-dismiss", "modal")
                     .attr("aria-hidden", "true")