[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc result.tmpl,1.21,1.22

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/en/search.marc

Modified Files:
        result.tmpl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: result.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** result.tmpl 9 Dec 2004 19:44:50 -0000       1.21
--- result.tmpl 1 Mar 2005 13:40:55 -0000       1.22
***************
*** 47,52 ****
--- 47,56 ----
                                                                <!-- /TMPL_IF 
-->
                                                        <!-- /TMPL_IF -->
+                                                       <!-- TMPL_IF 
name="notforloan" -->
+                                                               <i>(<!-- 
TMPL_VAR name="notforloan" -->)</i>
+                                                       <!-- /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 -->>
***************
*** 54,58 ****
                                                <a class="button catalogue" 
href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->">Request</a>
                                        <!-- TMPL_ELSE -->
!                                               Not Reservable
                                        <!-- /TMPL_UNLESS -->
                                </td>
--- 58,62 ----
                                                <a class="button catalogue" 
href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->">Request</a>
                                        <!-- TMPL_ELSE -->
!                                               <p>Not Reservable</p>
                                        <!-- /TMPL_UNLESS -->
                                </td>