LP1622358: follow-up: fixing syntax, adding to Angular navbar, and adding Item Status

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>

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 8034f41..bf14e6d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -21,14 +21,17 @@
           <a class="dropdown-item" href="/eg/staff/circ/patron/search">
             <span class="material-icons">person</span>
             <span i18n>Search for Patrons</span>
+            <span i18n>- F4</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>
+            <span i18n>- F5</span>
           </a>
           <a href="/eg/staff/cat/catalog/index" class="dropdown-item">
             <span class="material-icons">search</span>
             <span i18n>Search the Catalog</span>
+            <span i18n>- F3</span>
           </a>
         </div>
       </div>
@@ -43,14 +46,17 @@
           <a class="dropdown-item" href="/eg/staff/circ/patron/bcsearch">
             <span class="material-icons">trending_up</span>
             <span i18n>Check Out</span>
+            <span i18n>- F1</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/circ/checkin/checkin">
             <span class="material-icons">trending_down</span>
             <span i18n>Check In</span>
+            <span i18n>- F2</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/circ/checkin/capture">
             <span class="material-icons">pin_drop</span>
             <span i18n>Capture Holds</span>
+            <span i18n>- Shift+F2</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/circ/holds/pull">
             <span class="material-icons">view_list</span>
@@ -59,14 +65,17 @@
           <a class="dropdown-item" href="/eg/staff/circ/renew/renew">
             <span class="material-icons">autorenew</span>
             <span i18n>Renew Items</span>
+            <span i18n>- Ctrl+F2</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/circ/patron/register">
             <span class="material-icons">person_add</span>
             <span i18n>Register Patron</span>
+            <span i18n>- Shift+F1</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/circ/patron/last">
             <span class="material-icons">redo</span>
             <span i18n>Retrieve Last Patron</span>
+            <span i18n>- F8</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/circ/patron/search?show_recent=1">
             <span class="material-icons">redo</span>
@@ -88,6 +97,7 @@
           <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>
+            <span i18n>- F6</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/circ/holds/shelf">
             <span class="material-icons">format_list_bulleted</span>
@@ -104,6 +114,7 @@
             keyDesc="Navigate To Item Status" i18n-keyDesc>
             <span class="material-icons">question_answer</span>
             <span i18n>Item Status</span>
+            <span i18n>- F5</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/cat/item/missing_pieces">
             <span class="material-icons">grid_on</span>
@@ -113,6 +124,7 @@
           <a class="dropdown-item" (click)="reprintLast()">
             <span class="material-icons">redo</span>
             <span i18n>Reprint Last Receipt</span>
+            <span i18n>- F9</span>
           </a>
           <div class="dropdown-divider"></div>
           <a class="dropdown-item" href="/eg/staff/offline-interface">
@@ -135,6 +147,7 @@
           <a href="/eg/staff/cat/catalog/index" class="dropdown-item">
             <span class="material-icons">search</span>
             <span i18n>Search the Catalog</span>
+            <span i18n>- F3</span>
           </a>
           <a *ngIf="showAngularCatalog"
             class="dropdown-item"
@@ -160,12 +173,14 @@
             eg-accesskey-desc="Retrieve Last Bib Record" class="dropdown-item">
             <span class="material-icons">collections_bookmark</span>
             <span i18n>Retrieve Bib Record by TCN</span>
+            <span i18n>- Shift+F3</span>
           </a>
           <a href="" ng-click="retrieveLastRecord()"
             eg-accesskey="shift+f8" 
             eg-accesskey-desc="Retrieve Last Bib Record" class="dropdown-item">
             <span class="material-icons">redo</span>
             <span i18n>Retrieve Last Bib Record</span>
+            <span i18n>- Shift+F8</span>
           </a>
           <div class="dropdown-divider"></div>
           <a href="/eg/staff/cat/catalog/new_bib" class="dropdown-item">

diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index e127f95..16d55a9 100644 (file)
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -19,11 +19,12 @@
       <span class="sr-only">[% l('Toggle navigation') %]</span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
-       span class="icon-bar"></span>
-      button>
+      <span class="icon-bar"></span>
+    </button>
+  </div>
 
 
-<div class="navbar-collapse collapse" ng-class="!navCollapsed && 'in'">
+  <div class="navbar-collapse collapse" ng-class="!navCollapsed && 'in'">
     <ul class="nav navbar-nav">
       <li><a href='./' title="[% l('Home') %]" target="_self"
         class="glyphicon glyphicon-home"></a><li>
@@ -211,7 +212,7 @@
           <li>
             <a href="./cat/item/search" target="_self">
               <span class="glyphicon glyphicon-saved"></span>
-              <span>[% l('Item Status') %]</span>
+              <span>[% l('Item Status') %][% l('- F5') %]</span>
             </a>
           </li>
           <li>