From cb980ddc455e9eb89b54dcb696cb7185fb347598 Mon Sep 17 00:00:00 2001
From: rr- <rr-@sakuya.pl>
Date: Thu, 31 Mar 2016 21:15:05 +0200
Subject: [PATCH] front/nav: add access keys

---
 static/css/main.css                           |  3 +++
 static/html/top_navigation.tpl                |  2 +-
 .../controllers/top_navigation_controller.js  | 25 ++++++++++---------
 static/js/views/top_navigation_view.js        |  7 ++++++
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/static/css/main.css b/static/css/main.css
index f95d3c9..bcabaab 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -102,6 +102,9 @@ nav.text-nav ul li.active a {
 #top-nav ul li[data-name=help] {
     float: none;
 }
+#top-nav .access-key {
+    text-decoration: underline;
+}
 
 .messages .message {
     padding: 0.5em;
diff --git a/static/html/top_navigation.tpl b/static/html/top_navigation.tpl
index 92da560..fb693c2 100644
--- a/static/html/top_navigation.tpl
+++ b/static/html/top_navigation.tpl
@@ -3,7 +3,7 @@
         -->{{#each items}}<!--
             -->{{#if this.available}}<!--
                 --><li data-name='{{@key}}'><!--
-                    --><a href='{{this.url}}'>{{this.name}}</a><!--
+                    --><a href='{{this.url}}' accesskey='{{this.accessKey}}'>{{this.name}}</a><!--
                 --></li><!--
             -->{{/if}}<!--
         -->{{/each}}<!--
diff --git a/static/js/controllers/top_navigation_controller.js b/static/js/controllers/top_navigation_controller.js
index 5784718..4082b09 100644
--- a/static/js/controllers/top_navigation_controller.js
+++ b/static/js/controllers/top_navigation_controller.js
@@ -1,7 +1,8 @@
 'use strict';
 
 class NavigationItem {
-    constructor(name, url) {
+    constructor(accessKey, name, url) {
+        this.accessKey = accessKey;
         this.name = name;
         this.url = url;
         this.available = true;
@@ -15,17 +16,17 @@ class TopNavigationController {
         this.activeItem = null;
 
         this.items = {
-            'home':     new NavigationItem('Home',     '/'),
-            'posts':    new NavigationItem('Posts',    '/posts'),
-            'upload':   new NavigationItem('Upload',   '/upload'),
-            'comments': new NavigationItem('Comments', '/comments'),
-            'tags':     new NavigationItem('Tags',     '/tags'),
-            'users':    new NavigationItem('Users',    '/users'),
-            'account':  new NavigationItem('Account',  '/user/{me}'),
-            'register': new NavigationItem('Register', '/register'),
-            'login':    new NavigationItem('Log in',   '/login'),
-            'logout':   new NavigationItem('Logout',   '/logout'),
-            'help':     new NavigationItem('Help',     '/help'),
+            'home':     new NavigationItem('H', 'Home',     '/'),
+            'posts':    new NavigationItem('P', 'Posts',    '/posts'),
+            'upload':   new NavigationItem('U', 'Upload',   '/upload'),
+            'comments': new NavigationItem('C', 'Comments', '/comments'),
+            'tags':     new NavigationItem('T', 'Tags',     '/tags'),
+            'users':    new NavigationItem('S', 'Users',    '/users'),
+            'account':  new NavigationItem('A', 'Account',  '/user/{me}'),
+            'register': new NavigationItem('R', 'Register', '/register'),
+            'login':    new NavigationItem('L', 'Log in',   '/login'),
+            'logout':   new NavigationItem('O', 'Logout',   '/logout'),
+            'help':     new NavigationItem('E', 'Help',     '/help'),
         };
 
         this.api.authenticated.listen(() => {
diff --git a/static/js/views/top_navigation_view.js b/static/js/views/top_navigation_view.js
index 3d77882..23c76bf 100644
--- a/static/js/views/top_navigation_view.js
+++ b/static/js/views/top_navigation_view.js
@@ -11,6 +11,13 @@ class TopNavigationView extends BaseView {
 
     render(items) {
         this.navHolder.innerHTML = this.template({items: items});
+        for (let link of this.navHolder.querySelectorAll('a')) {
+            const regex = new RegExp(
+                '(' + link.getAttribute('accesskey') + ')', 'i');
+            link.innerHTML = link.textContent.replace(
+                regex,
+                '<span class="access-key" data-accesskey="$1">$1</span>');
+        }
     }
 
     activate(itemName) {