X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tt%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fcatalogue%2Fresults.tt;h=a87b8452f78ba84d589beea2a837671d4973547e;hb=3d9bea43748ed026a0dae02fae934fc2069dc09b;hp=6be6efcdc00d4d7375977fd09a10494ae6fd0cd1;hpb=01f7ea0d28683158cac27ca006000c57b8149c99;p=koha_gimpoz

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 6be6efcdc0..a87b8452f7 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -318,12 +318,12 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                         <label for="scan-index">Indexed in:</label>
                         <select name="idx" id="scan-index">
                             <option value="">Any Word</option>
-                            <option <!-- TMPL_IF NAME="ms_any,phr" --> selected="selected" [% END %] value="any,phr">Any Phrase</option>
+                            <option [% IF ( ms_anycommaphr ) %] selected="selected" [% END %] value="anycommaphr">Any Phrase</option>
                             <option [% IF ( ms_ti ) %] selected="selected" [% END %] value="ti">Title</option>
-                            <option <!-- TMPL_IF NAME="ms_ti,phr" --> selected="selected" [% END %] value="ti,phr">Title Phrase</option>
-                            <option <!-- TMPL_IF NAME="ms_au,phr" --> selected="selected" [% END %] value="au,phr">Author</option>
+                            <option [% IF ( ms_ticommaphr ) %] selected="selected" [% END %] value="ticommaphr">Title Phrase</option>
+                            <option [% IF ( ms_aucommaphr ) %] selected="selected" [% END %] value="aucommaphr">Author</option>
                             <option [% IF ( ms_su ) %] selected="selected" [% END %] value="su">Subject</option>
-                            <option <!-- TMPL_IF NAME="ms_su,phr" --> selected="selected" [% END %] value="su,phr">Subject Phrase</option>
+                            <option [% IF ( ms_sucommaphr ) %] selected="selected" [% END %] value="sucommaphr">Subject Phrase</option>
                             <option [% IF ( ms_se ) %] selected="selected" [% END %] value="se">Series</option>
                             <option [% IF ( ms_pb ) %] selected="selected" [% END %] value="pb">Publisher</option>
                             <option [% IF ( ms_nt ) %] selected="selected" [% END %] value="nt">Notes</option>
@@ -430,7 +430,9 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                             </td>
                             <td>
                                 <p>[% SEARCH_RESULT.result_number %].
-                                [% INCLUDE 'biblio-default-view.inc' %]
+                                 [% biblionumber = SEARCH_RESULT.biblionumber %]
+
+				[% INCLUDE 'biblio-default-view.inc' %]
                                             <b>[% IF ( SEARCH_RESULT.title ) %][% SEARCH_RESULT.title |html %][% ELSE %]No title[% END %]</b>
                                             </a>
                                         [% FOREACH subtitl IN SEARCH_RESULT.subtitle %] , [% subtitl.subfield %] [% END %]
@@ -438,39 +440,39 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                 </p>
                                 [% IF ( SEARCH_RESULT.summary ) %]
                                         [% IF ( SEARCH_RESULT.author ) %]
-                                            <a href="/cgi-bin/koha/catalogue/search.pl?q=au:[% SEARCH_RESULT.author |url %]" title="Search for this Author">[% SEARCH_RESULT.author %]</a>
+                                            <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 %]
                                     <p>
