diff --git a/Gruntfile.js b/Gruntfile.js index 1f3e98479..9153c5a37 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -11,7 +11,7 @@ module.exports = function(grunt) { bower_concat: { all: { mainFiles: { - 'bootstrap-table': [ "src/bootstrap-table.js", "src/bootstrap-table.css", "dist/extensions/export/bootstrap-table-export.js", "dist/extensions/mobile/bootstrap-table-mobile.js"] + 'bootstrap-table': [ "src/bootstrap-table.js", "src/bootstrap-table.css", "dist/extensions/export/bootstrap-table-export.js", "dist/extensions/mobile/bootstrap-table-mobile.js", "dist/extensions/sticky-header/bootstrap-table-sticky-header.js", "dist/extensions/sticky-header/bootstrap-table-sticky-header.css"] }, dest: { 'js': 'tmp/opensourcepos_bower.js', diff --git a/application/views/partial/header.php b/application/views/partial/header.php index 40c2e4775..0ec683ac9 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -15,6 +15,7 @@ + @@ -43,6 +44,7 @@ + @@ -71,10 +73,10 @@ - + - + diff --git a/application/views/reports/tabular.php b/application/views/reports/tabular.php index 8eead0ed6..26694d3f2 100644 --- a/application/views/reports/tabular.php +++ b/application/views/reports/tabular.php @@ -30,6 +30,7 @@ $('#table').bootstrapTable({ columns: , + stickyHeader: true, pageSize: config->item('lines_per_page'); ?>, striped: true, sortable: true, diff --git a/application/views/reports/tabular_details.php b/application/views/reports/tabular_details.php index 22560d040..cc232e7f5 100644 --- a/application/views/reports/tabular_details.php +++ b/application/views/reports/tabular_details.php @@ -45,6 +45,7 @@ $('#table').bootstrapTable({ columns: , + stickyHeader: true, pageSize: config->item('lines_per_page'); ?>, striped: true, pagination: true, diff --git a/bower.json b/bower.json index 50cedaf3c..4c41d644f 100644 --- a/bower.json +++ b/bower.json @@ -63,7 +63,9 @@ "src/bootstrap-table.js", "src/bootstrap-table.css", "dist/extensions/export/bootstrap-table-export.js", - "dist/extensions/mobile/bootstrap-table-mobile.js" + "dist/extensions/mobile/bootstrap-table-mobile.js", + "dist/extensions/sticky-header/bootstrap-table-sticky-header.js", + "dist/extensions/sticky-header/bootstrap-table-sticky-header.css" ] } } diff --git a/public/js/manage_tables.js b/public/js/manage_tables.js index 71077adbd..91558f5a8 100644 --- a/public/js/manage_tables.js +++ b/public/js/manage_tables.js @@ -228,6 +228,7 @@ load_success = load_success(options.onLoadSuccess); $('#table').bootstrapTable($.extend(options, { columns: options.headers, + stickyHeader: true, url: options.resource + '/search', sidePagination: 'server', pageSize: options.pageSize,