From 5e0222635cae07e3d15b86a542bbf57280ac4f2d Mon Sep 17 00:00:00 2001 From: Kyle Huckins Date: Wed, 4 Jan 2017 13:14:14 -0800 Subject: [PATCH] LP#1461739 Paging controls on bottom Patches code introduced in commit e999fa846 to work as intended, no longer removing the actions menu. The grid controls menu will now display above and below the grid correctly. Signed-off-by: Kyle Huckins Changes to be committed: modified: Open-ILS/src/templates/staff/share/t_autogrid.tt2 new file: Open-ILS/src/templates/staff/share/t_button_bar.tt2 modified: Open-ILS/web/js/ui/default/staff/services/grid.js --- Open-ILS/src/templates/staff/share/t_autogrid.tt2 | 153 ++------------------- .../src/templates/staff/share/t_button_bar.tt2 | 142 +++++++++++++++++++ Open-ILS/web/js/ui/default/staff/services/grid.js | 33 +++-- 3 files changed, 174 insertions(+), 154 deletions(-) create mode 100644 Open-ILS/src/templates/staff/share/t_button_bar.tt2 diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2 index 82fa3b2bf9..2bef2b1287 100644 --- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 +++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2 @@ -54,148 +54,10 @@
-
- - - - - - - - - - - - -
- - -
- -
- - -
- -
- -
    -
  • -
    - - - - -
    -
    • - -
  • - {{t}} -
    • -
+
+ [% INCLUDE "staff/share/t_button_bar.tt2" top=1 %]
-
- - -
-
@@ -320,7 +182,12 @@ - - - +
+
+
+ +
+ [% INCLUDE "staff/share/t_button_bar.tt2" top=0 %] +
+
diff --git a/Open-ILS/src/templates/staff/share/t_button_bar.tt2 b/Open-ILS/src/templates/staff/share/t_button_bar.tt2 new file mode 100644 index 0000000000..6b42f7b802 --- /dev/null +++ b/Open-ILS/src/templates/staff/share/t_button_bar.tt2 @@ -0,0 +1,142 @@ +
+ + + + + + + + + + + + +
+ + +
+ +
+ + +
+ +
+ +
    +
  • +
    + + + + +
    +
    • + +
  • + {{t}} +
    • +
+
+ +
+ + +
+
\ No newline at end of file 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 6c3e07527f..fc6f4b653f 100644 --- a/Open-ILS/web/js/ui/default/staff/services/grid.js +++ b/Open-ILS/web/js/ui/default/staff/services/grid.js @@ -358,7 +358,8 @@ angular.module('egGridMod', // remove the stored column configuration preferenc, then recover // the column visibility information from the initial page load. $scope.resetColumns = function() { - $scope.gridColumnPickerIsOpen = false; + $scope.gridColumnPickerIsOpen1 = false; + $scope.gridColumnPickerIsOpen0 = false; egCore.hatch.removeItem('eg.grid.' + grid.persistKey) .then(function() { grid.columnsProvider.reset(); @@ -367,19 +368,22 @@ angular.module('egGridMod', } $scope.showAllColumns = function() { - $scope.gridColumnPickerIsOpen = false; + $scope.gridColumnPickerIsOpen1 = false; + $scope.gridColumnPickerIsOpen0 = false; grid.columnsProvider.showAllColumns(); if (grid.selfManagedData) grid.collect(); } $scope.hideAllColumns = function() { - $scope.gridColumnPickerIsOpen = false; + $scope.gridColumnPickerIsOpen1 = false; + $scope.gridColumnPickerIsOpen0 = false; grid.columnsProvider.hideAllColumns(); // note: no need to fetch new data if no columns are visible } $scope.toggleColumnVisibility = function(col) { - $scope.gridColumnPickerIsOpen = false; + $scope.gridColumnPickerIsOpen1 = false; + $scope.gridColumnPickerIsOpen0 = false; col.visible = !col.visible; // egGridFlatDataProvider only retrieves data to be @@ -391,7 +395,8 @@ angular.module('egGridMod', // save the columns configuration (position, sort, width) to // eg.grid. $scope.saveConfig = function() { - $scope.gridColumnPickerIsOpen = false; + $scope.gridColumnPickerIsOpen1 = false; + $scope.gridColumnPickerIsOpen0 = false; if (!grid.persistKey) { console.warn( @@ -854,7 +859,8 @@ angular.module('egGridMod', $scope.showGridConf = true; } - $scope.gridColumnPickerIsOpen = false; + $scope.gridColumnPickerIsOpen1 = false; + $scope.gridColumnPickerIsOpen0 = false; } // called when a dragged column is dropped onto itself @@ -899,7 +905,8 @@ angular.module('egGridMod', // sets the download file name and inserts the current CSV // into a Blob URL for browser download. $scope.generateCSVExportURL = function() { - $scope.gridColumnPickerIsOpen = false; + $scope.gridColumnPickerIsOpen1 = false; + $scope.gridColumnPickerIsOpen0 = false; // let the file name describe the grid $scope.csvExportFileName = @@ -914,7 +921,8 @@ angular.module('egGridMod', } $scope.printCSV = function() { - $scope.gridColumnPickerIsOpen = false; + $scope.gridColumnPickerIsOpen1 = false; + $scope.gridColumnPickerIsOpen0 = false; egCore.print.print({ context : 'default', content : grid.generateCSV(), @@ -990,9 +998,12 @@ angular.module('egGridMod', // ensure all of our dropdowns are closed // TODO: git rid of these and just use dropdown-toggle, // which is more reliable. - $scope.gridColumnPickerIsOpen = false; - $scope.gridRowCountIsOpen = false; - $scope.gridPageSelectIsOpen = false; + $scope.gridColumnPickerIsOpen1 = false; + $scope.gridColumnPickerIsOpen0 = false; + $scope.gridRowCountIsOpen1 = false; + $scope.gridRowCountIsOpen0 = false; + $scope.gridPageSelectIsOpen1 = false; + $scope.gridPageSelectIsOpen0 = false; $scope.items = []; $scope.selected = {}; -- 2.11.0