X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fcatalogue%2Fresults.tmpl;h=f57d5d8869505f5e6b418d7bf4f7155072f729ff;hb=05ba7ca4b68947b88894b68a86573b96afbdf1f9;hp=b8329243c78b1b54f3d36d9062c3754c7a2a6e68;hpb=8f6033ee923213deaf909ffa89a5d07694b661bd;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index b8329243c7..f57d5d8869 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -6,6 +6,8 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a>  &rsaquo; Search for <i><!-- TMPL_VAR NAME="searchdesc" --></i></div>
+
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
@@ -26,7 +28,6 @@
     <!-- TMPL_IF NAME="total" -->
     <h3>
         <!-- TMPL_VAR NAME="total" --> results found for '<!-- TMPL_VAR NAME="searchdesc" -->'
-        <a href="/cgi-bin/koha/catalogue/search.pl">Perform a new search</a>
     </h3>
     <!-- TMPL_ELSE -->
         <!-- TMPL_IF NAME="searchdesc" -->
@@ -34,13 +35,11 @@
             <p>
                 No results match your search for <span style="font-weight: bold;">&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo;</span> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
             </p>
-            <a href="/cgi-bin/koha/catalogue/search.pl" title="New search">Perform a new search</a>
         <!-- TMPL_ELSE -->
             <h3> No result found !</h3>
             <p>
             You did not specify any search criteria.
             </p>
-            <a href="/cgi-bin/koha/catalogue/search.pl" title="New search">Perform a new search</a>
         <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
     
@@ -68,7 +67,7 @@
                         <label for="scan-index">Indexed in:</label>
                         <select name="idx" id="scan-index">
                             <option value="">Any Word</option>
-                            <option value="any/phr:">Any Phrase</option>
+                            <option value="any,phr:">Any Phrase</option>
                             <option value="ti:">Title</option>
                             <option value="ti,phr:">Title Phrase</option>
                             <option value="au,phr:">Author</option>
@@ -94,7 +93,11 @@
                     <th>Count</th>
                 </tr>
                 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-                    <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
+				<!-- TMPL_IF name="even" -->
+                    <tr class="highlight">
+				<!-- TMPL_ELSE -->
+					<tr>
+				<!-- /TMPL_IF -->
                         <td>
                             <a href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" -->&quot;"><!-- TMPL_VAR NAME="title" --></a>
                         </td>
@@ -179,84 +182,20 @@
             <!-- ######### -->
 
             <div id="searchresults">
-              <form action="/cgi-bin/koha/catalogue/search.pl" method="get" name="myform" id="mainform">
+				<form action="/cgi-bin/koha/catalogue/search.pl" method="get" name="myform" id="mainform">
                 <!-- TMPL_IF NAME="searchdesc" -->
                     <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="searchdesc" escape="html" -->" />
                 <!-- /TMPL_IF -->
-                    <!-- RE-SORT START -->
+ 				<!-- RE-SORT START -->
                     <p>
                     Re-sort results
                     <select id="sort_by" name="sort_by" onchange="document.myform.submit();">
-                        <option value="">Field-weighted, Relevance Ranked</option>
-        <!--TMPL_IF Name="9523a"-->
-          <option value="1=9523 &gt;i" selected="selected">Popularity (Most to Least)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=9523 &gt;i">Popularity (Most to Least)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="9523d"-->
-          <option value="1=9523 &lt;i" selected="selected">Popularity (Least to Most)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=9523 &lt;i">Popularity (Least to Most)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="1003d"-->
-          <option value="1=1003 &lt;i" selected="selected">Author (A-Z)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=1003 &lt;i">Author (A-Z)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="1003a"-->
-         <option value="1=1003 &gt;i" selected="selected">Author (Z-A)</option>
-        <!--TMPL_ELSE -->
-         <option value="1=1003 &gt;i">Author (Z-A)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="20d"-->
-          <option value="1=20 &lt;i" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=20 &lt;i">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="20a"-->
-          <option value="1=20 &gt;i" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=20 &gt;i">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="31a"-->
-          <option value="1=31 &gt;i" selected="selected">Dates</option>
-        <!--TMPL_ELSE -->
-          <option value="1=31 &gt;i">Dates</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="31a"-->
-          <option value="1=31 &gt;i" selected="selected">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
-        <!--TMPL_ELSE -->
-          <option value="1=31 &gt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="31d"-->
-          <option value="1=31 &lt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest</option>
-        <!--TMPL_ELSE -->
-          <option value="1=31 &lt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="32a"-->
-          <option value="1=32 &gt;i" selected="selected">&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
-        <!--TMPL_ELSE -->
-          <option value="1=32 &gt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="32d"-->
-          <option value="1=32 &lt;i" selected="selected">&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
-        <!--TMPL_ELSE -->
-          <option value="1=32 &lt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="4d"-->
-          <option value="1=4 &lt;i" selected="selected">Title (A-Z)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=4 &lt;i">Title (A-Z)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="4a"-->
-          <option value="1=4 &gt;i" selected="selected">Title (Z-A)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=4 &gt;i">Title (Z-A)</option>
-        <!--/TMPL_IF-->
-                    </select>
+					<!-- TMPL_INCLUDE NAME="resort_form.inc" -->
+					</select>
                     </p>
                     <!-- RESORT END -->
-              </form>
+				</form>
+	
                     <!-- TABLE RESULTS START -->
 
                 <table>
@@ -341,13 +280,13 @@
                                         <span class="available">
                                         <!--/TMPL_IF -->
                                         
-                                            <!-- TMPL_VAR NAME="count" --> <!-- TMPL_VAR NAME="branchcode" -->
+                                            (<!-- TMPL_VAR NAME="count" -->) <!-- TMPL_VAR NAME="branchcode" -->
                                             <i>
                                         <!-- TMPL_IF name="location" --><!-- TMPL_VAR name="location" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="itemcallnumber" --><!-- TMPL_VAR name="itemcallnumber" --><!-- /TMPL_IF -->
-                                         <!-- TMPL_IF name="classification" -->
-                                            <a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
-                                                <!-- TMPL_VAR NAME="classification" -->
+                                         <!-- TMPL_IF name="cn_class" -->
+                                            <a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="cn_class" ESCAPE="URL" -->">
+                                                <!-- TMPL_VAR NAME="cn_class" -->
                                             </a>
                                         <!-- /TMPL_IF -->
                                         </i>
@@ -362,10 +301,10 @@
                                 </td>
                                 <td>
                                     <!-- TMPL_IF NAME="norequests" -->
-                                        Not Reserveable
+                                        No holds allowed
                                     <!-- TMPL_ELSE -->
                                         <a class="reserve" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                                            Reserves
+                                            Holds
                                         </a>
                                     <!-- /TMPL_IF -->
                                 </td>
@@ -376,7 +315,7 @@
         <!-- /TMPL_IF -->
     
        <div class="pages">
-           <!-- TMPL_VAR NAME='pagination_bar'-->
+           <!-- TMPL_VAR NAME="pagination_bar" -->
        </div>
     
         <!-- TMPL_IF NAME="outer_sup_results_loop" -->
@@ -398,7 +337,7 @@
 </div>
 </div>
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="facets.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->