[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detail.tmpl,1.19,1.20 MARCdetail.tmpl,1.34,1.35 searchresults.tmpl,1.16,1.17

[Paul POULAIN]

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

Modified Files:
        detail.tmpl MARCdetail.tmpl searchresults.tmpl 
Log Message:
synch'ing 2.2 and head

Index: detail.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** detail.tmpl 4 May 2005 08:52:53 -0000       1.19
--- detail.tmpl 20 Jun 2005 14:17:47 -0000      1.20
***************
*** 67,78 ****
                                <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF 
--><!-- TMPL_VAR name="size" --><br />
                                <!-- TMPL_IF name="isbn" --><label 
class="label100"><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --><br /><!-- 
/TMPL_IF -->
                                <!-- TMPL_IF name="seriestitle" --><label 
class="label100"><b>Collection:</b> </label><!-- TMPL_VAR NAME="seriestitle" 
--><br /><!-- /TMPL_IF -->
                                <!-- TMPL_IF name="subjects" --><label 
class="label100"><b>Subject(s):</b> </label>
                                        <!-- TMPL_LOOP name="subjects" -->
!                                               <a 
href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!--
 TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" 
--></a>, <!-- /TMPL_LOOP -->
                                        <br /><!-- /TMPL_IF -->
                                <!-- TMPL_IF name="copyrightdate" --><label 
class="label100"><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" 
--><br /><!-- /TMPL_IF -->
                                <!-- TMPL_IF name="notes" --><label 
class="label100"><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --><br /><!-- 
/TMPL_IF -->
!                               <!-- TMPL_IF name="unititle" --><label 
class="label100"><b>Unititle:</b> </label><!-- TMPL_VAR NAME="unititle" --><br 
/><!-- /TMPL_IF -->
                                <!-- TMPL_IF name="dewey" --><label 
class="label100"><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --><br /><!-- 
/TMPL_IF -->
                                <!-- TMPL_IF name="url" --><label 
class="label100"><b>URL:</b> </label><a href="<!-- TMPL_VAR name="url" 
-->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
--- 67,79 ----
                                <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF 
--><!-- TMPL_VAR name="size" --><br />
                                <!-- TMPL_IF name="isbn" --><label 
class="label100"><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --><br /><!-- 
/TMPL_IF -->
+                               <!-- TMPL_IF name="issn" --><label 
class="label100"><b>ISSN:</b> </label><!-- TMPL_VAR NAME="issn" --><br /><!-- 
/TMPL_IF -->
                                <!-- TMPL_IF name="seriestitle" --><label 
class="label100"><b>Collection:</b> </label><!-- TMPL_VAR NAME="seriestitle" 
--><br /><!-- /TMPL_IF -->
                                <!-- TMPL_IF name="subjects" --><label 
class="label100"><b>Subject(s):</b> </label>
                                        <!-- TMPL_LOOP name="subjects" -->
!                                               <a 
href="/cgi-bin/koha/search.pl?type=intra&subjectitems=<!-- TMPL_VAR 
NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- 
/TMPL_LOOP -->
                                        <br /><!-- /TMPL_IF -->
                                <!-- TMPL_IF name="copyrightdate" --><label 
class="label100"><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" 
--><br /><!-- /TMPL_IF -->
                                <!-- TMPL_IF name="notes" --><label 
class="label100"><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --><br /><!-- 
/TMPL_IF -->
!                               <!-- TMPL_IF name="unititle" --><label 
class="label100"><b>Alt title:</b> </label><!-- TMPL_VAR NAME="unititle" --><br 
/><!-- /TMPL_IF -->
                                <!-- TMPL_IF name="dewey" --><label 
class="label100"><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --><br /><!-- 
/TMPL_IF -->
                                <!-- TMPL_IF name="url" --><label 
class="label100"><b>URL:</b> </label><a href="<!-- TMPL_VAR name="url" 
-->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
***************
*** 84,88 ****
                                        <!-- /TMPL_IF -->
                                        <br/>
!                               <b>Total Number of Items:</b> <!-- TMPL_VAR 
NAME="count" -->
                        </td>
                </tr>
--- 85,91 ----
                                        <!-- /TMPL_IF -->
                                        <br/>
!                                       <!-- TMPL_IF name="count" -->
!                                               <p><b>Total Number of 
Items:</b> <!-- TMPL_VAR NAME="count" --></p>
!                                       <!-- /TMPL_IF -->
                        </td>
                </tr>

Index: MARCdetail.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** MARCdetail.tmpl     4 May 2005 08:52:52 -0000       1.34
--- MARCdetail.tmpl     20 Jun 2005 14:17:48 -0000      1.35
***************
*** 1,11 ****
  <!-- TMPL_INCLUDE NAME="marc-top.inc" -->
  
  <!-- TMPL_UNLESS name="popup" -->
        <div class="tabbed">
!               <h1 class="catalogue">Biblionumber : <!-- TMPL_VAR 
NAME="biblionumber" --></h1>
!               <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- 
TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
                        Edit biblio
                </a>
!               <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- 
TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
                        Duplicate
                </a>
--- 1,15 ----
  <!-- TMPL_INCLUDE NAME="marc-top.inc" -->
  
+ 
  <!-- TMPL_UNLESS name="popup" -->
        <div class="tabbed">
!       <form Name="f">
!               <h1 class="catalogue">Biblionumber : <!-- TMPL_VAR 
NAME="biblionumber" -->      <b>With Framework :<!--TMPL_VAR Name="framework" 
--></b>
! </h1>
!       </form>
!               <a href="javascript:Addbiblio('')" class="button catalogue">
                        Edit biblio
                </a>
!               <a href="javascript:Addbiblio('duplicate')" class="button 
catalogue">
                        Duplicate
                </a>
***************
*** 41,44 ****
--- 45,50 ----
                        <a href="request.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" -->" class="button catalogue">Request</a>
                <!-- /TMPL_IF -->
+               
+ 
        </div>
  <!-- /TMPL_UNLESS -->
***************
*** 398,401 ****
--- 404,415 ----
        
newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  }
+ function Changefwk(FwkList) {
+   var fwk = FwkList.options[FwkList.selectedIndex].value;
+   window.location = "MARCdetail.pl?bib=<!--TMPL_VAR 
Name="biblionumber"-->&frameworkcode="+fwk;
+ }
+ function Addbiblio(op) {
+   var fwk = 
document.forms[0].Frameworks.options[document.forms[0].Frameworks.selectedIndex].value;
+   window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+ }
  </script>
  </body>

Index: searchresults.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** searchresults.tmpl  19 Nov 2004 21:37:20 -0000      1.16
--- searchresults.tmpl  20 Jun 2005 14:17:48 -0000      1.17
***************
*** 10,14 ****
        You searched on <b><!-- TMPL_VAR NAME="searchdesc" --></b>
  <!-- TMPL_ELSE -->
!       You did not specify any seach criteria<br>
  <!-- /TMPL_IF --></p>
  
--- 10,14 ----
        You searched on <b><!-- TMPL_VAR NAME="searchdesc" --></b>
  <!-- TMPL_ELSE -->
!       You did not specify any search criteria<br>
  <!-- /TMPL_IF --></p>