Revert "Move strict barcode checkbox to own row in checkout and checkin"

This reverts commit b98119527472a542e4d9a55a64f2a73cd917662f.

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 8a6b070..81b6e09 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="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 class="flex-1"></div>
     <div class="mr-2">
       <div class="form-check form-check-inline">
@@ -113,17 +122,6 @@
       (click)="backdateDate=null; backdate=null" i18n>Clear</button>
   </div>
 </div>
-<div class="row mb-3 pb-3 border-bottom">
-    <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 *ngIf="fineTally > 0">
   <span class="mr-2" i18n>Fine Tally: </span>

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 49cfa82..2885045 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="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="flex-1"></div>
     <div ngbDropdown>
       <button ngbDropdownToggle class="btn mr-2" [ngClass]="{
@@ -72,17 +81,6 @@
     </eg-datetime-select>
   </div>
 </div>
-<div class="row mb-3 pb-3 border-bottom">
-    <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>
 
 <ng-template #copyBarcodeTemplate let-r="row">
   <ng-container *ngIf="r.copy">