web staff: checkout form; make style consistent

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/circ/checkin/index.tt2 b/Open-ILS/src/templates/staff/circ/checkin/index.tt2
index 066e543..72d7b2f 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/checkin/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/index.tt2
@@ -23,18 +23,26 @@ COPY_ALERT_MSG_DIALOG_TITLE :
 
 <!-- checkin form -->
 <div class="row pad-vert">
-  <div class="col-lg-10">
-    <div class="pad-horiz">
-      <form ng-submit="checkin(checkinArgs)">
-        <input focus-me="focusMe" blur-me="blurMe" 
-          ng-model="checkinArgs.copy_barcode" 
-          id="patron-checkin-barcode" type="text"/> 
-        <span class="pad-horiz"></span>
-        <input type="submit" value="[% l('Submit') %]"/>
+  <div class="col-lg-4">
+      <form ng-submit="checkin(checkinArgs)" role="form" class="form-inline">
+        <div class="input-group">
+          <label class="input-group-addon" 
+            for="patron-checkin-barcode" >[% l('Barcode') %]</label>
+
+          <input focus-me="focusMe" blur-me="blurMe" class="form-control"
+            ng-model="checkinArgs.copy_barcode" 
+            placeholder="[% l('Barcode') %]"
+            id="patron-checkin-barcode" type="text"/> 
+
+          <!-- do we really need a button?
+          <span class="input-group-btn">
+            <input type="submit" class="btn btn-default" value="[% l('Submit') %]"/>
+          </span>
+          -->
+        </div>
       </form>
-    </div>
   </div>
-  <div class="col-lg-2 text-right">
+  <div class="col-lg-2 col-lg-offset-6 text-right">
     <div class="btn-group text-left">
       [% INCLUDE 'staff/parts/column_picker.tt2' listname='checkins' %]
     </div>

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 311ecc8..d5d5174 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -1,25 +1,39 @@
 <!-- item checkout form / list -->
 
 <div class="row pad-vert">
-  <div class="col-lg-10">
-    <div class="pad-horiz">
-      <form ng-submit="checkout(checkoutArgs)">
-        <select ng-model="checkoutArgs.type">
-          <option value='barcode'>[% l('Barcode') %]</option>
-          <option value=''>----</option>
-          <option ng-repeat='type in nonCatTypes' 
-            value='{{type.id()}}'>{{type.name()}}</option>
-        </select>
-        <span class="pad-horiz"></span>
-        <input focus-me="focusMe" ng-model="checkoutArgs.copy_barcode" 
+  <div class="col-lg-6">
+    <form ng-submit="checkout(checkoutArgs)" role="form" class="form-inline">
+      <div class="input-group">
+
+        <div class="input-group-btn">
+          <button type="button" data-toggle="dropdown"
+            class="btn btn-default dropdown-toggle">
+            {{selectedNcType() || "[% l('Barcode') %]"}}
+            <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu">
+            <li><a href='' ng-click="checkoutArgs.type='barcode';focusMe=true">
+              [% l('Barcode') %]</a>
+            </li>
+            <li class="divider"></li>
+            <li><a href='' ng-repeat='type in nonCatTypes'
+              ng-click="checkoutArgs.type=type.id()">{{type.name()}}</a>
+            </li>
+          </ul>
+        </div>
+
+        <input focus-me="focusMe" class="form-control"
+          ng-model="checkoutArgs.copy_barcode" 
           ng-disabled="checkoutArgs.type != 'barcode'"
           id="patron-checkout-barcode" type="text"/> 
-        <span class="pad-horiz"></span>
-        <input type="submit" value="[% l('Submit') %]"/>
-      </form>
-    </div>
+
+        <input class="btn btn-default" type="submit" value="[% l('Submit') %]"/>
+
+      </div>
+    </form>
   </div>
-  <div class="col-lg-2 text-right">
+
+  <div class="col-lg-1 col-lg-offset-5 text-right">
     <div class="btn-group text-left">
       [% INCLUDE 'staff/parts/column_picker.tt2' listname='checkouts' %]
     </div>

diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index 5e4c95c..be00f10 100644 (file)
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -95,7 +95,7 @@ but the ones I'm finding aren't quite cutting it..*/
 .patron-summary-divider { border-top: 1px solid #CCC}
 .pad-horiz {padding : 0px 10px 0px 10px; }
 .pad-vert {padding : 20px 0px 10px 0px;}
-#patron-checkout-barcode { width: 18em; }
+#patron-checkout-barcode { width: 16em; }
 
 #patron-search-form div.form-group {
   margin-bottom: 5px;

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
index cc4233c..0cf69e2 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
@@ -459,6 +459,18 @@ function($scope,  $q,  $modal,  $routeParams,  egNet,  egAuth,  egUser,  patronS
     $scope.checkouts = patronSvc.checkouts;
     $scope.checkoutArgs = {type : 'barcode'};
 
+    $scope.selectedNcType = function() {
+        var type;
+        if ($scope.nonCatTypes) {
+            type = $scope.nonCatTypes.filter(
+                function(t) { 
+                    return t.id() == $scope.checkoutArgs.type;
+                }
+            )[0];
+        }
+        return type ? type.name() : null;
+    }
+
     if (egEnv.cnct) {
         $scope.nonCatTypes = egEnv.cnct.list;
     } else {
@@ -479,6 +491,8 @@ function($scope,  $q,  $modal,  $routeParams,  egNet,  egAuth,  egUser,  patronS
         var type = args.type;
         var coArgs = angular.copy(args);
 
+        if (!args.copy_barcode) return;
+
         args.copy_barcode = ''; // reset for UI
         delete coArgs.type; // not a valid API arg