merging 2.2 branch with head. Sorry for not making it before, many many commits done...

[koha_gimpoz] / koha-tmpl / opac-tmpl / css / en / opac-searchresults.tmpl

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
index f15a43a..d21eb50 100644 (file)
--- a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
@@ -78,16 +78,21 @@
                                </td>
                                <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
                                        <!-- TMPL_LOOP name="CN" -->
-                                               <p><!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" --> 
-                                               <!-- TMPL_IF name="date_due" -->
-                                                       <i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i>
-                                               <!-- TMPL_ELSE -->
-                                                       <!-- TMPL_IF name="itemcallnumber" -->
-                                                               (<!-- TMPL_VAR name="itemcallnumber" -->)
+                                               <p>
+                                                       <!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" -->
+                                                       <!-- TMPL_IF name="date_due" -->
+                                                               <i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i>
+                                                       <!-- TMPL_ELSE -->
+                                                               <!-- TMPL_IF name="itemcallnumber" -->
+                                                                       (<!-- TMPL_VAR name="itemcallnumber" -->)
+                                                               <!-- /TMPL_IF -->
+                                                       <!-- /TMPL_IF -->
+                                                       <!-- TMPL_IF name="notforloan" -->
+                                                               <i>(<!-- TMPL_VAR name="notforloan" -->)</i>
                                                        <!-- /TMPL_IF -->
-                                               <!-- /TMPL_IF -->
                                                </p>
                                        <!-- /TMPL_LOOP -->
+                                       <!-- TMPL_IF name="onorder" --><p>On order</p><!-- /TMPL_IF -->
                                </td>
                                <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
                                        <!-- TMPL_UNLESS NAME="norequests" -->