Merge pull request #3507 from nyu-ossd-s18/improve-accessibility

takluyver · web-flow · commit fcf5f39606aa · 2018-04-18T16:31:28.000+02:00
Fixes to improve web accessibility
diff --git a/notebook/static/auth/js/loginmain.js b/notebook/static/auth/js/loginmain.js
@@ -4,10 +4,8 @@
 define(['jquery', 'base/js/namespace', 'base/js/page'], function($, IPython, page) {
     function login_main() {
       var page_instance = new page.Page('div#header', 'div#site');
-      $('button#login_submit').addClass("btn btn-default");
       page_instance.show();
       $('input#password_input').focus();
-    
       IPython.page = page_instance;
     }
     return login_main;
diff --git a/notebook/templates/login.html b/notebook/templates/login.html
@@ -20,15 +20,15 @@
       <div class="navbar-inner">
         <div class="container">
           <div class="center-nav">
-          {% if token_available %}
-            <p class="navbar-text nav">{% trans %}Password or token:{% endtrans %}</p>
-          {% else %}
-            <p class="navbar-text nav">{% trans %}Password:{% endtrans %}</p>
-          {% endif %}
             <form action="{{base_url}}login?next={{next}}" method="post" class="navbar-form pull-left">
               {{ xsrf_form_html() | safe }}
+              {% if token_available %}
+                <label for="password_input"><strong>{% trans %}Password or token:{% endtrans %}</strong></label>
+              {% else %}
+                <label for="password_input"><strong>{% trans %}Password:{% endtrans %}</strong></label>
+              {% endif %}
               <input type="password" name="password" id="password_input" class="form-control">
-              <button type="submit" id="login_submit">{% trans %}Log in{% endtrans %}</button>
+              <button type="submit" class="btn btn-default" id="login_submit">{% trans %}Log in{% endtrans %}</button>
             </form>
           </div>
         </div>
@@ -92,14 +92,15 @@ <h3>{% trans %}Setup a Password{% endtrans %}</h3>
         <form action="{{base_url}}login?next={{next}}" method="post" class="">
                 {{ xsrf_form_html() | safe }}
           <div class="form-group">
-            <input type="password" name="password" id="password_input" class="form-control" placeholder="Token">
+            <label for="token_input"><h4>Token</h4></label>
+            <input type="password" name="password" id="token_input" class="form-control">
           </div>
           <div class="form-group">
-            <input type="password" name="new_password" id="new_password_input"
-            class="form-control" placeholder="New password" required>
+            <label for="new_password_input"><h4>New Password</h4></label>
+            <input type="password" name="new_password" id="new_password_input" class="form-control" required>
           </div>
           <div class="form-group">
-            <button type="submit" id="login_submit">{% trans %}Log in and set new password{% endtrans %}</button>
+            <button type="submit" class="btn btn-default" id="login_new_pass_submit">{% trans %}Log in and set new password{% endtrans %}</button>
           </div>
         </form>
       {% endif %}
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
@@ -99,6 +99,7 @@
       })
 
     document.nbjs_translations = {{ nbjs_translations|safe }};
+    document.documentElement.lang = navigator.language.toLowerCase();
     </script>
 
     {% block meta %}
