synch'ing 2.2 and head

[koha.git] / koha-tmpl / opac-tmpl / css / en / opac-basket.tmpl
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl

index 136ef69..2863d68 100644 (file)
--- a/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl
@@ -4,6 +4,7 @@
  <!-- TMPL_ELSE -->
  <body style="padding-bottom:20px;">
  <!-- TMPL_INCLUDE NAME="opac-basket-menu.inc" -->
+<form name='myform'><input type='hidden' name='records'></form>
  <!-- /TMPL_IF -->
  <div id="mainbloc" style="margin-top:10px;margin-bottom:20px;padding-top:10px;padding-bottom:10px;">
  <!-- TMPL_IF NAME="verbose" -->
@@ -109,10 +110,24 @@
                                 <td> <!-- TMPL_VAR NAME="url" --></td>
                         </tr>
                 <!-- /TMPL_IF -->
+                               <tr>
+                                       <th>location</th>
+                                       <th>barcode</th>
+                               </tr>
+                               <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+                                       <tr>
+                                               <td>
+                                                       <!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> 
+                                                       <!-- TMPL_IF name="itemcallnumber" -->
+                                                               (<!-- TMPL_VAR NAME="itemcallnumber" -->)
+                                                       <!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_VAR NAME="barcode" --></td>
+                                       </tr>
+                               <!-- /TMPL_LOOP -->
                 </table>
         <!-- /TMPL_LOOP -->
  <!-- TMPL_ELSE -->
-
         <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
         <div width="100%" style="margin-top:0px;margin-bottom:0px;padding-top:10px;padding-bottom:10px;">
         <table cellspacing="0" style="border:0;width:100%;">
@@ -126,7 +141,7 @@
                         <table cellspacing="0">
                                 <!-- BIBLIO RECORD TABLE -->
                                 <tr>
-                                       <th>
+                                       <th colspan="2">
                                                 <a onClick="javascript:openBiblio(<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a>
                                         </th>
                                 </tr>
@@ -152,17 +167,26 @@
                                                 <!-- TMPL_IF name="url" --><b>URL:</b> <!-- TMPL_VAR NAME="url" --><br><!-- /TMPL_IF -->
                                         </td>
                                 </tr>
+                               <tr>
+                                       <th>location</th>
+                                       <th>barcode</th>
+                               </tr>
+                               <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+                                       <tr>
+                                               <td>
+                                                       <!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> 
+                                                       <!-- TMPL_IF name="itemcallnumber" -->
+                                                               (<!-- TMPL_VAR NAME="itemcallnumber" -->)
+                                                       <!-- /TMPL_IF -->
+                                               </td>
+                                               <td><!-- TMPL_VAR NAME="barcode" --></td>
+                                       </tr>
+                               <!-- /TMPL_LOOP -->
                         </table>
-                       </td>
-               </tr>
+               </td></tr>
         </table>
-       </div>
+</div>
         <!-- /TMPL_LOOP -->
  <!-- /TMPL_IF -->
  </div>
-
-<!-- TMPL_UNLESS NAME="print_basket" -->
-<!-- TMPL_INCLUDE NAME="opac-basket-menu.inc" -->
-<FORM name='myform'><INPUT type='hidden' name='records'></FORM>
-<!-- /TMPL_UNLESS -->
  <!-- TMPL_INCLUDE NAME="opac-basket-bottom.inc" -->