LP#626157 Ang2 experiments

Signed-off-by: Bill Erickson <berickxx@gmail.com>

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 eb037e8..ee4f93e 100644 (file)
--- 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 7b1a052..859ec7f 100644 (file)
--- 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 @@
         </a>
       </div>
     </div>
+
     <div class="navbar-nav">
       <div ngbDropdown class="nav-item dropdown">
         <a ngbDropdownToggle i18n class="nav-link dropdown-toggle">
-         Circulation 
+         Search
         </a>
         <div class="dropdown-menu" ngbDropdownMenu>
-          <a class="dropdown-item"
-              routerLink="/staff/splash">
+          <a class="dropdown-item" href="/eg/staff/circ/patron/search">
+            <span class="material-icons">person</span>
+            <span i18n>Search for Patrons</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/cat/item/search">
+            <span class="material-icons">assignment</span>
+            <span i18n>Search for Copies by Barcode</span>
+          </a>
+          <a class="dropdown-item" routerLink="/staff/catalog/search">
+            <span class="material-icons">search</span>
+            <span i18n>Search the Catalog</span>
+          </a>
+        </div>
+      </div>
+    </div>
+
+    <div class="navbar-nav">
+      <div ngbDropdown class="nav-item dropdown">
+        <a ngbDropdownToggle class="nav-link dropdown-toggle">
+         <span i18n>Circulation</span>
+        </a>
+        <div class="dropdown-menu" ngbDropdownMenu>
+          <a class="dropdown-item" href="/eg/staff/circ/patron/bcsearch">
             <span class="material-icons">trending_up</span>
             <span i18n>Check Out</span>
           </a>
-          <a class="dropdown-item" routerLink="/staff/splash">
+          <a class="dropdown-item" href="/eg/staff/circ/checkin/checkin">
             <span class="material-icons">trending_down</span>
             <span i18n>Check In</span>
           </a>
+          <a class="dropdown-item" href="/eg/staff/circ/checkin/capture">
+            <span class="material-icons">pin_drop</span>
+            <span i18n>Capture Holds</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/circ/holds/pull">
+            <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">
+            <span class="material-icons">autorenew</span>
+            <span i18n>Renew Items</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/circ/patron/register">
+            <span class="material-icons">person_add</span>
+            <span i18n>Register Patron</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/circ/patron/last">
+            <span class="material-icons">redo</span>
+            <span i18n>Retrieve Last Patron</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/circ/patron/search?show_recent=1">
+            <span class="material-icons">redo</span>
+            <span i18n>Retrieve Recent Patrons</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/circ/patron/pending/list">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Pending Patrons</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/circ/patron/bucket/view">
+            <span class="material-icons">list</span>
+            <span i18n>User Buckets</span>
+          </a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/eg/staff/circ/patron/credentials">
+            <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">
+            <span class="material-icons">playlist_add</span>
+            <span i18n>Record In-House Use</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/circ/holds/shelf">
+            <span class="material-icons">format_list_bulleted</span>
+            <span i18n>Holds Shelf</span>
+          </a>
           <div class="dropdown-divider"></div>
-          <a i18n class="dropdown-item" routerLink="/staff/">
-            <span class="material-icons">alarm_add</span>
-            <span i18n>Test</span>
+          <a class="dropdown-item" href="/eg/staff/cat/item/replace_barcode/index">
+            <span class="material-icons">library_books</span>
+            <span i18n>Replace Barcode</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/cat/item/search">
+            <span class="material-icons">question_answer</span>
+            <span i18n>Item Status</span>
+          </a>
+          <a class="dropdown-item" href="/eg/staff/cat/item/missing_pieces">
+            <span class="material-icons">grid_on</span>
+            <span i18n>Scan Item as Missing Pieces</span>
+          </a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/eg/staff/cat/item/missing_pieces">
+            <span class="material-icons">redo</span>
+            <span i18n>Reprint Last Receipt</span>
+          </a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/eg/staff/offline-interface">
+            <span class="material-icons">signal_wifi_off</span>
+            <span i18n>Offline Circulation</span>
           </a>
         </div>
       </div>
     </div>
