LP#1990968: Move strict barcode checkbox

Moved the 'Strict Barcode' checkbox next to the item barcode input box
for a more streamlined and workflow page layout. This affected three
Evergreen interfaces: Patron checkout, Item Renew, Item Checkin

Signed-off-by: Scott Angel <scottangel@mobiusconsortium.org>
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/templates/staff/circ/checkin/t_checkin.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
index 0606ce7..bbbec0e 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
@@ -72,6 +72,13 @@
         <input type="submit" class="btn btn-default" value="[% l('Submit') %]"/>
       </div>
     </form>
+    <div class="checkbox">
+     <label>
+      <input ng-model="strict_barcode" type="checkbox"
+         ng-change="onStrictBarcodeChange()"/>
+         [% l('Strict Barcode') %]
+     </label>
+    </div>
   </div>
 
   <div class="col-md-3">
@@ -145,13 +152,6 @@
         </label>
       </div>
       <div class="pad-horiz"></div>
-      <div class="checkbox">
-        <label>
-          <input ng-model="strict_barcode" type="checkbox"
-            ng-change="onStrictBarcodeChange()"/>
-          [% l('Strict Barcode') %]
-        </label>
-      </div>
     </div><!-- flex row -->
   </div><!-- col -->
   <div class="col-md-2">

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index 2fab3c2..feb5138 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -35,6 +35,13 @@
 
       </div>
     </form>
+  <div class="checkbox">
+    <label>
+      <input ng-model="strict_barcode" type="checkbox"
+        ng-change="onStrictBarcodeChange()"/>
+      [% l('Strict Barcode') %]
+    </label>
+  </div>
   </div>
   <div class="col-md-4 col-lg-6">
     <div class="flex-row">
@@ -165,13 +172,6 @@
 
 <div class="flex-row pad-vert">
   <div class="flex-cell"></div>
-  <div class="checkbox">
-    <label>
-      <input ng-model="strict_barcode" type="checkbox"
-        ng-change="onStrictBarcodeChange()"/>
-      [% l('Strict Barcode') %]
-    </label>
-  </div>
   <div class="pad-horiz" ng-if="using_hatch_printer"></div>
   <div class="checkbox" ng-if="using_hatch_printer">
     <label>

diff --git a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
index 3f54371..053bfb6 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
+++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
@@ -22,6 +22,13 @@
             ng-disabled="outOfRange" value="[% l('Submit') %]"/>
       </div>
     </form>
+  <div class="checkbox">
+    <label>
+      <input ng-model="strict_barcode" type="checkbox"
+        ng-change="onStrictBarcodeChange()"/>
+      [% l('Strict Barcode') %]
+    </label>
+  </div>
   </div>
   <div class="col-md-6">
     <div class="flex-row">
@@ -150,12 +157,5 @@
     </label>
   </div>
   <div class="pad-horiz"></div>
-  <div class="checkbox">
-    <label>
-      <input ng-model="strict_barcode" type="checkbox"
-        ng-change="onStrictBarcodeChange()"/>
-      [% l('Strict Barcode') %]
-    </label>
-  </div>
 </div>