From d42d6fd5ee73a068921b07cd4cf0e5306bcdaff7 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Sun, 15 Apr 2018 19:42:07 +0000
Subject: [PATCH] LP#1626157 more accesskeys

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../eg2/src/app/share/accesskey/accesskey-info.component.html    | 7 ++++---
 .../src/eg2/src/app/share/accesskey/accesskey-info.component.ts  | 3 +--
 Open-ILS/src/eg2/src/app/share/accesskey/accesskey.directive.ts  | 3 +++
 Open-ILS/src/eg2/src/app/share/accesskey/accesskey.service.ts    | 9 +++++----
 Open-ILS/src/eg2/src/app/staff/nav.component.html                | 4 ++--
 Open-ILS/src/eg2/src/app/staff/staff.component.html              | 4 ++--
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.html b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.html
index 06b439bae9..b221c1c904 100644
--- a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.html
+++ b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.html
@@ -8,14 +8,15 @@
     </button>
   </div>
   <div class="modal-body">
-    <p i18n>Assignments toward the top have higher precedence</p>
     <div class="row border-bottom">
       <div class="col-3 p-1 border-right text-center" i18n>Command</div>
-      <div class="col-9 p-1" i18n>Action</div>
+      <div class="col-6 p-1 border-right" i18n>Action</div>
+      <div class="col-3 p-1" i18n>Context</div>
     </div>
     <div class="row border-bottom" *ngFor="let a of assignments()">
       <div class="col-3 p-1 border-right text-center">{{a.key}}</div>
-      <div class="col-9 p-1">{{a.desc}}</div>
+      <div class="col-6 p-1 border-right">{{a.desc}}</div>
+      <div class="col-3 p-1">{{a.ctx}}</div>
     </div>
   </div>
   <div class="modal-footer">
diff --git a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.ts b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.ts
index d74d7a1514..c925a50342 100644
--- a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.ts
@@ -12,8 +12,7 @@ import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
 export class EgAccessKeyInfoComponent extends EgDialogComponent {
 
 	constructor(
-        // NgbModal import required for subclassing with a constructor.
-        private modal: NgbModal,
+        private modal: NgbModal, // required for passing to parent
         private keyService: EgAccessKeyService) {
         super(modal);
     }
diff --git a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.directive.ts b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.directive.ts
index 62ff348c53..8e58ab1c47 100644
--- a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.directive.ts
+++ b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.directive.ts
@@ -21,6 +21,7 @@ export class EgAccessKeyDirective implements OnInit {
 
     @Input() keySpec: string;
     @Input() keyDesc: string;
+    @Input() keyCtx: string;
     
 	constructor(
         private elm: ElementRef,
@@ -35,8 +36,10 @@ export class EgAccessKeyDirective implements OnInit {
         this.keyService.assign({
             key: this.keySpec, 
             desc: this.keyDesc,
+            ctx: this.keyCtx,
             action: () => {this.elm.nativeElement.click()}
         });
+
     }
 }
 
diff --git a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.service.ts b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.service.ts
index 276f8053ca..1a3dab32c1 100644
--- a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.service.ts
+++ b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.service.ts
@@ -1,9 +1,10 @@
 import {Injectable, EventEmitter, HostListener} from '@angular/core';
 
 export interface EgAccessKeyAssignment {
-    key: string,
-    desc: string,
-    action: Function
+    key: string,     // keyboard command
+    desc: string,    // human-friendly description
+    ctx: string,     // template context 
+    action: Function // handler function
 };
 
 @Injectable()
@@ -58,7 +59,7 @@ export class EgAccessKeyService {
      */
     infoIze(): any[] {
         return this.assignments.map(a => {
-            return {key: a.key, desc: a.desc};
+            return {key: a.key, desc: a.desc, ctx: a.ctx};
         });
     }
 
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index 668f624274..4b1dd4b883 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -4,7 +4,7 @@
       <div class="nav-item">
         <a i18n class="nav-link with-material-icon" 
           routerLink="/staff/splash"
-          egAccessKey 
+          egAccessKey keyCtx="navbar"
           keySpec="alt+h" i18n-keySpec
           keyDesc="Navigate Home" i18n-keyDesc>
           <span class="material-icons">home</span>
@@ -27,7 +27,7 @@
             <span i18n>Search for Copies by Barcode</span>
           </a>
           <a class="dropdown-item" routerLink="/staff/catalog/search"
-            egAccessKey 
+            egAccessKey keyCtx="navbar"
             keySpec="alt+c" i18n-keySpec
             keyDesc="Navigate To Catalog" i18n-keyDesc>
             <span class="material-icons">search</span>
diff --git a/Open-ILS/src/eg2/src/app/staff/staff.component.html b/Open-ILS/src/eg2/src/app/staff/staff.component.html
index ab7ba84b31..ac17f7a303 100644
--- a/Open-ILS/src/eg2/src/app/staff/staff.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/staff.component.html
@@ -8,9 +8,9 @@
 
 <!-- EgAccessKey Info Panel -->
 <eg-accesskey-info #egAccessKeyInfo></eg-accesskey-info>
-<a egAccessKey 
+<a egAccessKey keyCtx="base"
     keySpec="ctrl+h" i18n-keySpec
-    keyDesc="Display Access Key Info Dialog" i18n-keyDesc
+    keyDesc="Display AccessKey Info Dialog" i18n-keyDesc
     (click)="egAccessKeyInfo.open()">
 </a>
 
-- 
2.11.0