-                                    [% UNLESS ( SEARCH_RESULT.item_level_itypes ) %]
-                                    [% UNLESS ( SEARCH_RESULT.noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %]
+                                    [% UNLESS ( item_level_itypes ) %]
+                                    [% UNLESS ( noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %]
                                     <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" />
                                     [% END %][% END %]
                                     [% END %]
                                     [% SEARCH_RESULT.summary %]</p>
                                 [% ELSE %]
                                     <p>
-                                    [% UNLESS ( SEARCH_RESULT.item_level_itypes ) %]
-                                    [% UNLESS ( SEARCH_RESULT.noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %]
+                                    [% UNLESS ( item_level_itypes ) %]
+                                    [% UNLESS ( noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %]
                                     <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" />
                                     [% END %][% END %]
                                     [% END %]
 
                                         [% IF ( SEARCH_RESULT.author ) %]
-                                            <a href="/cgi-bin/koha/catalogue/search.pl?q=au:[% SEARCH_RESULT.author |url %]" title="Search for this Author">[% SEARCH_RESULT.author %]</a>
+                                            <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.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 %]
-										[% IF ( SEARCH_RESULT.edition ) %]Edition: [% SEARCH_RESULT.edition %][% END %]
-                                        [% IF ( SEARCH_RESULT.pages ) %]: [% SEARCH_RESULT.pages %][% END %]
-                                        [% IF ( SEARCH_RESULT.size ) %] ; [% SEARCH_RESULT.size %][% END %] [% IF ( SEARCH_RESULT.normalized_isbn ) %]ISBN: [% SEARCH_RESULT.normalized_isbn %][% END %]
-                                        [% SEARCH_RESULT.description %]
+                                        <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>
                                         [% 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?q=callnum:[% SEARCH_RESULT.cn_class |url %]">[% SEARCH_RESULT.cn_class %]</a>][% 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 %]
 
@@ -506,10 +508,10 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                     <ul>
                                     [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
 
-                                        [% IF ( available_items_loo.noItemTypeImages ) %]<li>[% ELSE %][% IF ( available_items_loo.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 ( 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?q=callnum:[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% 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>
                                     [% END %]</ul>
                                     [% END %]
@@ -518,7 +520,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                    <span class="status">[% IF ( SEARCH_RESULT.onloancount ) %][% SEARCH_RESULT.onloancount %][% END %] on loan:</span>
                                     <ul>
                                     [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %]
-                                       [% IF ( onloan_items_loo.noItemTypeImages ) %]<li>[% ELSE %][% IF ( onloan_items_loo.item_level_itypes ) %]
+                                       [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
                                         [% IF ( onloan_items_loo.imageurl ) %]
                                         <li style="list-style: none; list-style-type: none;"><img src="[% onloan_items_loo.imageurl %]" title="[% onloan_items_loo.description %]" alt="[% onloan_items_loo.description %]" />
                                         [% ELSE %]<li>[% END %]
@@ -526,7 +528,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
 
                                         [% 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?q=callnum:[% onloan_items_loo.itemcallnumber |url %]">[% onloan_items_loo.itemcallnumber %]</a>][% 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>
                                     [% END %]</ul>
                                     [% END %]
@@ -535,7 +537,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                     <span class="unavailable">[% IF ( SEARCH_RESULT.othercount ) %][% SEARCH_RESULT.othercount %][% END %] unavailable:</span>
                                     <ul>
                                     [% FOREACH other_items_loo IN SEARCH_RESULT.other_items_loop %]
-                                        [% IF ( other_items_loo.noItemTypeImages ) %]<li>[% ELSE %][% IF ( other_items_loo.item_level_itypes ) %]
+                                        [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
                                         [% IF ( other_items_loo.imageurl ) %]
                                         <li style="list-style: none; list-style-type: none;"><img src="[% other_items_loo.imageurl %]" title="[% other_items_loo.description %]" alt="[% other_items_loo.description %]" />
                                         [% ELSE %]<li>[% END %]
@@ -543,7 +545,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
 
                                         [% 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?q=callnum:[% other_items_loo.itemcallnumber |url %]">[% other_items_loo.itemcallnumber %]</a>][% 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 %]
                                         [% IF ( other_items_loo.itemlost ) %](Lost)[% END %]
                                         [% IF ( other_items_loo.damaged ) %](Damaged)[% END %]
@@ -554,7 +556,16 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                     [% END %]</ul>
                                     [% END %]
                                     [% ELSE %]
+                                    [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS ) %]
+                                    <strong id="altholdings_heading">Other holdings:</strong>
+                                    <ul>
+                                    [% FOREACH ALTERNATEHOLDING IN SEARCH_RESULT.ALTERNATEHOLDINGS %]
+                                    <li id="alternateholdings">[% ALTERNATEHOLDING.holding %]</li>
+                                    [% END %]
+                                    </li>
+                                    [% ELSE %]
                                     <span class="unavailable">No items</span>
+                                    [% END %]
                                     [% END %] <!-- /items count -->
                                     </div></td>