From 7ed134b218e5f4b437a951fbafc69bf6ef8e84c8 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 29 Oct 2014 17:06:17 -0400 Subject: [PATCH] KMAIN-348 - Add Page Number Navigation to My Lists Cross-port: 6e75f1b Conflicts: Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm --- .../var/templates_kcls/opac/myopac/lists.tt2 | 78 +++++++++++++++++++-- .../templates_kcls/opac/myopac/prefs_my_lists.tt2 | 41 +++++++++++ .../opac/parts/myopac/prefs_base.tt2 | 26 ++++++- ...ng_for_selecting_lists_per_page_for_my_list.sql | 23 ++++++ Open-ILS/web/images/sub_prefs_my_lists_off.jpg | Bin 0 -> 2893 bytes Open-ILS/web/images/sub_prefs_my_lists_on.jpg | Bin 0 -> 3190 bytes 6 files changed, 163 insertions(+), 5 deletions(-) create mode 100644 KCLS/openils/var/templates_kcls/opac/myopac/prefs_my_lists.tt2 create mode 100644 KCLS/sql/add_setting_for_selecting_lists_per_page_for_my_list.sql create mode 100644 Open-ILS/web/images/sub_prefs_my_lists_off.jpg create mode 100644 Open-ILS/web/images/sub_prefs_my_lists_on.jpg diff --git a/KCLS/openils/var/templates_kcls/opac/myopac/lists.tt2 b/KCLS/openils/var/templates_kcls/opac/myopac/lists.tt2 index b37c99377c..8b51401bce 100644 --- a/KCLS/openils/var/templates_kcls/opac/myopac/lists.tt2 +++ b/KCLS/openils/var/templates_kcls/opac/myopac/lists.tt2 @@ -80,12 +80,47 @@ [%- IF offset > 0 -%] limit, offset => (offset - limit) + offset => (offset - limit) }) %]'>◄[% l('Previous') %] [%- END; -%] + + [%- IF (offset - (limit * 3)) >= 0 -%] + (offset - (limit * 3)) + }) %]'>[% ((offset - (limit * 3)) / limit) + 1 %] + [%- END; -%] + [%- IF (offset - (limit * 2)) >= 0 -%] + (offset - (limit * 2)) + }) %]'>[% ((offset - (limit * 2)) / limit) + 1 %] + [%- END; -%] + [%- IF (offset - limit) >= 0 -%] + (offset - limit) + }) %]'>[% ((offset - limit) / limit) + 1 %] + [%- END; -%] + + [% (offset / limit) + 1 %] + + [%- IF (ctx.bookbag_count - offset) > limit; -%] + (offset + limit) + }) %]'>[% ((offset + limit) / limit) + 1 %] + [%- END; -%] + [%- IF (ctx.bookbag_count - offset) > limit * 2; -%] + (offset + (limit * 2)) + }) %]'>[% ((offset + (limit * 2)) / limit) + 1 %] + [%- END; -%] + [%- IF (ctx.bookbag_count - offset) > limit * 3; -%] + (offset + (limit * 3)) + }) %]'>[% ((offset + (limit * 3)) / limit) + 1 %] + [%- END; -%] + [%- IF (ctx.bookbag_count - offset) > limit; -%] limit, offset => (offset + limit) + offset => (offset + limit) }) %]'>[% l('Next') %]► [%- END; -%] @@ -261,12 +296,47 @@ [%- IF offset > 0 -%] limit, offset => (offset - limit) + offset => (offset - limit) }) %]'>◄[% l('Previous') %] [%- END; -%] + + [%- IF (offset - (limit * 3)) >= 0 -%] + (offset - (limit * 3)) + }) %]'>[% ((offset - (limit * 3)) / limit) + 1 %] + [%- END; -%] + [%- IF (offset - (limit * 2)) >= 0 -%] + (offset - (limit * 2)) + }) %]'>[% ((offset - (limit * 2)) / limit) + 1 %] + [%- END; -%] + [%- IF (offset - limit) >= 0 -%] + (offset - limit) + }) %]'>[% ((offset - limit) / limit) + 1 %] + [%- END; -%] + + [% (offset / limit) + 1 %] + + [%- IF (ctx.bookbag_count - offset) > limit; -%] + (offset + limit) + }) %]'>[% ((offset + limit) / limit) + 1 %] + [%- END; -%] + [%- IF (ctx.bookbag_count - offset) > limit * 2; -%] + (offset + (limit * 2)) + }) %]'>[% ((offset + (limit * 2)) / limit) + 1 %] + [%- END; -%] + [%- IF (ctx.bookbag_count - offset) > limit * 3; -%] + (offset + (limit * 3)) + }) %]'>[% ((offset + (limit * 3)) / limit) + 1 %] + [%- END; -%] + [%- IF (ctx.bookbag_count - offset) > limit; -%] limit, offset => (offset + limit) + offset => (offset + limit) }) %]'>[% l('Next') %]► [%- END; -%] diff --git a/KCLS/openils/var/templates_kcls/opac/myopac/prefs_my_lists.tt2 b/KCLS/openils/var/templates_kcls/opac/myopac/prefs_my_lists.tt2 new file mode 100644 index 0000000000..99e7799f9f --- /dev/null +++ b/KCLS/openils/var/templates_kcls/opac/myopac/prefs_my_lists.tt2 @@ -0,0 +1,41 @@ +[% PROCESS "opac/parts/header.tt2"; + WRAPPER "opac/parts/myopac/prefs_base.tt2"; + myopac_page = "prefs_my_lists"; + prefs_page = 'my_lists' %] + + +
+ + + + + [% IF ctx.updated_user_settings %] + + [% END %] + + [%- setting = 'opac.lists_per_page' -%] + + + + + +
+
+ [% l('Account Successfully Updated') %] +
+
+ +
+ +
+ [% INCLUDE "opac/parts/myopac/prefs_hints.tt2" %] +[% END %] \ No newline at end of file diff --git a/KCLS/openils/var/templates_kcls/opac/parts/myopac/prefs_base.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/myopac/prefs_base.tt2 index 1b641a6001..f350c73126 100644 --- a/KCLS/openils/var/templates_kcls/opac/parts/myopac/prefs_base.tt2 +++ b/KCLS/openils/var/templates_kcls/opac/parts/myopac/prefs_base.tt2 @@ -15,6 +15,9 @@ [% END %]
+ +
+
[% ELSIF prefs_page == 'notify' %] @@ -24,10 +27,13 @@
+
+ +
- [% ELSE %] + [% ELSIF prefs_page == 'settings' %]
@@ -36,9 +42,27 @@ [% END %] +
+ +
+ [% ELSE %] +
+ +
+ [% IF ctx.opt_in_settings.size > 0 %] +
+ +
+ [% END %] +
+ +
+
+ +
[% END %] diff --git a/KCLS/sql/add_setting_for_selecting_lists_per_page_for_my_list.sql b/KCLS/sql/add_setting_for_selecting_lists_per_page_for_my_list.sql new file mode 100644 index 0000000000..aeeb5cc00b --- /dev/null +++ b/KCLS/sql/add_setting_for_selecting_lists_per_page_for_my_list.sql @@ -0,0 +1,23 @@ +-- Adds a setting for selecting the number of lists per page for my list. + +BEGIN; + +INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype) + VALUES ( + 'opac.lists_per_page', + TRUE, + oils_i18n_gettext( + 'opac.lists_per_page', + 'Lists per Page', + 'cust', + 'label' + ), + oils_i18n_gettext( + 'opac.lists_per_page', + 'A number designating the amount of lists displayed per page.', + 'cust', + 'description' + ), + 'string' + ); +COMMIT; \ No newline at end of file diff --git a/Open-ILS/web/images/sub_prefs_my_lists_off.jpg b/Open-ILS/web/images/sub_prefs_my_lists_off.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7a0a85ba1b8f5e237937dd04942ae6b6ce107484 GIT binary patch literal 2893 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 literal 0 HcmV?d00001 -- 2.11.0