From 6b5d48feee70f2e813f6e780387022545dcf0f2d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 6 Jun 2012 16:12:11 +0200 Subject: [PATCH] Bug 8199 : Replace table in opac-results with div Test plan: launch a query from your opac search form and compare results before and after applying this patch. Normally, You don't show a lot of differences. --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 44 ++ .../opac-tmpl/prog/en/modules/opac-results.tt | 520 +++++++++++-------- 2 files changed, 345 insertions(+), 219 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index ea538aa..0bf2421 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1169,6 +1169,50 @@ a.cancel { margin : 0 0 0 0; } +.searchresults .controls { + background-color : #EEE; + border : 1px solid #E8E8E8; + vertical-align : middle; + padding : 3px 3px 5px 5px; +} + +.searchresults .controls { + font-size: 90%; +} + +.searchresults .controls img { + vertical-align: middle; +} + +.searchresults .controls select { + font-size: 90%; +} + +.searchresults .controls label { + font-weight : bold; + margin-left : .5em; +} + +.result { + overflow: hidden; + border-bottom: 1px solid #DDDDDD; + padding: 5px 10px 0; +} +.all_results>div.odd { + background-color: #F3F3F3; +} + +.result > input{ + float: left; +} +.result > span { + float: left; + margin-left: 5px; +} +.result > span.image { + float: right; +} + #CheckAll, #CheckNone { font-weight : normal; margin : 0 .5em; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt index 67b1686..cd1b873 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt @@ -285,7 +285,6 @@ $(document).ready(function(){ [% END %] - [% IF ( total ) %] [% IF ( scan ) %]

Scan index:

