LP1990968: Move Strict Barcode Checkbox in Angular Staff Client

Move the Strict Barcode Checkbox to the right of the barcode input
from the bottom of the page for the Checkout, Checkin, and Renew
interfaces.

This change differs from that for AngularJS as the latter moves the
checkbox to below the barcode input.

Signed-off-by: Jason Stephenson <jstephenson@cwmars.org>
Signed-off-by: Elizabeth Thomsen <et@noblenet.org>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
index 4542213..42c62d4 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
@@ -97,6 +97,15 @@
         </div>
       </div>
     </div>
+    <div class="col-lg-2">
+      <div class="form-check form-check-inline">
+        <input class="form-check-input" type="checkbox" 
+          (ngModelChange)="toggleStrictBarcode($event)"
+          id="strict-barcode-cbox" [(ngModel)]="strictBarcode"/>
+        <label class="form-check-label" 
+          for="strict-barcode-cbox" i18n>Strict Barcode</label>
+      </div>
+    </div>
     <div class="flex-1"></div>
     <div class="mr-2">
       <div class="form-check form-check-inline">
@@ -294,15 +303,6 @@
           for="trim-list-cbox" i18n>Trim List (20)</label>
       </div>
     </div>
-    <div class="mr-3">
-      <div class="form-check form-check-inline">
-        <input class="form-check-input" type="checkbox" 
-          (ngModelChange)="toggleStrictBarcode($event)"
-          id="strict-barcode-cbox" [(ngModel)]="strictBarcode"/>
-        <label class="form-check-label" 
-          for="strict-barcode-cbox" i18n>Strict Barcode</label>
-      </div>
-    </div>
     <div>
       <div ngbDropdown>
         <button class="btn btn-outline-dark" 

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
index 491be29..4481740 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
@@ -43,6 +43,15 @@
         </div>
       </div>
     </div>
+    <div class="col-lg-2">
+      <div class="form-check form-check-inline">
+        <input class="form-check-input" type="checkbox" 
+               (ngModelChange)="toggleStrictBarcode($event)"
+               id="strict-barcode-cbox" [(ngModel)]="strictBarcode"/>
+        <label class="form-check-label" 
+               for="strict-barcode-cbox" i18n>Strict Barcode</label>
+      </div>
+    </div>
     <div class="flex-1"></div>
     <div ngbDropdown>
       <button ngbDropdownToggle class="btn mr-2" [ngClass]="{
@@ -150,15 +159,6 @@
   <div class="col-lg-12 d-flex">
     <div class="flex-1"></div>
     <div class="mr-3">
-      <div class="form-check form-check-inline pt-1">
-        <input class="form-check-input" type="checkbox" 
-          (ngModelChange)="toggleStrictBarcode($event)"
-          id="strict-barcode-cbox" [(ngModel)]="strictBarcode"/>
-        <label class="form-check-label" 
-          for="strict-barcode-cbox" i18n>Strict Barcode</label>
-      </div>
-    </div>
-    <div class="mr-3">
       <div class="input-group">
         <span class="material-icons pt-2 pr-2">
           <ng-container *ngIf="!mayEmailReceipt()">print</ng-container>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html
index 726aa61..0e2ef0d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html
@@ -26,6 +26,15 @@
         </div>
       </div>
     </div>
+    <div class="col-lg-2">
+      <div class="form-check form-check-inline">
+        <input class="form-check-input" type="checkbox" 
+          (ngModelChange)="toggleStrictBarcode($event)"
+          id="strict-barcode-cbox" [(ngModel)]="strictBarcode"/>
+        <label class="form-check-label" 
+          for="strict-barcode-cbox" i18n>Strict Barcode</label>
+      </div>
+    </div>
     <div class="flex-1"></div>
     <div class="mr-2">
       <div class="form-inline">
@@ -170,15 +179,6 @@
           for="trim-list-cbox" i18n>Trim List (20)</label>
       </div>
     </div>
-    <div class="mr-3">
-      <div class="form-check form-check-inline">
-        <input class="form-check-input" type="checkbox" 
-          (ngModelChange)="toggleStrictBarcode($event)"
-          id="strict-barcode-cbox" [(ngModel)]="strictBarcode"/>
-        <label class="form-check-label" 
-          for="strict-barcode-cbox" i18n>Strict Barcode</label>
-      </div>
-    </div>
   </div>
 </div>