From 5c80a9bbc8ce8f8493dfe86f96aef556298cd975 Mon Sep 17 00:00:00 2001
From: Joshua Zeltser <joshua.zeltser@gmail.com>
Date: Wed, 26 Jun 2019 18:07:35 +0100
Subject: [PATCH 1/5] Fixed Issue #3217

added main and navigation tags to tree and page.html
---
 .gitignore                   | 2 +-
 notebook/templates/page.html | 9 +++++----
 notebook/templates/tree.html | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 28a83b48fd..907ccb8cc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ src
 .idea/
 Read the Docs
 config.rst
-
+*.iml
 /.project
 /.pydevproject
 
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index 9e68da1b2c..8a7e789e0e 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -122,7 +122,7 @@
   </div>
 </noscript>
 
-<div id="header">
+<div id="header" role="navigation" aria-label="Top Menu">
   <div id="header-container" class="container">
   <div id="ipython_notebook" class="nav navbar-brand"><a href="{{default_url}}
     {%- if logged_in and token -%}?token={{token}}{%- endif -%}" title='{% trans %}dashboard{% endtrans %}'>
@@ -153,11 +153,12 @@
 
   {% block header %}
   {% endblock %}
-</div>
+
+    </div>
 
 <div id="site">
-{% block site %}
-{% endblock %}
+    {% block site %}
+    {% endblock %}
 </div>
 
 {% block after_site %}
diff --git a/notebook/templates/tree.html b/notebook/templates/tree.html
index d84a973c1f..113be4cc7d 100644
--- a/notebook/templates/tree.html
+++ b/notebook/templates/tree.html
@@ -1,5 +1,4 @@
 {% extends "page.html" %}
-
 {% block title %}{{page_title}}{% endblock %}
 
 
@@ -27,7 +26,8 @@
 {% block site %}
 
   <div id="ipython-main-app" class="container">
-    <div id="tab_content" class="tabbable">
+
+    <div id="tab_content" class="tabbable" role="main">
       <ul id="tabs" class="nav nav-tabs">
         <li class="active"><a href="#notebooks" data-toggle="tab">{% trans %}Files{% endtrans %}</a></li>
         <li><a href="#running" data-toggle="tab">{% trans %}Running{% endtrans %}</a></li>
@@ -204,4 +204,4 @@
 
 
 <script src="{{ static_url("tree/js/main.min.js") }}" type="text/javascript" charset="utf-8"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file

From 6f79465d7a3fb0e778111fae6eb6f99998ea4866 Mon Sep 17 00:00:00 2001
From: Joshua Zeltser <joshua.zeltser@gmail.com>
Date: Mon, 8 Jul 2019 10:24:34 +0100
Subject: [PATCH 2/5] Added missing translation tags

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

diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index 8a7e789e0e..3511aa0376 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -122,7 +122,7 @@
   </div>
 </noscript>
 
-<div id="header" role="navigation" aria-label="Top Menu">
+<div id="header" role="navigation" aria-label="{% trans %}Top Menu{% endtrans %}">
   <div id="header-container" class="container">
   <div id="ipython_notebook" class="nav navbar-brand"><a href="{{default_url}}
     {%- if logged_in and token -%}?token={{token}}{%- endif -%}" title='{% trans %}dashboard{% endtrans %}'>

From bcc56515caf69722ace44dbac7270a1274013905 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 11 Jul 2019 11:03:59 +0100
Subject: [PATCH 3/5] Revert random indentation changes

---
 notebook/templates/page.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index 3511aa0376..155c2a727a 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -153,12 +153,11 @@
 
   {% block header %}
   {% endblock %}
-
-    </div>
+</div>
 
 <div id="site">
-    {% block site %}
-    {% endblock %}
+{% block site %}
+{% endblock %}
 </div>
 
 {% block after_site %}

From 7d1444900f31a5b860eaf5e2d5733043ea8bdb84 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 11 Jul 2019 11:04:47 +0100
Subject: [PATCH 4/5] Revert newline changes

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

diff --git a/notebook/templates/tree.html b/notebook/templates/tree.html
index 113be4cc7d..59d6db2729 100644
--- a/notebook/templates/tree.html
+++ b/notebook/templates/tree.html
@@ -26,7 +26,6 @@
 {% block site %}
 
   <div id="ipython-main-app" class="container">
-
     <div id="tab_content" class="tabbable" role="main">
       <ul id="tabs" class="nav nav-tabs">
         <li class="active"><a href="#notebooks" data-toggle="tab">{% trans %}Files{% endtrans %}</a></li>
@@ -204,4 +203,4 @@
 
 
 <script src="{{ static_url("tree/js/main.min.js") }}" type="text/javascript" charset="utf-8"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From dba4ed86d08c8257a0fd3d650b170b8d970227e0 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 11 Jul 2019 11:05:20 +0100
Subject: [PATCH 5/5] Add back extra line

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

diff --git a/notebook/templates/tree.html b/notebook/templates/tree.html
index 59d6db2729..82fd6b25af 100644
--- a/notebook/templates/tree.html
+++ b/notebook/templates/tree.html
@@ -1,4 +1,5 @@
 {% extends "page.html" %}
+
 {% block title %}{{page_title}}{% endblock %}