pulled origin

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
Simple merge

diff --cc Open-ILS/src/templates/staff/share/t_autogrid.tt2
index c0a0c48,aaf14aa..4d25413
--- 1/Open-ILS/src/templates/staff/share/t_autogrid.tt2
--- 2/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@@ -35,9 -52,147 +52,152 @@@
  
    <!-- putting a flex div here forces the remaining content to float right -->
    <div class="flex-cell"></div>
+ 
 +    <div>
 +        [% INCLUDE "staff/share/button_bar.tt2" top=1 %]
 +    </div>
++
++
+   <!-- column picker, pager, etc. -->
+   <div class="btn-group column-picker" ng-show="showPagination || showActions || showPicker">
+ 
+     <!-- first page -->
+     <button type="button" class="btn btn-default" 
+       ng-show="showPagination"
+       ng-class="{disabled : onFirstPage()}" 
+       ng-click="offset(0);collect()"
+       title="[% l('Start') %]">
+         <span class="glyphicon glyphicon-fast-backward"></span>
+     </button>
+ 
+     <!-- previous page -->
+     <button type="button" class="btn btn-default" 
+       ng-show="showPagination"
+       ng-class="{disabled : onFirstPage()}"
+       ng-click="decrementPage()"
+       title="[% l('Previous Page') %]">
+         <span class="glyphicon glyphicon-backward"></span>
+     </button>
+ 
+     <!-- next page -->
+     <!-- todo: paging needs a total count value to be fully functional -->
+     <button type="button" class="btn btn-default" 
+       ng-show="showPagination"
+       ng-class="{disabled : !hasNextPage()}"
+       ng-click="incrementPage()"
+       title="[% l('Next Page') %]">
+         <span class="glyphicon glyphicon-forward"></span>
+     </button>
+ 
+     <!-- actions drop-down menu -->
+     <div class="btn-group" ng-show="showActions" ng-if="actionGroups.length > 1 || actionGroups[0].actions.length" dropdown>                                                  
+       <button type="button" class="btn btn-default dropdown-toggle">
+         [% l('Actions') %] <span class="caret"></span>                       
+       </button>                                                              
+       <ul class="dropdown-menu pull-right grid-action-dropdown">                                  
+         <li ng-repeat-start="group in actionGroups">
+           <span style="padding-left: 1em;" ng-if="group.label"><strong><u>{{group.label}}</u></strong></span>
+         </li>
+         <li ng-repeat="action in group.actions" ng-class="{divider: action.divider, disabled: actionDisable(action)}" ng-hide="actionHide(action)">
+           <a ng-if="!action.divider" href
+             ng-click="!actionDisable(action) && actionLauncher(action)">{{action.label}}</a>
+         </li>
+         <span ng-repeat-end/>
+       </ul>
+     </div>
+ 
+     <div class="btn-group" dropdown is-open="gridRowCountIsOpen" ng-show="showPagination">
+       <button type="button" title="[% ('Select Row Count') %]"
+         class="btn btn-default dropdown-toggle">
+         [% l('Rows [_1]', '{{limit()}}') %]
+         <span class="caret"></span>
+       </button>
+       <ul class="dropdown-menu">
+         <li ng-repeat="t in [5,10,25,50,100]">
+           <a href ng-click='offset(0);limit(t);collect()'>
+             {{t}}
+           </a>
+         </li>
+       </ul>
+     </div>
+ 
+     <div class="btn-group" dropdown is-open="gridPageSelectIsOpen" ng-show="showPagination">
+       <button type="button" title="[% ('Select Page') %]"
+         class="btn btn-default dropdown-toggle">
+         [% l('Page [_1]', '{{page()}}') %]
+         <span class="caret"></span>
+       </button>
+       <ul class="dropdown-menu">
+         <li>
+           <div class="input-group">
+             <input type="text" class="form-control"
+               ng-model="pageFromUI"
+               ng-click="$event.stopPropagation()"/>
+             <span class="input-group-btn">
+               <button class="btn btn-default" type="button"
+                 ng-click="goToPage(pageFromUI);pageFromUI='';">
+                 [% l('Go To...') %]
+               </button>
+             </span>
+           </div>
+         </li>
+         <li role="presentation" class="divider"></li>
+         <li ng-repeat="t in [1,2,3,4,5,10,25,50,100]">
+           <a href ng-click='goToPage(t);gridPageSelectIsOpen=false;'>{{t}}</a>
+         </li>
+       </ul>
+     </div>
+ 
+     <div class="btn-group" dropdown is-open="gridColumnPickerIsOpen" ng-show="showPicker">
+       <button type="button" 
+         class="btn btn-default dropdown-toggle">
+         <span class="caret"></span>
+       </button>
+       <ul class="dropdown-menu pull-right eg-grid-column-picker">
+         <li><a href ng-click="toggleConfDisplay()">
+           <span class="glyphicon glyphicon-wrench"></span>
+           [% l('Configure Columns') %]
+         </a></li>
+         <li><a href ng-click="saveConfig()">
+           <span class="glyphicon glyphicon-floppy-save"></span>
+           [% l('Save Columns') %]
+         </a></li>
+ <!--
+         <li><a href ng-click="showAllColumns()">
+           <span class="glyphicon glyphicon-resize-full"></span>
+           [% l('Show All Columns') %]
+         </a></li>
+         <li><a href ng-click="hideAllColumns()">
+           <span class="glyphicon glyphicon-resize-small"></span>
+           [% l('Hide All Columns') %]
+         </a></li>
+ -->
+         <li><a href ng-click="resetColumns()">
+           <span class="glyphicon glyphicon-refresh"></span>
+           [% l('Reset Columns') %]
+         </a></li>
+         <li><a ng-click="generateCSVExportURL()" 
+           download="{{csvExportFileName}}.csv" ng-href="{{csvExportURL}}">
+           <span class="glyphicon glyphicon-download"></span>
+           [% l('Download CSV') %]
+         </a></li>
+         <li><a href ng-click="printCSV()">
+           <span class="glyphicon glyphicon-print"></span>
+           [% l('Print CSV') %]
+         </a></li>
+         <li role="presentation" class="divider"></li>
+         <li ng-repeat="col in columns">
+           <a href title="{{col.idlclass}}" ng-click="toggleColumnVisibility(col)">
+               <span ng-if="col.visible" 
+                 class="label label-success">&#x2713;</span>
+               <span ng-if="!col.visible" 
+                 class="label label-warning">&#x2717;</span>
+               <span>{{col.label}}</span>
+           </a>
+         </li>
+       </ul>
+     </div>
+   </div>
  </div>
  
  <!-- Grid -->

diff --cc Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
Simple merge

diff --cc Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
Simple merge