From 33584305c66c9343e64246174cb2b38b53b6db5d Mon Sep 17 00:00:00 2001 From: Dan Wells Date: Fri, 13 Sep 2013 12:41:11 -0400 Subject: [PATCH 1/1] Trivial changes to 'my list' paging code 1) Remove unneeded comment 2) un-CamelCase variables 3) Add 'my list' paginator selection to stylesheet Signed-off-by: Dan Wells --- .../lib/OpenILS/WWW/EGCatLoader/Account.pm | 18 +++---- Open-ILS/src/templates/opac/css/style.css.tt2 | 1 + Open-ILS/src/templates/opac/myopac/lists.tt2 | 50 +++++++++---------- 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm index 22182ee2f8..6acb39e709 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm @@ -479,10 +479,6 @@ sub load_myopac_prefs_my_lists { return Apache2::Const::OK unless $self->cgi->request_method eq 'POST'; - # some setting values from the form don't match the - # required value/format for the db, so they have to be - # individually translated. - my %settings; my $set_map = $self->ctx->{user_setting_map}; @@ -1768,10 +1764,10 @@ sub load_myopac_bookbags { $ctx->{bookbags_offset} = $offset; # for list item pagination - my $itemLimit = $self->_get_items_per_page; - my $itemPage = $self->cgi->param('itemPage') || 1; - my $itemOffset = ($itemPage - 1) * $itemLimit; - $ctx->{bookbags_itemPage} = $itemPage; + my $item_limit = $self->_get_items_per_page; + my $item_page = $self->cgi->param('item_page') || 1; + my $item_offset = ($item_page - 1) * $item_limit; + $ctx->{bookbags_item_page} = $item_page; my ($sorter, $modifier) = $self->_get_bookbag_sort_params("sort"); $e->xact_begin; # replication... @@ -1874,7 +1870,7 @@ sub load_myopac_bookbags { $ctx->{bb_item_count} = $ctx->{bb_item_count} + $ebook_r->[0]->{'count'}; #calculate page count - $ctx->{bb_page_count} = int ((($ctx->{bb_item_count} - 1) / $itemLimit) + 1); + $ctx->{bb_page_count} = int ((($ctx->{bb_item_count} - 1) / $item_limit) + 1); if ( ($self->cgi->param("action") || '') eq "editmeta") { if (!$self->_update_bookbag_metadata($bookbag)) { @@ -1907,8 +1903,8 @@ sub load_myopac_bookbags { # For list items pagination my $args = { - "limit" => $itemLimit, - "offset" => $itemOffset + "limit" => $item_limit, + "offset" => $item_offset }; my $items = $U->bib_container_items_via_search($bookbag->id, $query, $args) diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2 index 3d827d5ca6..0a5d71b864 100644 --- a/Open-ILS/src/templates/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates/opac/css/style.css.tt2 @@ -1328,6 +1328,7 @@ table.bookbag-specific { .bookbag-specific td.list_actions { white-space: nowrap !important; } +.bookbag-paginator-selected { color: [% css_colors.text_alert %]; } .list_is_empty { padding: 8px 0px 6px 0px; diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2 index 7707624ffd..3be190f656 100644 --- a/Open-ILS/src/templates/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates/opac/myopac/lists.tt2 @@ -4,7 +4,7 @@ myopac_page = "lists" limit = ctx.bookbags_limit; offset = ctx.bookbags_offset; - itemPage = ctx.bookbags_itemPage; + item_page = ctx.bookbags_item_page; %]
@@ -87,7 +87,7 @@
[% baseurl = ctx.opac_root _ '/myopac/lists'; IF bbag.id != CGI.param("bbid"); - url = mkurl(baseurl,{bbid => bbag.id, itemPage => 1},['edit_notes','sort']); + url = mkurl(baseurl,{bbid => bbag.id, item_page => 1},['edit_notes','sort']); ltitle = l("Show items in list"); ELSE; url = mkurl(baseurl, {}, ['bbid', 'edit_notes', 'sort']); @@ -365,47 +365,47 @@
[% l('Navigate Selected List ') %] - [%- IF itemPage > 1 -%] + [%- IF item_page > 1 -%] itemPage - 1 + item_page => item_page - 1 }) %]'>◄[% l('Previous') %] [%- END; -%] - [%- IF (itemPage - 3) >= 1 -%] + [%- IF (item_page - 3) >= 1 -%] itemPage - 3 - }) %]'>[% itemPage - 3 %] + item_page => item_page - 3 + }) %]'>[% item_page - 3 %] [%- END; -%] - [%- IF (itemPage - 2) >= 1 -%] + [%- IF (item_page - 2) >= 1 -%] itemPage - 2 - }) %]'>[% itemPage - 2 %] + item_page => item_page - 2 + }) %]'>[% item_page - 2 %] [%- END; -%] - [%- IF (itemPage - 1) >= 1 -%] + [%- IF (item_page - 1) >= 1 -%] itemPage - 1 - }) %]'>[% itemPage - 1%] + item_page => item_page - 1 + }) %]'>[% item_page - 1%] [%- END; -%] - [% itemPage %] - [%- IF (itemPage + 1) <= ctx.bb_page_count -%] + [% item_page %] + [%- IF (item_page + 1) <= ctx.bb_page_count -%] itemPage + 1 - }) %]'>[% itemPage + 1 %] + item_page => item_page + 1 + }) %]'>[% item_page + 1 %] [%- END; -%] - [%- IF (itemPage + 2) <= ctx.bb_page_count -%] + [%- IF (item_page + 2) <= ctx.bb_page_count -%] itemPage + 2 - }) %]'>[% itemPage + 2 %] + item_page => item_page + 2 + }) %]'>[% item_page + 2 %] [%- END; -%] - [%- IF (itemPage + 3) <= ctx.bb_page_count -%] + [%- IF (item_page + 3) <= ctx.bb_page_count -%] itemPage + 3 - }) %]'>[% itemPage + 3 %] + item_page => item_page + 3 + }) %]'>[% item_page + 3 %] [%- END; -%] - [%- IF (itemPage + 1) <= ctx.bb_page_count; -%] + [%- IF (item_page + 1) <= ctx.bb_page_count; -%] itemPage + 1 + item_page => item_page + 1 }) %]'>[% l('Next') %]► [%- END; -%] -- 2.43.2