From 6fa8ae37f0aea07528d9d04dc052378c2babfe9b Mon Sep 17 00:00:00 2001 From: Khanh Ngo Date: Sun, 1 Apr 2018 15:48:08 +0700 Subject: [PATCH] Fix #180. Adjustment in table style. --- app/templates/admin_manageuser.html | 19 +++++++++++++++---- app/templates/dashboard.html | 16 ++++++++-------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/templates/admin_manageuser.html b/app/templates/admin_manageuser.html index 2289bf4..745e08a 100644 --- a/app/templates/admin_manageuser.html +++ b/app/templates/admin_manageuser.html @@ -78,13 +78,24 @@ // set up user data table $("#tbl_users").DataTable({ "paging" : true, - "lengthChange" : false, + "lengthChange" : true, "searching" : true, "ordering" : true, - "info" : true, - "autoWidth" : false + "info" : false, + "autoWidth" : false, + "lengthMenu": [ [10, 25, 50, 100, -1], + [10, 25, 50, 100, "All"]], + "pageLength": 10 }); - + + // avoid losing icheck box style when database refreshed + $('#tbl_users').on('draw.dt', function () { + $('.admin_toggle').iCheck({ + handle: 'checkbox', + checkboxClass: 'icheckbox_square-blue' + }); + }); + // handle revocation of privileges $(document.body).on('click', '.button_revoke', function() { var modal = $("#modal_revoke"); diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html index 7ff9cbd..7a45db5 100644 --- a/app/templates/dashboard.html +++ b/app/templates/dashboard.html @@ -174,14 +174,14 @@ "ajax" : "{{ url_for('dashboard_domains') }}", "info" : false, "autoWidth" : false, - {% if default_domain_table_size_setting in ['10','25','50','100'] %} - "lengthMenu": [ [10, 25, 50, 100, -1], - [10, 25, 50, 100, "All"]], - {% else %} - "lengthMenu": [ [10, 25, 50, 100, {{ default_domain_table_size_setting }}, -1], - [10, 25, 50, 100, {{ default_domain_table_size_setting }}, "All"]], - {% endif %} - "pageLength": {{ default_domain_table_size_setting }} + {% if default_domain_table_size_setting in ['10','25','50','100'] %} + "lengthMenu": [ [10, 25, 50, 100, -1], + [10, 25, 50, 100, "All"]], + {% else %} + "lengthMenu": [ [10, 25, 50, 100, {{ default_domain_table_size_setting }}, -1], + [10, 25, 50, 100, {{ default_domain_table_size_setting }}, "All"]], + {% endif %} + "pageLength": {{ default_domain_table_size_setting }} }); $(document.body).on('click', '.history-info-button', function() { var modal = $("#modal_history_info");