+
+
     <div class="navbar-nav">
       <div ngbDropdown class="nav-item dropdown">
         <a ngbDropdownToggle i18n class="nav-link dropdown-toggle">
@@ -45,12 +132,63 @@
       </div>
     </div>
 
+    <div class="navbar-nav">
+      <div ngbDropdown class="nav-item dropdown">
+        <a ngbDropdownToggle i18n class="nav-link dropdown-toggle">
+          Acquisitions
+        </a>
+        <div class="dropdown-menu" ngbDropdownMenu>
+          <a class="dropdown-item"
+              routerLink="/staff/catalog/search">
+            <span class="material-icons">search</span>
+            <span i18n>TODO</span>
+          </a>
+        </div>
+      </div>
+    </div>
+
+    <div class="navbar-nav">
+      <div ngbDropdown class="nav-item dropdown">
+        <a ngbDropdownToggle i18n class="nav-link dropdown-toggle">
+          Booking
+        </a>
+        <div class="dropdown-menu" ngbDropdownMenu>
+          <a class="dropdown-item"
+              routerLink="/staff/catalog/search">
+            <span class="material-icons">search</span>
+            <span i18n>TODO</span>
+          </a>
+        </div>
+      </div>
+    </div>
+
+    <div class="navbar-nav">
+      <div ngbDropdown class="nav-item dropdown">
+        <a ngbDropdownToggle i18n class="nav-link dropdown-toggle">
+          Administration
+        </a>
+        <div class="dropdown-menu" ngbDropdownMenu>
+          <a class="dropdown-item"
+              routerLink="/staff/catalog/search">
+            <span class="material-icons">search</span>
+            <span i18n>TODO</span>
+          </a>
+        </div>
+      </div>
+    </div>
+
+
     <div class="navbar-nav mr-auto"></div>
     <div class="navbar-nav">
+      <span i18n>{{user}} @ {{workstation}}</span>
+    </div>
+    <div class="navbar-nav">
       <div ngbDropdown class="nav-item dropdown" placement="bottom-right">
         <a ngbDropdownToggle i18n 
+          i18n-title
+          title="Log out and more..."
           class="nav-link dropdown-toggle no-caret with-material-icon">
-          <i class="material-icons">more_vert</i>
+          <i class="material-icons">list</i>
         </a>
         <div class="dropdown-menu" ngbDropdownMenu>
           <a i18n class="dropdown-item" routerLink="/staff/login">

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 bbffd29..62fb605 100644 (file)
--- 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 9f2f23e..4846cc5 100644 (file)
--- 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 @@
 
+
+<style>
+    /* TODO change BS color scheme so this isn't necessary */
+    .bg-evergreen {
+      background: -webkit-linear-gradient(#00593d, #007a54);
+      background-color: #007a54;
+      color: #fff;
+    }
+</style>
+
 <div class="container">
 
   <!-- header icon -->
@@ -11,7 +21,7 @@
   <div class="row" id="splash-nav">
     <div class="col-4">
       <div class="card">
-        <div class="card-header bg-success">
+        <div class="card-header bg-evergreen">
           <div class="panel-title text-center">Circulation and Patrons</div>
         </div>
         <div class="card-body">
@@ -35,7 +45,7 @@
 
     <div class="col-4">
       <div class="card">
-        <div class="card-header bg-success">
+        <div class="card-header bg-evergreen">
           <div class="panel-title text-center">Item Search and Cataloging</div>
         </div>
         <div class="card-body">
@@ -79,7 +89,7 @@
 
     <div class="col-4">
       <div class="card">
-        <div class="card-header bg-success">
+        <div class="card-header bg-evergreen">
           <div class="panel-title text-center">Administration</div>
         </div>
         <div class="card-body">

diff --git a/Open-ILS/webby-src/src/styles.css b/Open-ILS/webby-src/src/styles.css
index 2ac5039..c580fb0 100644 (file)
--- 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;