From a0f2925c591aa93d723486df1892747af3e2c91f Mon Sep 17 00:00:00 2001 From: Hammat Wele Date: Wed, 4 Jun 2025 18:20:43 +0000 Subject: [PATCH] Bug 39589: (QA follow-up) Tidy opac-results.tt --- .../bootstrap/en/modules/opac-results.tt | 388 +++++++++--------- 1 file changed, 194 insertions(+), 194 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 93a1259060..d6971969fe 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -192,76 +192,65 @@
[% INCLUDE 'page-numbers.inc' %]
- [% UNLESS no_result %] - [% UNLESS tag %] -
- - - - [% IF Koha.Preference('OPACnumSearchResultsDropdown') %] - - + [% INCLUDE 'resort_form.inc' %] - [% END # IF Koha.Preference('OPACnumSearchResultsDropdown') %] -
- -
- -
- - [% END # /UNLESS tag %] - [% END %] + + [% IF Koha.Preference('OPACnumSearchResultsDropdown') %] + + + [% END # IF Koha.Preference('OPACnumSearchResultsDropdown') %] +
+ +
+ +
+ + [% END # /UNLESS tag %] + [% END %]
[% INCLUDE 'result-batch-controls.inc' results=1 %] [% IF no_result %] -

Search results on this page are not available.

+

Search results on this page are not available.

[% END %] [% UNLESS no_result %] - - - - - - [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] - - [%# Cell 1: Checkbox %] - [% IF ( SEARCH_RESULT.title ) %] - [% check_title = SEARCH_RESULT.title %] - [% ELSE %] - [% check_title = SEARCH_RESULT.biblionumber %] - [% END %] - + + [% END # / FOREACH SEARCH_RESULT %] +
Results
- [% IF Koha.Preference( 'opacbookbag' ) == 1 %] - - + + + + + + [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] + + [%# Cell 1: Checkbox %] + [% IF ( SEARCH_RESULT.title ) %] + [% check_title = SEARCH_RESULT.title %] [% ELSE %] - [% IF Koha.Preference( 'virtualshelves' ) == 1 %] + [% check_title = SEARCH_RESULT.biblionumber %] + [% END %] + - - [%# Cell 2: Show result number if OpacHiddenItems is empty %] - + [% END # IF OPACHoldRequests %] + [% END # IF virtualshelves %] + [% END # IF opacbookbag %] + - [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) && !Koha.Preference('OpacNoItemTypeImages') %] - [%# Cell 3: Show item type image %] - - [% END %] - [% IF ( CoverImages) %] - - [% END %] - [%# Cell 4: Search result details and controls %] - [% END %] -
- [% SEARCH_RESULT.XSLTResultsRecord | $raw %] - - [% IF ( SEARCH_RESULT.score_avg ) %] -
- [% FOREACH i IN [ 1 2 3 4 5 ] %] - [% IF ( SEARCH_RESULT.score_int >= i ) %] - - [% ELSE %] - + [% IF ( CoverImages) %] +
+ [% END %] + [%# Cell 4: Search result details and controls %] + - - [% END # / FOREACH SEARCH_RESULT %] -
Results
+ [% IF Koha.Preference( 'opacbookbag' ) == 1 %] [% ELSE %] - [% IF Koha.Preference( 'OPACHoldRequests' ) == 1 %] - [% UNLESS ( SEARCH_RESULT.norequests ) %] - [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] - - + [% IF Koha.Preference( 'virtualshelves' ) == 1 %] + + + [% ELSE %] + [% IF Koha.Preference( 'OPACHoldRequests' ) == 1 %] + [% UNLESS ( SEARCH_RESULT.norequests ) %] + [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] + + + [% END %] [% END %] - [% END %] - [% END # IF OPACHoldRequests %] - [% END # IF virtualshelves %] - [% END # IF opacbookbag %] - - [% UNLESS suppress_result_number %] - [% SEARCH_RESULT.result_number | html %]. - [% END %] - - [% IF ( SEARCH_RESULT.imageurl ) %] - [% SEARCH_RESULT.description | html %] - [% END %] - [% IF ( SEARCH_RESULT.score_avg ) %] - + [%# Cell 2: Show result number if OpacHiddenItems is empty %] + + [% UNLESS suppress_result_number %] + [% SEARCH_RESULT.result_number | html %]. [% END %] [% INCLUDE 'cover-images.inc' %] - [% IF ( COinSinOPACResults && SEARCH_RESULT.coins ) %] - - + + [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) && !Koha.Preference('OpacNoItemTypeImages') %] + [%# Cell 3: Show item type image %] + + [% IF ( SEARCH_RESULT.imageurl ) %] + [% SEARCH_RESULT.description | html %] + [% END %] + [% IF ( SEARCH_RESULT.score_avg ) %] + + [% END %] + [% INCLUDE 'cover-images.inc' %] + [% IF ( COinSinOPACResults && SEARCH_RESULT.coins ) %] + + + [% END %] +
+ [% SEARCH_RESULT.XSLTResultsRecord | $raw %] + + [% IF ( SEARCH_RESULT.score_avg ) %] +
+ [% FOREACH i IN [ 1 2 3 4 5 ] %] + [% IF ( SEARCH_RESULT.score_int >= i ) %] + + [% ELSE %] + + [% END %] [% END %] - [% END %] -    [% SEARCH_RESULT.score_avg | html %] / 5 (on [% SEARCH_RESULT.num_scores | html %] rates) +    [% SEARCH_RESULT.score_avg | html %] / 5 (on [% SEARCH_RESULT.num_scores | html %] rates) - [% IF ( SEARCH_RESULT.num_critics ) %] - - [% END %] - [% IF ( SEARCH_RESULT.num_critics_pro ) %] - - [% END %] - [% IF ( SEARCH_RESULT.num_videos ) %] - - [% END %] - [% IF ( SEARCH_RESULT.num_quotations ) %] - - [% END %] -
- - [% END # / IF SEARCH_RESULT.score_avg %] + [% IF ( SEARCH_RESULT.num_critics ) %] + + [% END %] + [% IF ( SEARCH_RESULT.num_critics_pro ) %] + + [% END %] + [% IF ( SEARCH_RESULT.num_videos ) %] + + [% END %] + [% IF ( SEARCH_RESULT.num_quotations ) %] + + [% END %] +
+ + [% END # / IF SEARCH_RESULT.score_avg %] - [% IF ( LibraryThingForLibrariesID ) %] -
- [% END %] + [% IF ( LibraryThingForLibrariesID ) %] +
+ [% END %] - [% IF ( TagsShowEnabled && SEARCH_RESULT.TagLoop.size ) %] -
- Tags: -
    - [% FOREACH TagLoo IN SEARCH_RESULT.TagLoop %] -
  • - [% TagLoo.term | html %] - ([% TagLoo.weight_total | html %]) -
  • - [% END %] -
-
- [% END %] + [% IF ( TagsShowEnabled && SEARCH_RESULT.TagLoop.size ) %] +
+ Tags: +
    + [% FOREACH TagLoo IN SEARCH_RESULT.TagLoop %] +
  • + [% TagLoo.term | html %] + ([% TagLoo.weight_total | html %]) +
  • + [% END %] +
+
+ [% END %] - [% IF Koha.Preference('virtualshelves') AND SEARCH_RESULT.shelves.count %] -
- Lists: -
    - [% FOREACH shelf IN SEARCH_RESULT.shelves %] -
  • - [% shelf.shelfname | html %] - [%~ UNLESS loop.last %],[% ELSE %].[% END ~%] -
  • - [% END %] -
-
- [% END %] + [% IF Koha.Preference('virtualshelves') AND SEARCH_RESULT.shelves.count %] +
+ Lists: +
    + [% FOREACH shelf IN SEARCH_RESULT.shelves %] +
  • + [% shelf.shelfname | html %] + [%~ UNLESS loop.last %],[% ELSE %].[% END ~%] +
  • + [% END %] +
+
+ [% END %] - [% IF ( SEARCH_RESULT.searchhighlightblob ) %] - - Match: - [% SEARCH_RESULT.searchhighlightblob | html %] - - [% END %] + [% IF ( SEARCH_RESULT.searchhighlightblob ) %] + + Match: + [% SEARCH_RESULT.searchhighlightblob | html %] + + [% END %] - [% INCLUDE "openlibrary-readapi.inc" bib = SEARCH_RESULT %] - - [% IF ( OpacStarRatings == 'all' ) %] -
- [% SET rating_avg = SEARCH_RESULT.ratings.get_avg_rating() %] - [% rating_avg_int = BLOCK %][% rating_avg | format("%.0f") %][% END %] -
-
- [% FOREACH i IN [ 1 2 3 4 5 ] %] - [% IF rating_avg_int == i %] - - [% ELSIF rating_avg_int > i %] - - [% ELSE %] - + [% INCLUDE "openlibrary-readapi.inc" bib = SEARCH_RESULT %] + + [% IF ( OpacStarRatings == 'all' ) %] +
+ [% SET rating_avg = SEARCH_RESULT.ratings.get_avg_rating() %] + [% rating_avg_int = BLOCK %][% rating_avg | format("%.0f") %][% END %] +
+
+ [% FOREACH i IN [ 1 2 3 4 5 ] %] + [% IF rating_avg_int == i %] + + [% ELSIF rating_avg_int > i %] + + [% ELSE %] + + [% END %] [% END %] - [% END %] +
-
- [% IF SEARCH_RESULT.ratings.count > 0 %] -   ([% SEARCH_RESULT.ratings.count | html %] votes) - [% ELSE %] -
- [% END %] -
- - [% END # / IF OpacStarRatings %] + [% IF SEARCH_RESULT.ratings.count > 0 %] +   ([% SEARCH_RESULT.ratings.count | html %] votes) + [% ELSE %] +
+ [% END %] +
+ + [% END # / IF OpacStarRatings %] - [% INCLUDE 'title-actions-menu.inc' items=SEARCH_RESULT %] -
-
+ [% INCLUDE 'title-actions-menu.inc' items=SEARCH_RESULT %] + +
[% END %] -- 2.34.1