From ccda684cbe0ed99902999534f15ed5f998daf5d4 Mon Sep 17 00:00:00 2001
From: Marijana Glavica <mglavica@ffzg.hr>
Date: Mon, 2 Jan 2012 18:55:28 +0100
Subject: [PATCH] intranet results should look like ISBD

---
 C4/Search.pm                                  |  1 +
 .../prog/en/modules/catalogue/results.tt      | 31 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 4a8de5cbad..0cd79192cd 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1492,6 +1492,7 @@ sub searchResults {
                : GetFrameworkCode($marcrecord->subfield($bibliotag,$bibliosubf));
         my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, $fw );
         $oldbiblio->{subtitle} = GetRecordValue('subtitle', $marcrecord, $fw);
+        $oldbiblio->{responsibility} = GetRecordValue('responsibility', $marcrecord, $fw);
         $oldbiblio->{result_number} = $i + 1;
 
         # add imageurl to itemtype if there is one
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 4b4e0889e4..067b5345eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -451,16 +451,23 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                             [% END %][% END %]
                             <td>
                                 <input type="checkbox" class="selection" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" style="display:none" />
+                                [% SEARCH_RESULT.result_number %].
                             </td>
                             <td>
-                                <p>[% SEARCH_RESULT.result_number %].
                                  [% biblionumber = SEARCH_RESULT.biblionumber %]
 
+                                        [% IF ( SEARCH_RESULT.author ) %]
+                                            <p>
+											<a href="/cgi-bin/koha/catalogue/search.pl?idx=au&amp;q=[% SEARCH_RESULT.author |url %]" title="Search for this Author">[% SEARCH_RESULT.author %]</a>
+											</p>
+                                        [% END %]
+								<p>
 				[% INCLUDE 'biblio-default-view.inc' %]
                                             <b>[% IF ( SEARCH_RESULT.title ) %][% SEARCH_RESULT.title |html %][% ELSE %]No title[% END %]</b>
+                                        [% FOREACH subtitl IN SEARCH_RESULT.subtitle %] [% subtitl.subfield %] [% END %]
+										[% IF ( SEARCH_RESULT.number ) %] [% SEARCH_RESULT.number %][% END %] [% IF ( SEARCH_RESULT.volume ) %] [% SEARCH_RESULT.volume %][% END %]
                                             </a>
-                                        [% FOREACH subtitl IN SEARCH_RESULT.subtitle %] , [% subtitl.subfield %] [% END %]
-										[% IF ( SEARCH_RESULT.volume ) %],[% SEARCH_RESULT.volume %][% END %] [% IF ( SEARCH_RESULT.volumeddesc ) %], [% SEARCH_RESULT.volumeddesc %][% END %]
+                                        [% FOREACH respon IN SEARCH_RESULT.responsibility %] [% respon.subfield %] [% END %]
                                 </p>
                                 [% IF ( SEARCH_RESULT.summary ) %]
                                         [% IF ( SEARCH_RESULT.author ) %]
@@ -483,20 +490,13 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                     [% END %][% END %]
                                     [% END %]
 
-                                        [% IF ( SEARCH_RESULT.author ) %]
-                                            <a href="/cgi-bin/koha/catalogue/search.pl?idx=au&amp;q=[% SEARCH_RESULT.author |url %]" title="Search for this Author">[% SEARCH_RESULT.author %]</a>
-                                        [% ELSE %]
-                                            &nbsp;
-                                        [% END %]
-                                        Description:
+										[% IF ( SEARCH_RESULT.edition ) %]<span class="results_edition">[% SEARCH_RESULT.edition %] - </span>[% END %]
                                         <span class="results_imprint">[% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place %] [% END %]
                                         [% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode %][% END %] [% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear %] [% ELSIF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate %][% END %]</span>
-										[% IF ( SEARCH_RESULT.edition ) %]<span class="results_edition">Edition: [% SEARCH_RESULT.edition %]</span>[% END %]
-                                        <span class="results_physicaldesc">[% IF ( SEARCH_RESULT.pages ) %]: [% SEARCH_RESULT.pages %][% END %]
-                                        [% IF ( SEARCH_RESULT.size ) %] ; [% SEARCH_RESULT.size %][% END %]</span> [% IF ( SEARCH_RESULT.normalized_isbn ) %]<span class="results_isbn">ISBN: [% SEARCH_RESULT.normalized_isbn %]</span>[% END %]
-                                        <span class="results_itemtype">[% SEARCH_RESULT.description %]</span>
+                                        <span class="results_physicaldesc">[% IF ( SEARCH_RESULT.pages ) %]. - [% SEARCH_RESULT.pages %][% END %]
+                                        [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size %][% END %]</span> [% IF ( SEARCH_RESULT.normalized_isbn ) %]<div class="results_isbn">ISBN: [% SEARCH_RESULT.normalized_isbn %]</div>[% END %]
+                                        <div class="results_itemtype">[% SEARCH_RESULT.description %]</div>
                                         [% IF ( SEARCH_RESULT.timestamp ) %] <i>(modified on [% SEARCH_RESULT.timestamp %])</i>[% END %]
-                                        [% IF ( SEARCH_RESULT.cn_class ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% SEARCH_RESULT.cn_class |url %]">[% SEARCH_RESULT.cn_class %]</a>][% END %]
                                     </p>
                                     [% IF ( SEARCH_RESULT.searchhighlightblob ) %]<p class="searchhighlightblob">[% SEARCH_RESULT.searchhighlightblob %]</p>[% END %]
 
@@ -533,7 +533,6 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                     [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
 
                                         [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %][% IF ( available_items_loo.imageurl ) %]<li style="list-style: none; list-style-type: none;"><img src="[% available_items_loo.imageurl %]" title="[% available_items_loo.description %]" alt="[% available_items_loo.description %]" />[% ELSE %]<li>[% END %][% ELSE %]<li>[% END %][% END %]
-                                        [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %]
                                         [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %]
                                         [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %]
                                         ([% available_items_loo.count %])</li>
@@ -550,7 +549,6 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                         [% ELSE %]<li>[% END %]
                                         [% ELSE %]<li>[% END %][% END %]
 
-                                        [% IF ( onloan_items_loo.branchname ) %][% onloan_items_loo.branchname %][% END %]
                                         [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %]
                                         [% IF ( onloan_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% onloan_items_loo.itemcallnumber |url %]">[% onloan_items_loo.itemcallnumber %]</a>][% END %]
                                         ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %]</li>
@@ -567,7 +565,6 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                         [% ELSE %]<li>[% END %]
                                         [% ELSE %]<li>[% END %][% END %]
 
-                                        [% IF ( other_items_loo.branchname ) %][% other_items_loo.branchname %][% END %]
                                         [% IF ( other_items_loo.location ) %][% other_items_loo.location %][% END %]
                                         [% IF ( other_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% other_items_loo.itemcallnumber |url %]">[% other_items_loo.itemcallnumber %]</a>][% END %]
                                         [% IF ( other_items_loo.wthdrawn ) %](Withdrawn)[% END %]
-- 
2.20.1