@@ -, +, @@ Template::Toolkit --- .../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(-) --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc +++ a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc @@ -18,8 +18,8 @@ [% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %] [% END %] [% END %] --- a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc +++ a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc @@ -1,36 +1,70 @@ -[% IF ( popularity_dsc ) %] + +[% IF ( sort_by == "popularity_dsc" ) %] [% ELSE %] -[% END %][% IF ( popularity_asc ) %] + +[% END %] +[% IF ( sort_by == "popularity_asc" ) %] [% ELSE %] -[% END %] + +[% END %] -[% IF ( author_az ) %] -[% ELSE %] -[% END %][% IF ( author_za ) %] -[% ELSE %] -[% END %] + +[% IF ( sort_by == "author_az" || sort_by == "author_asc" ) %] + +[% ELSE %] + +[% END %] +[% IF ( sort_by == "author_za" || sort_by == "author_dsc" ) %] + +[% ELSE %] + +[% END %] -[% IF ( call_number_asc ) %] -[% ELSE %] -[% END %][% IF ( call_number_dsc ) %] -[% ELSE %] -[% END %] + +[% IF ( sort_by == "call_number_asc" ) %] + +[% ELSE %] + +[% END %] +[% IF ( sort_by == "call_number_dsc" ) %] + +[% ELSE %] + +[% END %] -[% IF ( pubdate_dsc ) %] -[% ELSE %] -[% END %][% IF ( pubdate_asc ) %] -[% ELSE %] -[% END %][% IF ( acqdate_dsc ) %] -[% ELSE %] -[% END %][% IF ( acqdate_asc ) %] -[% ELSE %] -[% END %] + +[% IF ( sort_by == "pubdate_dsc" ) %] + +[% ELSE %] + +[% END %] +[% IF ( sort_by == "pubdate_asc" ) %] + +[% ELSE %] + +[% END %] +[% IF ( sort_by == "acqdate_dsc" ) %] + +[% ELSE %] + +[% END %] +[% IF ( sort_by == "acqdate_asc" ) %] + +[% ELSE %] + +[% END %] -[% IF ( title_az ) %] -[% ELSE %] -[% END %][% IF ( title_za ) %] -[% ELSE %] -[% END %] + +[% IF ( sort_by == "title_az" || sort_by == "title_asc" ) %] + +[% ELSE %] + +[% END %] +[% IF ( sort_by == "title_za" || sort_by == "title_dsc" ) %] + +[% ELSE %] + +[% END %] --