From 33d25d9c59b91bf89ac8b4bacf3cf46c3e5e7fc2 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 13 Dec 2017 14:05:52 -0500 Subject: [PATCH] LP#626157 Ang2 experiments Signed-off-by: Bill Erickson --- Open-ILS/webby-src/src/app/staff/nav.component.css | 18 ++- .../webby-src/src/app/staff/nav.component.html | 154 +++++++++++++++++++-- Open-ILS/webby-src/src/app/staff/nav.component.ts | 14 +- .../webby-src/src/app/staff/splash.component.html | 16 ++- Open-ILS/webby-src/src/styles.css | 5 + 5 files changed, 185 insertions(+), 22 deletions(-) diff --git a/Open-ILS/webby-src/src/app/staff/nav.component.css b/Open-ILS/webby-src/src/app/staff/nav.component.css index eb037e874b..ee4f93e89b 100644 --- a/Open-ILS/webby-src/src/app/staff/nav.component.css +++ b/Open-ILS/webby-src/src/app/staff/nav.component.css @@ -15,6 +15,10 @@ font-size: 14px; } +#staff-navbar .navbar-nav { + padding: 3px; +} + /* align top of dropdown w/ bottom of nav */ #staff-navbar .dropdown-menu { margin-top: 7px; @@ -26,8 +30,13 @@ font-size: 14px; font-weight: 400; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - padding-left: 0.5rem; - padding-right: 0.5rem; + padding-left: 0.7rem; + padding-right: 0.7rem; + margin: -4px; +} + +#staff-navbar .dropdown-item .material-icons { + font-size: 18px; } #staff-navbar .nav-link { @@ -39,11 +48,6 @@ color: #ddd; cursor: pointer; } -#staff-navbar .nav-item { - /* - margin-right: 8px; - */ -} #staff-navbar .navbar-nav > .open > a, #staff-navbar .navbar-nav > .open > a:focus, diff --git a/Open-ILS/webby-src/src/app/staff/nav.component.html b/Open-ILS/webby-src/src/app/staff/nav.component.html index 7b1a05298f..859ec7f865 100644 --- a/Open-ILS/webby-src/src/app/staff/nav.component.html +++ b/Open-ILS/webby-src/src/app/staff/nav.component.html @@ -7,29 +7,116 @@ +
- Circulation + Search
- + + person + Search for Patrons + + + assignment + Search for Copies by Barcode + + + search + Search the Catalog + +
+
+
+ +
+
+ + Circulation + +
+ trending_up Check Out - + trending_down Check In + + pin_drop + Capture Holds + + + view_list + Pull List for Hold Requests + + + autorenew + Renew Items + + + person_add + Register Patron + + + redo + Retrieve Last Patron + + + redo + Retrieve Recent Patrons + + + thumb_up + Pending Patrons + + + list + User Buckets + +
+ + check_circle + Verify Credentials + + + playlist_add + Record In-House Use + + + format_list_bulleted + Holds Shelf +
- - alarm_add - Test + + library_books + Replace Barcode + + + question_answer + Item Status + + + grid_on + Scan Item as Missing Pieces + +
+ + redo + Reprint Last Receipt + +
+ + signal_wifi_off + Offline Circulation
+ +
@@ -45,12 +132,63 @@
+
+
+ + Acquisitions + +
+ + search + TODO + +
+
+
+ +
+
+ + Booking + +
+ + search + TODO + +
+
+
+ +
+
+ + Administration + +
+ + search + TODO + +
+
+
+ +
+ {{user}} @ {{workstation}} +
+
- more_vert + list
diff --git a/Open-ILS/webby-src/src/app/staff/nav.component.ts b/Open-ILS/webby-src/src/app/staff/nav.component.ts index bbffd29fa0..62fb605a63 100644 --- a/Open-ILS/webby-src/src/app/staff/nav.component.ts +++ b/Open-ILS/webby-src/src/app/staff/nav.component.ts @@ -1,5 +1,6 @@ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import {Component, OnInit} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {EgAuthService} from '@eg/core/auth'; @Component({ selector: 'eg-staff-nav-bar', @@ -8,10 +9,15 @@ import { ActivatedRoute, Router } from '@angular/router'; }) export class EgStaffNavComponent implements OnInit { - constructor(private route: ActivatedRoute) {} - ngOnInit() { + user: string; + workstation: string; + + constructor(private auth: EgAuthService) {} + ngOnInit() { + this.user = this.auth.user().usrname(); + this.workstation = this.auth.workstation(); } } diff --git a/Open-ILS/webby-src/src/app/staff/splash.component.html b/Open-ILS/webby-src/src/app/staff/splash.component.html index 9f2f23e43a..4846cc5e27 100644 --- a/Open-ILS/webby-src/src/app/staff/splash.component.html +++ b/Open-ILS/webby-src/src/app/staff/splash.component.html @@ -1,4 +1,14 @@ + + +
@@ -11,7 +21,7 @@
-
+
Circulation and Patrons
@@ -35,7 +45,7 @@
-
+
Item Search and Cataloging
@@ -79,7 +89,7 @@
-
+
Administration
diff --git a/Open-ILS/webby-src/src/styles.css b/Open-ILS/webby-src/src/styles.css index 2ac5039365..c580fb05cb 100644 --- a/Open-ILS/webby-src/src/styles.css +++ b/Open-ILS/webby-src/src/styles.css @@ -47,6 +47,11 @@ h5 {font-size: .95rem} padding-right: .25rem; /* default .5rem */ } +.material-icons { + /** default is 24px which is pretty chunky */ + font-size: 22px; +} + /* allow spans/labels to vertically orient with material icons */ .label-with-material-icon { display: inline-flex; -- 2.11.0