Bugzilla – Attachment 3852 Details for
Bug 5917
Switch Koha to use Template::Toolkit
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Follow-up patch (3 of 3)
bug_5917-follow-3.patch (text/plain), 8.32 KB, created by
Jared Camins-Esakov
on 2011-04-10 20:19:31 UTC
(
hide
)
Description:
Follow-up patch (3 of 3)
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2011-04-10 20:19:31 UTC
Size:
8.32 KB
patch
obsolete
>From 36c59333e02c555d0ac5a1715905dc9b0601e1c8 Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@bywatersolutions.com> >Date: Sun, 10 Apr 2011 12:09:43 -0400 >Subject: [PATCH 3/3] Bug 5917 follow-up: Fix errors on OPAC results >Content-Type: text/plain; charset="UTF-8" > >This patch fixes the following problems with the OPAC search results: >* The facet links were constructed wrong following the change to > Template::Toolkit > >This patch also changes the OPAC sorting dropdown to work in the same way as the >staff dropdown. This seemed preferable to having the two use different variables >for deciding which option to select, and it is unclear why Search.pm was not >passing the appropriate variables to the staff client. > >Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> >--- > .../opac-tmpl/prog/en/includes/opac-facets.inc | 4 +- > .../opac-tmpl/prog/en/includes/resort_form.inc | 88 ++++++++++++++------ > 2 files changed, 63 insertions(+), 29 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc >index cf2f80d..eac00aa 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc >+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc >@@ -18,8 +18,8 @@ > [% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %] > [% END %] > <ul> >- [% FOREACH facet IN facets_loo.facets %]<li><a href="/cgi-bin/koha/opac-search.pl?[% facet.query_cgi %][% facet.limit_cgi |html %][% IF ( facet.sort_by ) %]&sort_by=[% facet.sort_by %][% END %]&limit=[% facet.type_link_value %]:[% facet.facet_link_value %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a> [% IF ( facet.displayFacetCount ) %]([% facet.facet_count %])[% END %]</li>[% END %][% IF ( facets_loo.expandable ) %] >- <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?[% facets_loo.query_cgi %][% facets_loo.limit_cgi |html %][% IF ( facets_loo.sort_by ) %]&sort_by=[% facets_loo.sort_by %][% END %]&offset=[% facets_loo.offset %]&expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show More</a></li> >+ [% FOREACH facet IN facets_loo.facets %]<li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi |html %][% IF ( sort_by ) %]&sort_by=[% sort_by %][% END %]&limit=[% facet.type_link_value %]:[% facet.facet_link_value %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a> [% IF ( facet.displayFacetCount ) %]([% facet.facet_count %])[% END %]</li>[% END %][% IF ( facets_loo.expandable ) %] >+ <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi |html %][% IF ( sort_by ) %]&sort_by=[% sort_by %][% END %]&offset=[% facets_loo.offset %]&expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show More</a></li> > [% END %] > </ul></li> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc >index 9e59a5a..09c956f 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc >+++ b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc >@@ -1,36 +1,70 @@ > <option value="relevance">Relevance</option> >-<optgroup label="Popularity">[% IF ( popularity_dsc ) %] >+<optgroup label="Popularity"> >+[% IF ( sort_by == "popularity_dsc" ) %] > <option value="popularity_dsc" selected="selected">Popularity (Most to Least)</option>[% ELSE %] >-<option value="popularity_dsc">Popularity (Most to Least)</option>[% END %][% IF ( popularity_asc ) %] >+<option value="popularity_dsc">Popularity (Most to Least)</option> >+[% END %] >+[% IF ( sort_by == "popularity_asc" ) %] > <option value="popularity_asc" selected="selected">Popularity (Least to Most)</option>[% ELSE %] >-<option value="popularity_asc">Popularity (Least to Most)</option>[% END %] >+<option value="popularity_asc">Popularity (Least to Most)</option> >+[% END %] > </optgroup> >-<optgroup label="Author">[% IF ( author_az ) %] >-<option value="author_az" selected="selected">Author (A-Z)</option>[% ELSE %] >-<option value="author_az">Author (A-Z)</option>[% END %][% IF ( author_za ) %] >-<option value="author_za" selected="selected">Author (Z-A)</option>[% ELSE %] >-<option value="author_za">Author (Z-A)</option>[% END %] >+<optgroup label="Author"> >+[% IF ( sort_by == "author_az" || sort_by == "author_asc" ) %] >+<option value="author_az" selected="selected">Author (A-Z)</option> >+[% ELSE %] >+<option value="author_az">Author (A-Z)</option> >+[% END %] >+[% IF ( sort_by == "author_za" || sort_by == "author_dsc" ) %] >+<option value="author_za" selected="selected">Author (Z-A)</option> >+[% ELSE %] >+<option value="author_za">Author (Z-A)</option> >+[% END %] > </optgroup> >-<optgroup label="Call Number">[% IF ( call_number_asc ) %] >-<option value="call_number_asc" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>[% ELSE %] >-<option value="call_number_asc">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>[% END %][% IF ( call_number_dsc ) %] >-<option value="call_number_dsc" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option>[% ELSE %] >-<option value="call_number_dsc">Call Number (Fiction Z-A to Non-fiction 9-0)</option>[% END %] >+<optgroup label="Call Number"> >+[% IF ( sort_by == "call_number_asc" ) %] >+<option value="call_number_asc" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option> >+[% ELSE %] >+<option value="call_number_asc">Call Number (Non-fiction 0-9 to Fiction A-Z)</option> >+[% END %] >+[% IF ( sort_by == "call_number_dsc" ) %] >+<option value="call_number_dsc" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option> >+[% ELSE %] >+<option value="call_number_dsc">Call Number (Fiction Z-A to Non-fiction 9-0)</option> >+[% END %] > </optgroup> >-<optgroup label="Dates">[% IF ( pubdate_dsc ) %] >-<option value="pubdate_dsc" selected="selected">Publication/Copyright Date: Newest to Oldest</option>[% ELSE %] >-<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option>[% END %][% IF ( pubdate_asc ) %] >-<option value="pubdate_asc" selected="selected">Publication/Copyright Date: Oldest to Newest</option>[% ELSE %] >-<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option>[% END %][% IF ( acqdate_dsc ) %] >-<option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option>[% ELSE %] >-<option value="acqdate_dsc">Acquisition Date: Newest to Oldest</option>[% END %][% IF ( acqdate_asc ) %] >-<option value="acqdate_asc" selected="selected">Acquisition Date: Oldest to Newest</option>[% ELSE %] >-<option value="acqdate_asc">Acquisition Date: Oldest to Newest</option>[% END %] >+<optgroup label="Dates"> >+[% IF ( sort_by == "pubdate_dsc" ) %] >+<option value="pubdate_dsc" selected="selected">Publication/Copyright Date: Newest to Oldest</option> >+[% ELSE %] >+<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option> >+[% END %] >+[% IF ( sort_by == "pubdate_asc" ) %] >+<option value="pubdate_asc" selected="selected">Publication/Copyright Date: Oldest to Newest</option> >+[% ELSE %] >+<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option> >+[% END %] >+[% IF ( sort_by == "acqdate_dsc" ) %] >+<option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option> >+[% ELSE %] >+<option value="acqdate_dsc">Acquisition Date: Newest to Oldest</option> >+[% END %] >+[% IF ( sort_by == "acqdate_asc" ) %] >+<option value="acqdate_asc" selected="selected">Acquisition Date: Oldest to Newest</option> >+[% ELSE %] >+<option value="acqdate_asc">Acquisition Date: Oldest to Newest</option> >+[% END %] > </optgroup> >-<optgroup label="Title">[% IF ( title_az ) %] >-<option value="title_az" selected="selected">Title (A-Z)</option>[% ELSE %] >-<option value="title_az">Title (A-Z)</option>[% END %][% IF ( title_za ) %] >-<option value="title_za" selected="selected">Title (Z-A)</option>[% ELSE %] >-<option value="title_za">Title (Z-A)</option>[% END %] >+<optgroup label="Title"> >+[% IF ( sort_by == "title_az" || sort_by == "title_asc" ) %] >+<option value="title_az" selected="selected">Title (A-Z)</option> >+[% ELSE %] >+<option value="title_az">Title (A-Z)</option> >+[% END %] >+[% IF ( sort_by == "title_za" || sort_by == "title_dsc" ) %] >+<option value="title_za" selected="selected">Title (Z-A)</option> >+[% ELSE %] >+<option value="title_za">Title (Z-A)</option> >+[% END %] > </optgroup> > >-- >1.7.2.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5917
:
3505
|
3850
|
3851
| 3852 |
4248
|
4375