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

[Paul POULAIN]

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

Modified Files:
        result.tmpl search.tmpl 
Log Message:
synch'ing 2.2 and head

Index: result.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** result.tmpl 1 Mar 2005 13:40:55 -0000       1.22
--- result.tmpl 4 May 2005 09:00:58 -0000       1.23
***************
*** 14,17 ****
--- 14,18 ----
                        <tr>
                                <th class="catalogue">Summary</th>
+                               <th class="catalogue">Item type</th>
                                <th class="catalogue">Item Count</th>
                                <th class="catalogue">Location</th>
***************
*** 34,37 ****
--- 35,41 ----
                                </td>
                                <td align="center" <!-- TMPL_IF NAME="even" --> 
class="hilighted"<!-- /TMPL_IF -->>
+                                       <p><!-- TMPL_VAR NAME="description" 
--></p>
+                               </td>
+                               <td align="center" <!-- TMPL_IF NAME="even" --> 
class="hilighted"<!-- /TMPL_IF -->>
                                        <!-- TMPL_VAR NAME="totitem" -->
                                </td>
***************
*** 56,60 ****
                                <td <!-- TMPL_IF NAME="even" 
-->class="hilighted"<!-- /TMPL_IF -->>
                                        <!-- TMPL_UNLESS name="norequests" -->
!                                               <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>
--- 60,64 ----
                                <td <!-- TMPL_IF NAME="even" 
-->class="hilighted"<!-- /TMPL_IF -->>
                                        <!-- TMPL_UNLESS name="norequests" -->
!                                               <p><a class="button catalogue" 
href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->">Request</a></p>
                                        <!-- TMPL_ELSE -->
                                                <p>Not Reservable</p>

Index: search.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** search.tmpl 2 May 2005 06:20:11 -0000       1.22
--- search.tmpl 4 May 2005 09:00:58 -0000       1.23
***************
*** 153,156 ****
--- 153,160 ----
                                <option 
value="biblioitems.publishercode">Publisher</option>
                        </select>
+                       <select name="desc_or_asc" size="1">
+                               <option value="ASC">Ascending</option>
+                               <option value="DESC">Descending</option>
+                       </select>
                </p>
                <p>