[open-ils-commits] [GIT] Evergreen ILS branch master updated. 9fb0e8a397d635482bd730b10469fcd5cb91cd31
Evergreen Git
git at git.evergreen-ils.org
Fri Aug 2 14:10:30 EDT 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 9fb0e8a397d635482bd730b10469fcd5cb91cd31 (commit)
via 568897f3646fab4b0641b5448ba0dc7b93f7fd9f (commit)
via a2757eba444f292f2f49f10cbb6a5aadbbf2f6f6 (commit)
from deb85c5556cf0fbc7112b0fcec2da86b610b12d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9fb0e8a397d635482bd730b10469fcd5cb91cd31
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Fri Aug 2 10:29:55 2019 -0400
LP#1829567: (follow-up) fix styling regression on a navbar item
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Bill Erickson <berickxx at gmail.com>
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 4b21da7e72..b60e19a454 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -183,6 +183,7 @@
<span i18n>Retrieve Bib Record by ID</span>
</a>
<a href="/eg/staff/cat/catalog/retrieve_by_tcn"
+ class="dropdown-item"
egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
keySpec="shift+f3" keyDesc="Retrieve Bib Record by TCN">
<span class="material-icons">collections_bookmark</span>
commit 568897f3646fab4b0641b5448ba0dc7b93f7fd9f
Author: Bill Erickson <berickxx at gmail.com>
Date: Thu Aug 1 12:08:12 2019 -0400
LP1829567 Angular navbar access key additions
Adds keyboard shorts to the Angular navigation bar for the following
actions using the same key assignemnts as AngJS.
Patron Search
Item Status
OPAC
Check Out
Check In
Capture Holds
Renew items
Register Patron
Retrieve Last Patron
Retrieve Recent Patrons
Record In-House Use
Reprint Last Receipt
Retrieve Bib Record by TCN
Retrieve Last Bib Record
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
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 059d327be0..4b21da7e72 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -4,9 +4,8 @@
<div class="nav-item">
<a i18n class="nav-link with-material-icon"
href="/eg/staff/"
- egAccessKey keyCtx="navbar"
- keySpec="alt+h" i18n-keySpec
- keyDesc="Navigate Home" i18n-keyDesc>
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="alt+h" keyDesc="Navigate Home">
<span class="material-icons">home</span>
</a>
</div>
@@ -18,7 +17,9 @@
Search
</a>
<div class="dropdown-menu" ngbDropdownMenu>
- <a class="dropdown-item" href="/eg/staff/circ/patron/search">
+ <a class="dropdown-item" href="/eg/staff/circ/patron/search"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="alt+s f4" keyDesc="Patron Search">
<span class="material-icons">person</span>
<span i18n>Search for Patrons</span>
</a>
@@ -26,7 +27,9 @@
<span class="material-icons">assignment</span>
<span i18n>Search for Items by Barcode</span>
</a>
- <a href="/eg/staff/cat/catalog/index" class="dropdown-item">
+ <a href="/eg/staff/cat/catalog/index" class="dropdown-item"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="f3" keyDesc="Catalog">
<span class="material-icons">search</span>
<span i18n>Search the Catalog</span>
</a>
@@ -40,15 +43,21 @@
<span i18n>Circulation</span>
</a>
<div class="dropdown-menu" ngbDropdownMenu>
- <a class="dropdown-item" href="/eg/staff/circ/patron/bcsearch">
+ <a class="dropdown-item" href="/eg/staff/circ/patron/bcsearch"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="f1" keyDesc="Checkout">
<span class="material-icons">trending_up</span>
<span i18n>Check Out</span>
</a>
- <a class="dropdown-item" href="/eg/staff/circ/checkin/checkin">
+ <a class="dropdown-item" href="/eg/staff/circ/checkin/checkin"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="f2" keyDesc="Checkin">
<span class="material-icons">trending_down</span>
<span i18n>Check In</span>
</a>
- <a class="dropdown-item" href="/eg/staff/circ/checkin/capture">
+ <a class="dropdown-item" href="/eg/staff/circ/checkin/capture"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="shift+f2" keyDesc="Capture Holds">
<span class="material-icons">pin_drop</span>
<span i18n>Capture Holds</span>
</a>
@@ -56,15 +65,21 @@
<span class="material-icons">view_list</span>
<span i18n>Pull List for Hold Requests</span>
</a>
- <a class="dropdown-item" href="/eg/staff/circ/renew/renew">
+ <a class="dropdown-item" href="/eg/staff/circ/renew/renew"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="ctrl+f2" keyDesc="Renew Items">
<span class="material-icons">autorenew</span>
<span i18n>Renew Items</span>
</a>
- <a class="dropdown-item" href="/eg/staff/circ/patron/register">
+ <a class="dropdown-item" href="/eg/staff/circ/patron/register"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="shift+f1" keyDesc="Register Patron">
<span class="material-icons">person_add</span>
<span i18n>Register Patron</span>
</a>
- <a class="dropdown-item" href="/eg/staff/circ/patron/last">
+ <a class="dropdown-item" href="/eg/staff/circ/patron/last"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="f8" keyDesc="Retrieve Last Patron">
<span class="material-icons">redo</span>
<span i18n>Retrieve Last Patron</span>
</a>
@@ -85,7 +100,9 @@
<span class="material-icons">check_circle</span>
<span i18n>Verify Credentials</span>
</a>
- <a class="dropdown-item" href="/eg/staff/circ/in_house_use/index">
+ <a class="dropdown-item" href="/eg/staff/circ/in_house_use/index"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="f6" keyDesc="Record In-House Use">
<span class="material-icons">playlist_add</span>
<span i18n>Record In-House Use</span>
</a>
@@ -99,9 +116,8 @@
<span i18n>Replace Barcode</span>
</a>
<a class="dropdown-item" href="/eg/staff/cat/item/search"
- egAccessKey keyCtx="navbar"
- keySpec="f5" i18n-keySpec
- keyDesc="Navigate To Item Status" i18n-keyDesc>
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="f5" keyDesc="Navigate To Item Status">
<span class="material-icons">question_answer</span>
<span i18n>Item Status</span>
</a>
@@ -110,7 +126,9 @@
<span i18n>Scan Item as Missing Pieces</span>
</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" (click)="reprintLast()">
+ <a class="dropdown-item" (click)="reprintLast()"
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="f9" keyDesc="Reprint Last Receipt">
<span class="material-icons">redo</span>
<span i18n>Reprint Last Receipt</span>
</a>
@@ -132,7 +150,9 @@
</a>
<div class="dropdown-menu" ngbDropdownMenu>
- <a href="/eg/staff/cat/catalog/index" class="dropdown-item">
+ <a href="/eg/staff/cat/catalog/index" class="dropdown-item"
+ egAccessKey keyCtx="navbar"i18n-keySpec i18n-keyDesc
+ keySpec="f3" keyDesc="Catalog">
<span class="material-icons">search</span>
<span i18n>Search the Catalog</span>
</a>
@@ -143,9 +163,8 @@
<span i18n>Staff Catalog (Experimental)</span>
</a>
<a class="dropdown-item" href="/eg/staff/cat/item/search"
- egAccessKey keyCtx="navbar"
- keySpec="f5" i18n-keySpec
- keyDesc="Navigate To Item Status" i18n-keyDesc>
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="f5" keyDesc="Navigate To Item Status">
<span class="material-icons">question_answer</span>
<span i18n>Item Status</span>
</a>
@@ -164,14 +183,14 @@
<span i18n>Retrieve Bib Record by ID</span>
</a>
<a href="/eg/staff/cat/catalog/retrieve_by_tcn"
- eg-accesskey="shift+f3"
- eg-accesskey-desc="Retrieve Last Bib Record" class="dropdown-item">
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="shift+f3" keyDesc="Retrieve Bib Record by TCN">
<span class="material-icons">collections_bookmark</span>
<span i18n>Retrieve Bib Record by TCN</span>
</a>
<a (click)="retrieveLastRecord()"
- eg-accesskey="shift+f8"
- eg-accesskey-desc="Retrieve Last Bib Record" class="dropdown-item">
+ egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
+ keySpec="shift+f8" keyDesc="Retrieve Last Bib Record">
<span class="material-icons">redo</span>
<span i18n>Retrieve Last Bib Record</span>
</a>
commit a2757eba444f292f2f49f10cbb6a5aadbbf2f6f6
Author: Bill Erickson <berickxx at gmail.com>
Date: Thu Aug 1 12:07:56 2019 -0400
LP1829567 Angular access key improvements
1. Adds support for shift+ shortcuts.
2. Remove duplicate key assignments made within the same context. This
is especially useful in the navigation bar since some commands repeat
from different menus.
3. Indicate in the key assignemnts help page when an assignemnt has be
superseded by another assignment.
4. Open the help page in large-dialog mode for more room.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
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 ae584cec40..8396ea5873 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,23 @@
</div>
<div class="modal-body">
<div class="row border-bottom">
- <div class="col-lg-3 p-1 border-right text-center" i18n>Command</div>
+ <div class="col-lg-2 p-1 border-right text-center" i18n>Command</div>
<div class="col-lg-6 p-1 border-right" i18n>Action</div>
- <div class="col-lg-3 p-1" i18n>Context</div>
+ <div class="col-lg-2 p-1" i18n>Context</div>
+ <div class="col-lg-2 p-1" i18n>Active?</div>
</div>
<div class="row border-bottom" *ngFor="let a of assignments()">
- <div class="col-lg-3 p-1 border-right text-center">{{a.key}}</div>
+ <div class="col-lg-2 p-1 border-right text-center">{{a.key}}</div>
<div class="col-lg-6 p-1 border-right">{{a.desc}}</div>
- <div class="col-lg-3 p-1">{{a.ctx}}</div>
+ <div class="col-lg-2 p-1 border-right">{{a.ctx}}</div>
+ <div class="col-lg-2 p-1"><eg-bool [value]="!a.shadowed"></eg-bool></div>
+ </div>
+ <div class="row mt-2">
+ <div class="col-lg-12 font-italic" i18n>
+ If an assignment is not active, it means it was superseded by
+ an assignment from a different context using the same keyboard
+ shortcut.
+ </div>
</div>
</div>
<div class="modal-footer">
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 0b6302f81d..ecfe67adcc 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
@@ -5,6 +5,7 @@ export interface AccessKeyAssignment {
desc: string; // human-friendly description
ctx: string; // template context
action: Function; // handler function
+ shadowed?: boolean; // Has this assignemnt been shadowed by another.
}
@Injectable()
@@ -17,7 +18,27 @@ export class AccessKeyService {
constructor() {}
assign(assn: AccessKeyAssignment): void {
- this.assignments.unshift(assn);
+ const list: AccessKeyAssignment[] = [];
+
+ // Avoid duplicate assignments for the same context.
+ // Most recent assignment always wins.
+ this.assignments.forEach(a => {
+ if (a.key === assn.key) {
+ if (a.ctx === assn.ctx) {
+ // If key and context match, keep only the most recent.
+ return;
+ } else {
+ // An assignment within a different context shadows
+ // an existing assignment. Keep the assignment
+ // but mark it as shadowed.
+ a.shadowed = true;
+ }
+ }
+ list.unshift(a);
+ });
+ list.unshift(assn);
+
+ this.assignments = list;
}
/**
@@ -31,6 +52,7 @@ export class AccessKeyService {
let s = '';
if (evt.ctrlKey || evt.metaKey) { s += 'ctrl+'; }
if (evt.altKey) { s += 'alt+'; }
+ if (evt.shiftKey) { s += 'shift+'; }
s += evt.key.toLowerCase();
return s;
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 7afcc325a6..9002fa8e1f 100644
--- a/Open-ILS/src/eg2/src/app/staff/staff.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/staff.component.html
@@ -11,7 +11,7 @@
<a egAccessKey keyCtx="base"
keySpec="ctrl+h" i18n-keySpec
keyDesc="Display AccessKey Info Dialog" i18n-keyDesc
- (click)="egAccessKeyInfo.open()">
+ (click)="egAccessKeyInfo.open({size: 'lg'})">
</a>
<a egAccessKey keyCtx="base"
keySpec="shift+f10" i18n-keySpec
-----------------------------------------------------------------------
Summary of changes:
.../share/accesskey/accesskey-info.component.html | 17 ++++--
.../src/app/share/accesskey/accesskey.service.ts | 24 +++++++-
Open-ILS/src/eg2/src/app/staff/nav.component.html | 68 ++++++++++++++--------
.../src/eg2/src/app/staff/staff.component.html | 2 +-
4 files changed, 81 insertions(+), 30 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list