egGrid column picker dialog WIP

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index e8861a1..3e78ef6 100644 (file)
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -193,7 +193,7 @@
         <li>
           <a href ng-click="showColumnDialog()">
             <span class="glyphicon glyphicon-print"></span>
-            [% l('Configure Column Visibility') %]
+            [% l('Manage Multiple Columns') %]
           </a>
         </li>
         <li role="presentation" class="divider"></li>

diff --git a/Open-ILS/src/templates/staff/share/t_grid_columns.tt2 b/Open-ILS/src/templates/staff/share/t_grid_columns.tt2
index 3e355b4..427bc3d 100644 (file)
--- a/Open-ILS/src/templates/staff/share/t_grid_columns.tt2
+++ b/Open-ILS/src/templates/staff/share/t_grid_columns.tt2
@@ -5,15 +5,17 @@
     <h4 class="modal-title alert alert-info">[% l('Grid Column Picker') %]</h4> 
   </div>
   <div class="modal-body eg-grid-columns-modal-body">
-    <div class="row grid-header-row">
+    <div class="row eg-grid-header-row">
       <div class="col-md-1">[% l('Visible') %]</div>
       <div class="col-md-4">[% l('Column Name') %]</div>
+      <div class="col-md-4">[% l('Column Class') %]</div>
     </div>
     <div class="row" ng-repeat="col in columns" ng-class="{visible : col.visible}">
       <div class="col-md-1">
         <input type='checkbox' ng-model="col.visible"/>
       </div>
-      <div class="col-md-4" title="{{col.idlclass}}">{{col.label}}</div>
+      <div class="col-md-4">{{col.label}}</div>
+      <div class="col-md-4">{{col.idlclass}}</div>
     </div>
   </div>
   <div class="modal-footer">

diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js
index b4e2c1e..911cb3f 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -1091,7 +1091,7 @@ angular.module('egGridMod',
                             // the columns into the dialog then pull the
                             // values back out when saved.
                             $dialogScope.columns = $scope.columns;
-                            $dialogScope.ok = function() {
+                            $dialogScope.ok = $dialogScope.cancel = function() {
                                 $uibModalInstance.close()
                             }
                         }