From 0bd21a08738e23ae298412ce1aabf2dc7fdcf998 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Thu, 12 Sep 2013 10:02:48 +0200 Subject: [PATCH] fixing pagination/pagesort conflicts --- public/site_assets/test/js/custom.js | 3 ++- public/templates/test/account/notifications/default.tpl | 2 +- public/templates/test/admin/user/default.tpl | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/site_assets/test/js/custom.js b/public/site_assets/test/js/custom.js index 7ecb9132..8f7fa587 100644 --- a/public/site_assets/test/js/custom.js +++ b/public/site_assets/test/js/custom.js @@ -1,5 +1,6 @@ $(document).ready(function() { - $(".tablesorter").tablesorter().tablesorterPager({positionFixed: false, container: $("#pager"), cssNext: ".icon-forward", cssPrev: ".icon-backward", cssFirst: ".icon-fast-backward", cssLast: ".icon-fast-forward"}); + $(".tablesorter").tablesorter(); + $(".tablesorterpager").tablesorter().tablesorterPager({positionFixed: false, container: $("#pager"), cssNext: ".icon-forward", cssPrev: ".icon-backward", cssFirst: ".icon-fast-backward", cssLast: ".icon-fast-forward"}); $(".tab_content").hide(); //Hide all content $("ul.tabs li:first").addClass("active").show(); //Activate first tab $(".tab_content:first").show(); //Show first tab content diff --git a/public/templates/test/account/notifications/default.tpl b/public/templates/test/account/notifications/default.tpl index 76f65b6d..423eb7a6 100644 --- a/public/templates/test/account/notifications/default.tpl +++ b/public/templates/test/account/notifications/default.tpl @@ -59,7 +59,7 @@

Notification History

- +
diff --git a/public/templates/test/admin/user/default.tpl b/public/templates/test/admin/user/default.tpl index 6e94b5ce..3d7e879d 100644 --- a/public/templates/test/admin/user/default.tpl +++ b/public/templates/test/admin/user/default.tpl @@ -28,7 +28,7 @@

User Information

-
ID
+
ID