@@ -345,7 +344,7 @@ $(document).ready(function(){ [% ELSE %]
-
+ [% IF ( searchdesc ) %] [% FOREACH QUERY_INPUT IN QUERY_INPUTS %] @@ -355,79 +354,92 @@ $(document).ready(function(){ [% END %] [% END %] - - - - - [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] +
+ + [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] [% UNLESS ( loop.odd ) %] -
+
[% ELSE %] -
+
[% END %] + [% IF ( opacbookbag ) %] + + [% ELSE %] + [% IF ( virtualshelves ) %] + + [% ELSE %] + [% IF ( RequestOnOpac ) %] + [% UNLESS ( SEARCH_RESULT.norequests ) %] + [% IF ( opacuserlogin ) %] + + [% END %] + [% END %] + [% END %] + [% END %] + [% END %] + [% UNLESS suppress_result_number %] + [% SEARCH_RESULT.result_number %]. + [% END %] -
- - - [% UNLESS ( item_level_itypes ) %] + [% UNLESS ( item_level_itypes ) %] [% UNLESS ( noItemTypeImages ) %] - - - [% END %] + + [% IF ( SEARCH_RESULT.imageurl ) %] + [% SEARCH_RESULT.description %] + [% END %] + [% IF ( SEARCH_RESULT.score_avg ) %] + + [% END %] + [% END %] + [% END %] - [% IF ( SEARCH_RESULT.AuthorisedValueImages ) %] - - [% END %] + [% IF ( SEARCH_RESULT.AuthorisedValueImages ) %] + + [% FOREACH authorised_value_image IN SEARCH_RESULT.authorised_value_images %] + [% authorised_value_image.label %] + [% END %] + + [% END %] - - + [% IF ( BakerTaylorEnabled ) %] + [% IF ( SEARCH_RESULT.normalized_isbn ) %] + See Baker & Taylor + [% ELSE %] + No cover image available + [% END %] [% END %] -
-
-
- - - - [% IF ( OpacHighlightedWords ) %] - Unhighlight - Highlight - [% END %] - [% IF ( opacbookbag || virtualshelves ) %] - - [% END %] - -
- - [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %] - [% IF ( TagsInputOnList ) %] - - [% IF ( loggedinusername ) %] - - +
+
+ +
+
+ + + + [% IF ( OpacHighlightedWords ) %] + Unhighlight + Highlight + [% END %] + [% IF ( opacbookbag || virtualshelves ) %] + + [% END %] + +
+ + [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %] + [% IF ( TagsInputOnList ) %] + + [% IF ( loggedinusername ) %] + + + [% END %] [% END %] - [% END %] - [% END %][% END %][% END %] + [% END %][% END %][% END %] +
-
[% IF ( opacbookbag ) %] [% ELSE %] -[% IF ( virtualshelves ) %] [% ELSE %] -[% IF ( RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( opacuserlogin ) %] [% END %][% END %][% END %][% END %][% END %][% UNLESS suppress_result_number %][% SEARCH_RESULT.result_number %].[% END %] - [% IF ( SEARCH_RESULT.imageurl ) %] - [% SEARCH_RESULT.description %] - [% END %] - [% IF ( SEARCH_RESULT.score_avg ) %] - - [% END %] - - [% FOREACH authorised_value_image IN SEARCH_RESULT.authorised_value_images %] - [% authorised_value_image.label %] - [% END %] - + [% IF ( COinSinOPACResults ) %] [% IF ( SEARCH_RESULT.coins ) %] @@ -435,204 +447,274 @@ $(document).ready(function(){ [% END %] [% IF ( OPACXSLTResultsDisplay ) %] - [% SEARCH_RESULT.XSLTResultsRecord %] + [% SEARCH_RESULT.XSLTResultsRecord %] [% ELSE %] - [% IF ( BiblioDefaultViewmarc ) %] - [% ELSE %] - [% IF ( BiblioDefaultViewisbd ) %] - [% ELSE %] - [% END %] - [% END %] - [% IF ( SEARCH_RESULT.title ) %][% SEARCH_RESULT.title |html %][% ELSE %]No title[% END %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield|html %][% END %] - [% IF ( SEARCH_RESULT.author ) %]by [% SEARCH_RESULT.author %] - [% ELSE %]  - [% END %] - Publication: - [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode|html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear %] - [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate %][% END %][% END %] - [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages %][% END %] - [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes|html %][% END %] - [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size %][% END %] - [% IF ( SEARCH_RESULT.timestamp ) %] (modified on [% SEARCH_RESULT.timestamp %])[% END %] - - [% IF ( SEARCH_RESULT.summary ) %] - - [% SEARCH_RESULT.summary %] - - [% END %] - [% IF ( SEARCH_RESULT.copyrightdate ) %]Date:[% SEARCH_RESULT.copyrightdate %][% END %] - - - Availability: - [% IF ( SEARCH_RESULT.available_items_loop.0 ) %] - Copies available: - [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %] - [% UNLESS ( available_items_loo.hideatopac ) %] - [% IF ( singleBranchMode ) %] - [% available_items_loo.location %] + [% IF ( BiblioDefaultViewmarc ) %] + + [% ELSE %] + [% IF ( BiblioDefaultViewisbd ) %] + [% ELSE %] - [% available_items_loo.branchname %] + [% END %] - - [% IF ( OPACItemsResultsDisplay ) %] - [% UNLESS ( singleBranchMode ) %][% available_items_loo.location %][% END %] - [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber %]][% END %] - [% END %] - ([% available_items_loo.count %]), + [% END %] + [% IF ( SEARCH_RESULT.title ) %] + [% SEARCH_RESULT.title |html %] + [% ELSE %] + No title + [% END %] + [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield|html %][% END %] + [% IF ( SEARCH_RESULT.author ) %] + by [% SEARCH_RESULT.author %] + [% ELSE %] +   + [% END %] + + Publication: + [% IF ( SEARCH_RESULT.place ) %] + [% SEARCH_RESULT.place %] [% END %] + [% IF ( SEARCH_RESULT.publishercode ) %] + [% SEARCH_RESULT.publishercode|html %] [% END %] - + [% IF ( SEARCH_RESULT.publicationyear ) %] + [% SEARCH_RESULT.publicationyear %] [% ELSE %] - [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS ) %] - [% FOREACH ALTERNATEHOLDING IN SEARCH_RESULT.ALTERNATEHOLDINGS %] -  [% ALTERNATEHOLDING.holding %], + [% IF ( SEARCH_RESULT.copyrightdate ) %] + [% SEARCH_RESULT.copyrightdate %] + [% END %] [% END %] + [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages %][% END %] + [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes|html %][% END %] + [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size %][% END %] + [% IF ( SEARCH_RESULT.timestamp ) %] (modified on [% SEARCH_RESULT.timestamp %])[% END %] + + [% IF ( SEARCH_RESULT.summary ) %] + + [% SEARCH_RESULT.summary %] + + [% END %] + [% IF ( SEARCH_RESULT.copyrightdate ) %] + Date:[% SEARCH_RESULT.copyrightdate %] + [% END %] + + + Availability: + [% IF ( SEARCH_RESULT.available_items_loop.0 ) %] + + Copies available: + [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %] + [% UNLESS ( available_items_loo.hideatopac ) %] + [% IF ( singleBranchMode ) %] + [% available_items_loo.location %] + [% ELSE %] + [% available_items_loo.branchname %] + [% END %] + + [% IF ( OPACItemsResultsDisplay ) %] + [% UNLESS ( singleBranchMode ) %][% available_items_loo.location %][% END %] + [% IF ( available_items_loo.itemcallnumber ) %] + [[% available_items_loo.itemcallnumber %]] + [% END %] + [% END %] + ([% available_items_loo.count %]), + [% END %] + [% END %] + [% ELSE %] + [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS ) %] + [% FOREACH ALTERNATEHOLDING IN SEARCH_RESULT.ALTERNATEHOLDINGS %] +  [% ALTERNATEHOLDING.holding %], + [% END %] + [% ELSE %] No items available: - [% END %] + [% END %] [% END %] - [% IF ( SEARCH_RESULT.onloancount ) %] Checked out ([% SEARCH_RESULT.onloancount %]), [% END %] - [% IF ( SEARCH_RESULT.wthdrawncount ) %] Withdrawn ([% SEARCH_RESULT.wthdrawncount %]), [% END %] - [% UNLESS ( SEARCH_RESULT.hidelostitems ) %][% IF ( SEARCH_RESULT.itemlostcount ) %] Lost ([% SEARCH_RESULT.itemlostcount %]),[% END %][% END %] - [% IF ( SEARCH_RESULT.damagedcount ) %] Damaged ([% SEARCH_RESULT.damagedcount %]),[% END %] - [% IF ( SEARCH_RESULT.orderedcount ) %] On order ([% SEARCH_RESULT.orderedcount %]),[% END %] - [% IF ( SEARCH_RESULT.onholdcount ) %] On hold ([% SEARCH_RESULT.onholdcount %]),[% END %] - [% IF ( SEARCH_RESULT.intransitcount ) %] In transit ([% SEARCH_RESULT.intransitcount %]),[% END %] + [% IF ( SEARCH_RESULT.onloancount ) %] Checked out ([% SEARCH_RESULT.onloancount %]), [% END %] + [% IF ( SEARCH_RESULT.wthdrawncount ) %] Withdrawn ([% SEARCH_RESULT.wthdrawncount %]), [% END %] + [% UNLESS ( SEARCH_RESULT.hidelostitems ) %][% IF ( SEARCH_RESULT.itemlostcount ) %] Lost ([% SEARCH_RESULT.itemlostcount %]),[% END %][% END %] + [% IF ( SEARCH_RESULT.damagedcount ) %] Damaged ([% SEARCH_RESULT.damagedcount %]),[% END %] + [% IF ( SEARCH_RESULT.orderedcount ) %] On order ([% SEARCH_RESULT.orderedcount %]),[% END %] + [% IF ( SEARCH_RESULT.onholdcount ) %] On hold ([% SEARCH_RESULT.onholdcount %]),[% END %] + [% IF ( SEARCH_RESULT.intransitcount ) %] In transit ([% SEARCH_RESULT.intransitcount %]),[% END %] - + [% END %] [% IF ( SEARCH_RESULT.score_avg ) %] - - [% SEARCH_RESULT.score_avg %] / 5 (on [% SEARCH_RESULT.num_scores %] 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 %] - + + + [% SEARCH_RESULT.score_avg %] / 5 (on [% SEARCH_RESULT.num_scores %] 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 ( LibraryThingForLibrariesID ) %]
[% END %] - [% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %] - [% IF ( TagsShowOnList ) %] - [% IF ( SEARCH_RESULT.TagLoop.size ) %] -
Tags: -
    [% FOREACH TagLoo IN SEARCH_RESULT.TagLoop %]
  • [% TagLoo.term %] ([% TagLoo.weight_total %])
  • - [% END %] -
- [% END %] - [% IF ( SEARCH_RESULT.TagLoop.size ) %] -
[% END %] - [% END %] - [% END %][% END %] - [% IF ( SEARCH_RESULT.searchhighlightblob ) %]Match: [% SEARCH_RESULT.searchhighlightblob %][% END %] - - - - - [% IF ( OpacStarRatings == 'all' ) %] -
- -[% FOREACH i IN [ 1 2 3 4 5 ] %] - -[% IF ( SEARCH_RESULT.rating_avg == i ) %] - -[% ELSE %] - -[% END %] - -[% END %] - - - - [% IF ( SEARCH_RESULT.rating_total ) > 0 %] -   ([% SEARCH_RESULT.rating_total %] votes) - [% ELSE %] -
+ [% IF ( opacuserlogin ) %] + [% IF ( TagsEnabled ) %] + [% IF ( TagsShowOnList ) %] + [% IF ( SEARCH_RESULT.TagLoop.size ) %] +
+ Tags: +
    + [% FOREACH TagLoo IN SEARCH_RESULT.TagLoop %] +
  • + [% TagLoo.term %] + ([% TagLoo.weight_total %]) +
  • + [% END %] +
+
+ [% END %] + [% END %] + [% END %] [% END %] + [% IF ( SEARCH_RESULT.searchhighlightblob ) %] + Match: [% SEARCH_RESULT.searchhighlightblob %] + [% END %] + [% IF ( OpacStarRatings == 'all' ) %] +
+ + [% FOREACH i IN [ 1 2 3 4 5 ] %] + [% IF ( SEARCH_RESULT.rating_avg == i ) %] + + [% ELSE %] + + [% END %] + [% END %] + + -
+ [% IF ( SEARCH_RESULT.rating_total ) > 0 %] +   ([% SEARCH_RESULT.rating_total %] votes) + [% ELSE %] +
+ [% END %] +
[% END %] -Actions: - [% IF ( RequestOnOpac ) %] + + Actions: + [% IF ( RequestOnOpac ) %] [% UNLESS ( SEARCH_RESULT.norequests ) %] - [% IF ( opacuserlogin ) %] - [% IF ( AllowOnShelfHolds ) %] - Place hold - [% ELSE %] - [% IF ( SEARCH_RESULT.itemsissued ) %] - Place hold - [% END %] - [% END %] + [% IF ( opacuserlogin ) %] + [% IF ( AllowOnShelfHolds ) %] + Place hold + [% ELSE %] + [% IF ( SEARCH_RESULT.itemsissued ) %] + Place hold + [% END %] [% END %] + [% END %] [% END %] - [% END %] + [% END %] - [% IF ( TagsInputOnList ) %] + [% IF ( TagsInputOnList ) %] [% IF ( loggedinusername ) %] - Add tag - - Cancel + Add tag + + + + + Cancel - [% ELSIF ( loop.first ) %]Log in to add tags. + Tag status here. + + + [% ELSIF ( loop.first ) %] + Log in to add tags. [% END %] - [% END %] + [% END %] - [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( virtualshelves ) %]Save to Lists - [% END %][% END %][% END %] - [% IF ( opacbookbag ) %] + [% IF ( opacuserlogin ) %] + [% IF ( loggedinusername ) %] + [% IF ( virtualshelves ) %] + Save to Lists + [% END %] + [% END %] + [% END %] + [% IF ( opacbookbag ) %] [% IF ( SEARCH_RESULT.incart ) %] - In your cart (remove) + In your cart (remove) [% ELSE %] - Add to cart + Add to cart [% END %] - [% END %] + [% END %] -
- - [% IF ( OPACLocalCoverImages ) %][% END %] - [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - - [% IF ( SyndeticsEnabled ) %] + + + + + [% IF ( OPACLocalCoverImages ) %] + + [% END %] + [% IF ( OPACAmazonEnabled ) %] + [% IF ( OPACAmazonCoverImages ) %] + [% IF ( SEARCH_RESULT.normalized_isbn ) %] + + [% ELSE %] + No cover image available + [% END %] + [% END %] + [% END %] + [% IF ( SyndeticsEnabled ) %] [% IF ( SyndeticsCoverImages ) %] - [% IF SEARCH_RESULT.normalized_isbn %] - [% IF ( using_https ) %] - + [% IF SEARCH_RESULT.normalized_isbn %] + [% IF ( using_https ) %] + [% ELSE %] - - [% END %] - [% ELSE %] + + [% END %] + [% ELSE %] No cover image available + [% END %] [% END %] - [% END %] - [% END %] + [% END %] - [% IF ( GoogleJackets ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %] - [% IF OpenLibraryCovers %][% IF SEARCH_RESULT.normalized_isbn %][% ELSE %]No cover image available[% END %][% END %] + [% IF ( GoogleJackets ) %] + [% IF ( SEARCH_RESULT.normalized_isbn ) %] + + [% ELSE %] + No cover image available + [% END %] + [% END %] + [% IF OpenLibraryCovers %] + [% IF SEARCH_RESULT.normalized_isbn %] + + [% ELSE %] + No cover image available + [% END %] + [% END %] - [% IF ( BakerTaylorEnabled ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] -
-
-
+ +
+ [% END %] + + +
-
- + + [% END %] [% INCLUDE 'page-numbers.inc' %] -- 1.7.7.3