[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.37,1.38 additem.tmpl,1.23,1.24 isbnsearch.tmpl,1.20,1.21

Paul POULAIN tipaul at users.sourceforge.net
Mon Jun 20 16:16:06 CEST 2005


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

Modified Files:
	addbiblio.tmpl additem.tmpl isbnsearch.tmpl 
Log Message:
synch'ing 2.2 and head

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** addbiblio.tmpl	4 May 2005 08:52:50 -0000	1.37
--- addbiblio.tmpl	20 Jun 2005 14:15:57 -0000	1.38
***************
*** 2,6 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="catalogue">Biblionumber : <!-- TMPL_VAR NAME="oldbiblionumber" --></h1>
  	<p>
  		<input type="hidden" name="op" value="addbiblio">
--- 2,6 ----
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="catalogue">Biblionumber : <!-- TMPL_VAR NAME="oldbiblionumber" -->     With Framework :<!--TMPL_VAR Name="framework" --></b></h1>
  	<p>
  		<input type="hidden" name="op" value="addbiblio">
***************
*** 405,409 ****
  		} else {
  			document.getElementById(ong).style.visibility="hidden";
! 			document.getElementById(link).style.color="#000000";
  		}
  	}
--- 405,412 ----
  		} else {
  			document.getElementById(ong).style.visibility="hidden";
! 			if (document.getElementById(link))
! 				{
! 					document.getElementById(link).style.color="#000000";
! 				}
  		}
  	}
***************
*** 515,518 ****
--- 518,525 ----
  	newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+strQuery,"z3950search",'width=800,height=400,toolbar=false,scrollbars=yes');
  }
+ function Changefwk(FwkList) {
+   var fwk = FwkList.options[FwkList.selectedIndex].value;
+   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
+ }
  
  function AddField(field) {

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** additem.tmpl	6 May 2005 08:25:18 -0000	1.23
--- additem.tmpl	20 Jun 2005 14:16:03 -0000	1.24
***************
*** 6,15 ****
  	<div class="tabbed">
  		<h1 class="catalogue"><!-- TMPL_VAR name="title" --> (<!-- TMPL_VAR name="author" --> 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>	
  		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
  			MARC
--- 6,12 ----
  	<div class="tabbed">
  		<h1 class="catalogue"><!-- TMPL_VAR name="title" --> (<!-- TMPL_VAR name="author" --> biblionumber #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
! 		<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
  			Edit biblio
  		</a>
  		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
  			MARC

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** isbnsearch.tmpl	4 May 2005 08:52:51 -0000	1.20
--- isbnsearch.tmpl	20 Jun 2005 14:16:03 -0000	1.21
***************
*** 13,39 ****
  	<div id="bloc25">
  		<h2 class="catalogue">Biblios in koha</h2>
! 		<table>
! 			<tr>
! 				<th class="catalogue">Title</th>
! 				<th class="catalogue">Author</th>
! 				<th class="catalogue">&copy;</th>
! 				<th class="catalogue">&nbsp;</th>
! 				<!-- TMPL_UNLESS NAME="NOTMARC" -->
! 					<th class="catalogue">&nbsp;</th>
! 				<!-- /TMPL_UNLESS -->
! 			</tr>
! 			<!-- TMPL_IF name="loop" -->
! 			<!-- TMPL_LOOP NAME="loop" -->
! 				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
! 					<td><!-- TMPL_VAR NAME="title" --></a>
! 					<td><!-- TMPL_VAR NAME="author" --></td>
! 					<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
! 					<!-- TMPL_IF NAME="NOTMARC" -->
! 					<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Add items</a></td>
! 					<!-- TMPL_ELSE -->
! 					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Edit...</a></td>
  					<!-- /TMPL_IF -->
  					<!-- TMPL_UNLESS NAME="NOTMARC" -->
! 					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">Duplicate</a></td>
  					<!-- /TMPL_UNLESS -->
  				</tr>
--- 13,55 ----
  	<div id="bloc25">
  		<h2 class="catalogue">Biblios in koha</h2>
! 		<!-- TMPL_IF name="loop" -->
! 			<div id="resultnumber">
! 				<p>
! 					<!-- TMPL_IF NAME="displayprev" --> 
! 						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
! 							&lt;&lt;Previous
! 						</a>
! 					<!-- /TMPL_IF -->
! 					<!-- TMPL_LOOP NAME="numbers" -->
! 						<!-- TMPL_IF NAME="highlight" -->
! 							<span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
! 						<!-- TMPL_ELSE -->
! 							<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
! 								<!-- TMPL_VAR NAME="number" -->
! 							</a>
! 						<!-- /TMPL_IF -->
! 					<!-- /TMPL_LOOP -->
! 					<!-- TMPL_IF NAME="displaynext" -->
! 						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
! 							Next&gt;&gt;
! 						</a>
  					<!-- /TMPL_IF -->
+ 			</p>
+ 			<p class="resultcount">
+ 				<!-- TMPL_IF NAME="total" -->
+ 					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
+ 				<!-- TMPL_ELSE -->
+ 					No results found.
+ 				<!-- /TMPL_IF -->
+ 			</p>
+ 		</div>
+ 			<table>
+ 				<tr>
+ 					<th class="catalogue">Title</th>
+ 					<th class="catalogue">Author</th>
+ 					<th class="catalogue">&copy;</th>
+ 					<th class="catalogue">&nbsp;</th>
  					<!-- TMPL_UNLESS NAME="NOTMARC" -->
! 						<th class="catalogue">&nbsp;</th>
  					<!-- /TMPL_UNLESS -->
  				</tr>
***************
*** 86,98 ****
  					No results found.
  				<!-- /TMPL_IF -->
! 			<!-- /TMPL_LOOP -->
! 			<!-- TMPL_IF name="displaynext" -->
! 				<a href="isbnsearch.pl?offset=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->">
! 					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0">
! 				</a>
! 			<!-- TMPL_ELSE -->
! 				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
! 			<!-- /TMPL_IF -->
! 		</p>
  		<h2 class="catalogue">Biblios in reservoir</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
--- 102,112 ----
  					No results found.
  				<!-- /TMPL_IF -->
! 			</p>
! 		</div>
! 		<!-- TMPL_ELSE -->
! 			<p>None</p>
! 		<!-- /TMPL_IF -->
! 	</div>
! 	<div id="bloc25">
  		<h2 class="catalogue">Biblios in reservoir</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
***************
*** 107,111 ****
  				</tr>
  					<!-- TMPL_LOOP NAME="breeding_loop" -->
! 					<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
  							<td><!-- TMPL_VAR NAME="title" --></a>
  							<td><!-- TMPL_VAR NAME="author" --></td>
--- 121,125 ----
  				</tr>
  					<!-- TMPL_LOOP NAME="breeding_loop" -->
! 						<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
  							<td><!-- TMPL_VAR NAME="title" --></a>
  							<td><!-- TMPL_VAR NAME="author" --></td>





More information about the Koha-cvs mailing list