checkout added to nav; p search form starts w/ last name

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

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_search.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_search.tt2
index 29fe17b..a8f6be6 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_search.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_search.tt2
@@ -11,10 +11,6 @@
         role="form" class="form-horizontal">
 
       <div class="form-group">
-        <div class="col-md-2">
-          <input type="text" class="form-control" ng-model="searchArgs.card" 
-            placeholder="[% l('Barcode') %]" focus-me="focusMe"/><!--"vim-->
-        </div>
 
         <div class="col-md-2">
           <input type="text" class="form-control" 
@@ -27,6 +23,11 @@
         </div>
 
         <div class="col-md-2">
+          <input type="text" class="form-control" 
+            ng-model="searchArgs.second_given_name" placeholder="[% l('Middle Name') %]"/>
+        </div>
+
+        <div class="col-md-2">
           <input type="submit" class="btn btn-default" value="[% l('Search') %]"/>
         </div>
 
@@ -49,8 +50,8 @@
 
       <div class="form-group" ng-show="showExtras">
         <div class="col-md-2">
-          <input type="text" class="form-control" 
-            ng-model="searchArgs.second_given_name" placeholder="[% l('Middle Name') %]"/>
+          <input type="text" class="form-control" ng-model="searchArgs.card" 
+            placeholder="[% l('Barcode') %]" focus-me="focusMe"/><!--"vim-->
         </div>
         <div class="col-md-2">
           <input type="text" class="form-control" 

diff --git a/Open-ILS/src/templates/staff/t_navbar.tt2 b/Open-ILS/src/templates/staff/t_navbar.tt2
index 9eb14d9..bf09320 100644 (file)
--- a/Open-ILS/src/templates/staff/t_navbar.tt2
+++ b/Open-ILS/src/templates/staff/t_navbar.tt2
@@ -38,6 +38,12 @@
 
         <ul class="dropdown-menu">
           <li>
+            <a href="./circ/patron/bcsearch" target="_self">
+              <span class="glyphicon glyphicon-export"></span>
+              [% l('Check Out') %]
+            </a>
+          </li>
+          <li>
             <a href="./circ/patron/search" target="_self">
               <span class="glyphicon glyphicon-search"></span>
               [% l('Patron Search') %]
@@ -45,7 +51,7 @@
           </li>
           <li>
             <a href="./circ/checkin/index" target="_self">
-              <span class="glyphicon glyphicon-save"></span>
+              <span class="glyphicon glyphicon-import"></span>
               [% l('Check In') %]
             </a>
           </li>