[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-dictionary.tmpl,1.1,1.2 opac-full-serial-issues.tmpl,1.1,1.2 opac-auth.tmpl,1.3,1.4 opac-detail.tmpl,1.19,1.20 opac-main.tmpl,1.18,1.19 opac-MARCdetail.tmpl,1.6,1.7 opac-searchresults.tmpl,1.24,1.25 opac-search.tmpl,1.15,1.16 opac-serial-issues.tmpl,1.4,1.5 opac-user.tmpl,1.10,1.11 opac-userupdate.tmpl,1.5,1.6

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


Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9944/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-auth.tmpl opac-detail.tmpl opac-main.tmpl 
	opac-MARCdetail.tmpl opac-searchresults.tmpl opac-search.tmpl 
	opac-serial-issues.tmpl opac-user.tmpl opac-userupdate.tmpl 
Added Files:
	opac-dictionary.tmpl opac-full-serial-issues.tmpl 
Log Message:
synch'ing 2.2 and head



Index: opac-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-auth.tmpl	8 Dec 2004 10:26:32 -0000	1.3
--- opac-auth.tmpl	20 Jun 2005 14:25:00 -0000	1.4
***************
*** 1,38 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <div id="mainbloc">
! <!-- TMPL_IF NAME="nopermission" -->
! <!-- This is what is displayed if user doesnt have permission -->
! <h2>Sorry, KOHA doesnt think you have permission for this page.<h2>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="timed_out" -->
! <!-- This is what is displayed if login has timed out -->
! <h2>Sorry, your session has timed out, please login again.<h2>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="different_ip" -->
! <!-- This is what is displayed if user doesnt have permission -->
! <h2>You are accessing koha from a different ip address! please login again.<h2>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="invalid_username_or_password" -->
! <!-- This is what is displayed if user doesnt have permission -->
! <h2>You entered an incorrect username or password, please try again.<h2>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="loginprompt" -->
! <!-- login prompt time-->
! 
! <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
! 	<h1>Koha Login</h1>
! 	<p><label>Cardnumber</label><input name="userid" /></p>
! 	<p><label>Password</label><input type="password" name="password" /></p>
! 	<!-- TMPL_LOOP NAME="INPUTS" -->
! 		<input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->' />
! 	<!-- /TMPL_LOOP -->
! 	<p><label>&nbsp;</label><input type="submit" value="login" class="button" /></p>
! </form>
! 
! <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
--- 1,39 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <div id="mainbloc">
! 	<div id="bloc60">
! 		<!-- TMPL_IF NAME="nopermission" -->
! 		<!-- This is what is displayed if user doesnt have permission -->
! 		<h2>Sorry, KOHA doesnt think you have permission for this page.<h2>
! 		<!-- /TMPL_IF -->
! 		
! 		<!-- TMPL_IF NAME="timed_out" -->
! 		<!-- This is what is displayed if login has timed out -->
! 		<h2>Sorry, your session has timed out, please login again.<h2>
! 		<!-- /TMPL_IF -->
! 		
! 		<!-- TMPL_IF NAME="different_ip" -->
! 		<!-- This is what is displayed if user doesnt have permission -->
! 		<h2>You are accessing koha from a different ip address! please login again.<h2>
! 		<!-- /TMPL_IF -->
! 		
! 		<!-- TMPL_IF NAME="invalid_username_or_password" -->
! 		<!-- This is what is displayed if user doesnt have permission -->
! 		<h2>You entered an incorrect username or password, please try again.<h2>
! 		<!-- /TMPL_IF -->
! 	</div>
! 	<div id="bloc60">
! 		<!-- TMPL_IF NAME="loginprompt" -->
! 		<!-- login prompt time-->
! 		<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
! 			<h2>Koha Login</h2>
! 			<p><label>Cardnumber</label><input name="userid" /></p>
! 			<p><label>Password</label><input type="password" name="password" /></p>
! 			<!-- TMPL_LOOP NAME="INPUTS" -->
! 				<input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->' />
! 			<!-- /TMPL_LOOP -->
! 			<p><label>&nbsp;</label><input type="submit" value="login" class="button" /></p>
! 		</form>
! 	</div>
! 		<!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** opac-detail.tmpl	17 Jun 2005 13:44:25 -0000	1.19
--- opac-detail.tmpl	20 Jun 2005 14:25:00 -0000	1.20
***************
*** 65,73 ****
  				<!-- TMPL_IF name="subjects" --><p><label><b>Subject(s):</b> </label></p>
  					<!-- TMPL_LOOP name="subjects" -->
! 						<p><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>, </p> <!-- /TMPL_LOOP -->
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="copyrightdate" --><p><label><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="notes" --><p><label><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><p><label><b>Unititle:</b> </label><!-- TMPL_VAR NAME="unititle" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dewey" --><p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="url" --><p><label><b>URL:</b> </label><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a></p><!-- /TMPL_IF -->
--- 65,73 ----
  				<!-- TMPL_IF name="subjects" --><p><label><b>Subject(s):</b> </label></p>
  					<!-- TMPL_LOOP name="subjects" -->
! 						<p><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator==&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, </p> <!-- /TMPL_LOOP -->
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="copyrightdate" --><p><label><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="notes" --><p><label><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><p><label><b>Alt title:</b> </label><!-- TMPL_VAR NAME="unititle" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dewey" --><p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="url" --><p><label><b>URL:</b> </label><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a></p><!-- /TMPL_IF -->
***************
*** 79,83 ****
  					<!-- /TMPL_IF -->
  				</p>
! 				<p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
  			</td>
  		</tr>
--- 79,85 ----
  					<!-- /TMPL_IF -->
  				</p>
! 				<!-- TMPL_IF name="count" -->
! 					<p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
! 				<!-- /TMPL_IF -->
  			</td>
  		</tr>
***************
*** 158,200 ****
  	</table>
  	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<div id="bloc25">
! 		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title).</p> 
! 		<!-- TMPL_LOOP Name="subscriptions" -->
! 				<b class="catalogue"> Subscription #<!--TMPL_VAR Name="subscriptionid"--> </b>
! 				<p><!--TMPL_VAR Name="subscriptionnotes"--> </p>
! 				<!--TMPL_IF Name="latestserials"-->
! 				<p> Here comes a list of the three latest issues related to this subscription :</p>
! 				<table>
! 				<!--TMPL_LOOP Name="latestserials"-->
! 					<tr>
! 						<td>
! 							<!--TMPL_VAR Name="serialseq"-->
! 						</td>
! 						<td>
! 							<!--TMPL_VAR Name="planneddate"-->
! 						</td>
! 						<td>
! 							<!--TMPL_IF Name="status1"-->Waited
! 							<!--TMPL_ELSE -->
! 								<!-- TMPL_IF Name="status2"-->Arrived
! 								<!--TMPL_ELSE -->
! 									<!-- TMPL_IF Name="status3"-->Late
! 									<!--TMPL_ELSE -->
! 										<!-- TMPL_IF Name="status4"-->Missing
! 										<!--TMPL_ELSE -->
! 											<!-- TMPL_IF Name="status5"-->Not Issued
! 											<!--/TMPL_IF-->
! 										<!--/TMPL_IF-->
! 									<!--/TMPL_IF-->
! 								<!--/TMPL_IF-->
! 							<!--/TMPL_IF-->
! 						</td>
! 					</tr>
! 				<!--/TMPL_LOOP -->
! 				</table>
! 				<!-- /TMPL_IF -->
! 		<!-- /TMPL_LOOP -->
! 		<p> For more information : You can see <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues"> for Issues</a> we have and don't have</p>
! 		</div>
  	<!-- /TMPL_IF -->
  	</div>
--- 160,169 ----
  	</table>
  	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
! 					Issues
! 				</a> we have and don't have
! 		</p>
  	<!-- /TMPL_IF -->
  	</div>

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** opac-main.tmpl	4 May 2005 08:58:31 -0000	1.18
--- opac-main.tmpl	20 Jun 2005 14:25:00 -0000	1.19
***************
*** 15,19 ****
  <body>
  <div id="leftbloc">
! 	<img class="relative" src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="koha" alt="koha" />
  </div>
  
--- 15,23 ----
  <body>
  <div id="leftbloc">
! 	<!-- TMPL_IF name="opaclargeimage" -->
! 		<img class="relative" src="<!-- TMPL_VAR name="opaclargeimage"-->" title="koha" alt="koha" />
! 	<!-- TMPL_ELSE -->
! 		<img class="relative" src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="koha" alt="koha" />
! 	<!-- /TMPL_IF -->
  </div>
  

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-MARCdetail.tmpl	4 May 2005 08:58:32 -0000	1.6
--- opac-MARCdetail.tmpl	20 Jun 2005 14:25:00 -0000	1.7
***************
*** 28,32 ****
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
- 
  	<div class="tabs">
  		<!-- TMPL_IF name="0XX" -->
--- 28,31 ----
***************
*** 62,66 ****
  		<a href="javascript:active(10)">I<br/>t<br/>e<br/>m<br/>s</a>
  	</div>
! 
  	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
  		<!-- TMPL_LOOP name="0XX" -->
--- 61,65 ----
  		<a href="javascript:active(10)">I<br/>t<br/>e<br/>m<br/>s</a>
  	</div>
! <div class="tabbloc">
  	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
  		<!-- TMPL_LOOP name="0XX" -->
***************
*** 320,323 ****
--- 319,323 ----
  		</table>
  	</div>
+ </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** opac-searchresults.tmpl	3 Jun 2005 04:16:53 -0000	1.24
--- opac-searchresults.tmpl	20 Jun 2005 14:25:00 -0000	1.25
***************
*** 56,71 ****
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
  					<p>
! 						<p>
! 							<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
! 								<b><a class="transparent" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
  							<!-- TMPL_ELSE -->
! 								<!-- TMPL_IF name="BiblioDefaultViewisbd" -->
! 									<b><a class="transparent" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
! 								<!-- TMPL_ELSE -->
! 									<b><a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
! 								<!-- /TMPL_IF -->
  							<!-- /TMPL_IF -->
! 						</p>
! 						<p><!-- TMPL_VAR NAME="author" -->
  						<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
  						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
--- 56,70 ----
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
  					<p>
! 						<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
! 							<b><a class="transparent" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
! 						<!-- TMPL_ELSE -->
! 							<!-- TMPL_IF name="BiblioDefaultViewisbd" -->
! 								<b><a class="transparent" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
  							<!-- TMPL_ELSE -->
! 								<b><a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
  							<!-- /TMPL_IF -->
! 						<!-- /TMPL_IF -->
! 					</p>
! 					<p><!-- TMPL_VAR NAME="author" -->
  						<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
  						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
***************
*** 117,121 ****
  				<!-- /TMPL_IF -->
  			</th>
! 			<th colspan="2" align="right">
  				<!-- TMPL_IF NAME="displaynext" -->
  					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">Next &gt;&gt;&gt;</a>
--- 116,120 ----
  				<!-- /TMPL_IF -->
  			</th>
! 			<th colspan="3" align="right">
  				<!-- TMPL_IF NAME="displaynext" -->
  					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">Next &gt;&gt;&gt;</a>

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-search.tmpl	4 May 2005 08:58:32 -0000	1.15
--- opac-search.tmpl	20 Jun 2005 14:25:00 -0000	1.16
***************
*** 16,20 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
  		</p>
  		<p>
--- 16,20 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" size="35" />
  		</p>
  		<p>
***************
*** 24,28 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
  		</p>
  		<p>
--- 24,31 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" size="35" />
! 			<a href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
! 				...
! 			</a>
  		</p>
  		<p>
***************
*** 31,35 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
  		</p>
  		<p>
--- 34,41 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" size="35" />
! 			<a href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
! 				...
! 			</a>
  		</p>
  		<p>
***************
*** 39,43 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
  		</p>
  		<p>
--- 45,60 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" name="value" size="35" />
! 			<a href="javascript:Dopop('opac-dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
! 				...
! 			</a>
! 		</p>
! 		<p>
! 			<label class="label20">Series title</label>
! 			<input type="hidden" name="marclist" value="biblio.seriestitle" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" size="35"/>
  		</p>
  		<p>
***************
*** 74,78 ****
  				<input type="hidden" name="excluding" value="" />
  				<input type="hidden" name="operator" value="start" />
! 				<input type="text" name="value" onchange="sql_update()" /> 
  		</p>
  		<p>
--- 91,95 ----
  				<input type="hidden" name="excluding" value="" />
  				<input type="hidden" name="operator" value="start" />
! 				<input type="text" name="value" /> 
  		</p>
  		<p>
***************
*** 82,86 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="start" />
! 			<input type="text" name="value" onchange="sql_update()" />
  		</p>
  		<p>
--- 99,103 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="start" />
! 			<input type="text" name="value" />
  		</p>
  		<p>
***************
*** 90,94 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="=" />
! 			<input type="text" name="value" onchange="sql_update()" />
  		</p>
  		<p>
--- 107,111 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="=" />
! 			<input type="text" name="value" />
  		</p>
  		<p>
***************
*** 98,102 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" />
  		</p>
  		<p>
--- 115,119 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" />
  		</p>
  		<p>
***************
*** 106,110 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value=">=" />
! 			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
  			and
  			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
--- 123,127 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value=">=" />
! 			<input type="text" name="value" size="6" maxlength="4" />
  			and
  			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
***************
*** 112,116 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="<=" />
! 			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
  		</p>
  		<p>
--- 129,133 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="<=" />
! 			<input type="text" name="value" size="6" maxlength="4" />
  		</p>
  		<p>
***************
*** 130,134 ****
  				<option value="biblioitems.publicationyear">Publication Year</option>
  				<option value="biblioitems.publishercode">Publisher</option>
! 				<option value="biblio.timestamp desc">Acquisition date</option>
  			</select>
  			<select name="desc_or_asc" size="1">
--- 147,151 ----
  				<option value="biblioitems.publicationyear">Publication Year</option>
  				<option value="biblioitems.publishercode">Publisher</option>
! 				<option value="biblio.timestamp">Acquisition date</option>
  			</select>
  			<select name="desc_or_asc" size="1">
***************
*** 155,193 ****
  		<p>A search is done on every words you enter. Empty words are ignored. If you enter, for example "the two towers" in the title, the result list will contain all the books containing two AND tower in the title. The "the" will be discarded.</p>
  		<p>If you want to enter a partial word, add a * or a % at the end of the word. For example "two tower*" will retrieve "the two towers", "two white towers", "a tower and two cities"</p>
  	</div>
  </form>
- 
- <script type="text/javascript">
- function sql_update() {
- document.f.sql.value="";
- 	for (i=0 ; i<document.f.marclist.length ; i++) {
- 		if (document.f.value[i].value.length>0) {
- 			document.f.sql.value = document.f.sql.value+
- 										document.f.and_or[i].value + ' (' +
- 										document.f.excluding[i].value + ' ' +
- 										document.f.marclist[i].value + ' ' +
- 										document.f.operator[i].value + ' ' +
- 										'\''+document.f.value[i].value + '\') ';
- 		}
- 	}
- }
- 
- function AddStatement() {
- 
- 	document.forms[0].op.value="AddStatement";
- 	document.f.submit();
- }
- 
- function PopupSuggestion() {
-     var strQuery="";
- 	for (i=0 ; i<document.f.marclist.length ; i++) {
- 		if (document.f.value[i].value.length>0) {
- 		    strQuery += " "+document.f.value[i].value;
- 		}
- 	}
- 	newin=window.open("suggest.pl?Q="+strQuery,"Suggestions",'width=500,height=400,toolbar=false,scrollbars=yes');
- }
- 
- </script>
  </div>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
--- 172,179 ----
  		<p>A search is done on every words you enter. Empty words are ignored. If you enter, for example "the two towers" in the title, the result list will contain all the books containing two AND tower in the title. The "the" will be discarded.</p>
  		<p>If you want to enter a partial word, add a * or a % at the end of the word. For example "two tower*" will retrieve "the two towers", "two white towers", "a tower and two cities"</p>
+ 		<h3>Dictionnary search</h3>
+ 		<p>if you clic on ... on the right of title/author/subject, you can search existing values in the library.</p>
  	</div>
  </form>
  </div>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-serial-issues.tmpl	7 Mar 2005 08:55:30 -0000	1.4
--- opac-serial-issues.tmpl	20 Jun 2005 14:25:01 -0000	1.5
***************
*** 2,12 ****
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1 class="catalogue">Issues for a subscription</h1>
! <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
! <form method="post" name="f">
! <!-- TMPL_LOOP name="subscription_LOOP" -->
! <div id="bloc60">
! 	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
! 		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
  		<b>
  		<!--TMPL_IF name="periodicity1" -->
--- 2,13 ----
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! 	<h1 class="catalogue">Issues for a subscription</h1>
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">Back to biblio</a>
! 	<a class="button" href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=full">Complete view</a>
! 
! 	<!-- TMPL_LOOP name="subscription_LOOP" -->
! 	<div id="bloc60">
! 		<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
! 		<p>It began on <b><!-- TMPL_VAR name="histstartdate" --></b> and is issued every
  		<b>
  		<!--TMPL_IF name="periodicity1" -->
***************
*** 44,71 ****
  		<!-- /TMPL_IF -->
  		</b>
- 		on
- 		<b>
  		<!--TMPL_IF name="arrival1" -->
! 			Monday
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival2" -->
! 				Tuesday
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival3" -->
! 				Wednesday
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival4" -->
! 				Thursday
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival5" -->
! 				Friday
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival6" -->
! 				Saturday
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival7" -->
! 				Sunday
  		<!-- /TMPL_IF -->
- 		</b>
  		for <b>
  			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
--- 45,69 ----
  		<!-- /TMPL_IF -->
  		</b>
  		<!--TMPL_IF name="arrival1" -->
! 			on <b>monday</b>
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival2" -->
! 			on <b>tuesday</b>
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival3" -->
! 			on <b>wednesday</b>
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival4" -->
! 			on <b>thursday</b>
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival5" -->
! 			on <b>friday</b>
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival6" -->
! 			on <b>saturday</b>
  		<!-- /TMPL_IF -->
  		<!--TMPL_IF name="arrival7" -->
! 			on <b>sunday</b>
  		<!-- /TMPL_IF -->
  		for <b>
  			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
***************
*** 73,86 ****
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
  			</b>
- 		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
  		<p><!-- TMPL_VAR name="notes" --></p>
! 	<!-- TMPL_IF name="opacnote" -->
! 		<h2 class="catalogue">Issues summary</h2>
! 		<p>
! 			<!-- TMPL_VAR name="opacnote" -->
! 		</p>
! 	<!-- /TMPL_IF -->
! </div>
  <!-- /TMPL_LOOP -->
  </div>
--- 71,99 ----
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
  			</b>
  		</p>
+ 		<p>Last renewal of subscription was <b><!-- TMPl_VAR name="startdate" --></b></p>
+ 		<!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was recieved on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
+ 	<!--TMPL_UNLESS Name=fullinfo -->
  		<p><!-- TMPL_VAR name="notes" --></p>
! 		<!-- TMPL_IF name="opacnote" -->
! 			<h2 class="catalogue">Issues summary</h2>
! 			<p>
! 				<!-- TMPL_VAR name="opacnote" -->
! 			</p>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="recievedlist" -->
! 			<h2 class="catalogue">Recieved issues</h2>
! 			<p>
! 				<!-- TMPL_VAR name="recievedlist" -->
! 			</p>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="missinglist" -->
! 			<h2 class="catalogue">Missing issues</h2>
! 			<p>
! 				<!-- TMPL_VAR name="missinglist" -->
! 			</p>
! 		<!-- /TMPL_IF -->
! 	</div>
! 	<!-- /TMPL_UNLESS -->
  <!-- /TMPL_LOOP -->
  </div>

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** opac-user.tmpl	15 Jun 2005 19:55:14 -0000	1.10
--- opac-user.tmpl	20 Jun 2005 14:25:01 -0000	1.11
***************
*** 5,15 ****
  		<h2>Are our records correct?</h2>
  		<p>Library Card: <!-- TMPL_VAR NAME="cardnumber" --> </p>
! 		<p><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></p>
! 		<p><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --></p>
! 		<p><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --></p>
! 		<p><!-- TMPL_VAR NAME="phone" --> <!-- TMPL_IF name="phone" -->(hm)<!-- /TMPL_IF --></p>
! 		<p><!-- TMPL_VAR NAME="faxnumber" --> <!-- TMPL_IF name="fawnumber" -->(wk)<!-- /TMPL_IF --></p>
  		<p><!-- TMPL_VAR NAME="emailaddress" --></p>
  		<p><a href="/cgi-bin/koha/opac-userupdate.pl" class="button">Update Record</a></p>
  	</div>
  	<!-- TMPL_IF NAME="amountoverfive" -->
--- 5,20 ----
  		<h2>Are our records correct?</h2>
  		<p>Library Card: <!-- TMPL_VAR NAME="cardnumber" --> </p>
! 		<p><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
! 		<p>Work address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></p>
! 		<p>Home address: <!-- TMPL_VAR name='physstreet' --></p>
! 		<p><!-- TMPL_IF name="phone" -->Home phone: <!-- TMPL_VAR NAME="phone" --><!-- /TMPL_IF --></p>
! 		<p><!-- TMPL_IF name="faxnumber" -->Fax: <!-- TMPL_VAR NAME="faxnumber" --><!-- /TMPL_IF --></p>
  		<p><!-- TMPL_VAR NAME="emailaddress" --></p>
  		<p><a href="/cgi-bin/koha/opac-userupdate.pl" class="button">Update Record</a></p>
+ 		<!-- TMPL_IF name="textmessaging"-->
+ 			<h2>Message from the library</h2>
+ 			<!-- TMPL_VAR name="textmessaging" -->
+ 		<!-- /TMPL_IF -->
+ 
  	</div>
  	<!-- TMPL_IF NAME="amountoverfive" -->
***************
*** 36,104 ****
  <!-- /TMPL_LOOP -->
  
! <!-- TMPL_IF NAME="waiting_count" -->
! <div class="bloc60">
! 	<h2>You have reserved items waiting:</h2>
! 	<ul>
! 		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<li><!-- TMPL_VAR NAME="btitle" -->, pick up at: <b><!-- TMPL_VAR NAME="branch" --></b></li>
! 		<!-- /TMPL_LOOP -->
! 	</ul>
! </div>
! <!-- /TMPL_IF -->
  
! <div class="bloc60">
! 	<!-- TMPL_IF NAME="issues_count" -->
! 		<h2>You have <b><!-- TMPL_VAR NAME="issues_count" --></b> items currently issued.</h2>
! 		<table>
  			<tr>
  				<th>Title</th>
  				<th>Author</th>
! 				<th>Due date</th>
! 				<th>Itemtype</th>
! 				<th>Barcode</th>
! 				<th>Charges</th>
! 				<th>Renewable</th>
  			</tr>
! 			<!-- TMPL_LOOP NAME="ISSUES" -->
! 					<tr>
! 						<!-- TMPL_IF name="overdue"--><td class="problem"><!--TMPL_ELSE--><td><!--/TMPL_IF-->
! 							<!-- TMPL_VAR NAME="title" --></td>
! 						<!-- TMPL_IF name="overdue"--><td class="problem"><!--TMPL_ELSE--><td><!--/TMPL_IF-->
! 							<!-- TMPL_VAR NAME="author" --></td>
! 						<!-- TMPL_IF name="overdue"--><td class="problem"><!--TMPL_ELSE--><td><!--/TMPL_IF-->
! 							<!-- TMPL_VAR NAME="date_due" --></td>
! 						<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 						<td><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 						<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 					</tr>
  			<!-- /TMPL_LOOP -->
  		</table>
! 	<!-- TMPL_ELSE -->
! 		<h2>You have no items on issue.</h2>
  	<!-- /TMPL_IF -->
  </div>
- 
- <!-- TMPL_IF NAME="reserves_count" -->
- <div class="bloc60">
- 	<h2>You have <b><!-- TMPL_VAR NAME="reserves_count" --></b> items currently reserved.</h2>
- 	<table cellspacing="0" align="center">
- 		<tr>
- 			<th>Title</th>
- 			<th>Author</th>
- 			<th>Reserve date</th>
- 		</tr>
- 		<!-- TMPL_LOOP NAME="RESERVES" -->
- 			<tr valign="top">
- 			<td><!-- TMPL_VAR NAME="btitle" --></td>
- 			<td><!-- TMPL_VAR NAME="author" --></td>
- 			<td><!-- TMPL_VAR NAME="reservedate" --></td>
- 			</tr>
- 		<!-- /TMPL_LOOP -->
- 	</table>
- 	<br />
- </div>
- <!-- /TMPL_IF -->
- </div>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
  
--- 41,118 ----
  <!-- /TMPL_LOOP -->
  
! 	<!-- TMPL_IF NAME="waiting_count" -->
! 	<div class="bloc60">
! 		<h2>You have reserved items waiting:</h2>
! 		<ul>
! 			<!-- TMPL_LOOP NAME="WAITING" -->
! 				<li><!-- TMPL_VAR NAME="btitle" -->, pick up at: <b><!-- TMPL_VAR NAME="branch" --></b></li>
! 			<!-- /TMPL_LOOP -->
! 		</ul>
! 	</div>
! 	<!-- /TMPL_IF -->
! 
! 	<div class="bloc60">
! 		<!-- TMPL_IF NAME="issues_count" -->
! 			<h2>You have <b><!-- TMPL_VAR NAME="issues_count" --></b> items currently issued.</h2>
! 			<table>
! 				<tr>
! 					<th>Title</th>
! 					<th>Author</th>
! 					<th>Due date</th>
! 					<th>Itemtype</th>
! 					<th>Barcode</th>
! 					<th>Charges</th>
! 					<th>Renewable</th>
! 				</tr>
! 				<!-- TMPL_LOOP NAME="ISSUES" -->
! 					<!-- TMPL_IF name="overdue"-->
! 						<tr>
! 							<td><!-- TMPL_VAR NAME="title" --></td>
! 							<td><!-- TMPL_VAR NAME="author" --></td>
! 							<td><b>OVERDUE <!-- TMPL_VAR NAME="date_due" --></b></td>
! 							<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 							<td><!-- TMPL_VAR NAME="barcode" --></td>
! 							<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 							<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 						</tr>
! 					<!-- TMPL_ELSE -->
! 						<tr>
! 							<td><!-- TMPL_VAR NAME="title" --></td>
! 							<td><!-- TMPL_VAR NAME="author" --></td>
! 							<td><!-- TMPL_VAR NAME="date_due" --></td>
! 							<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 							<td><!-- TMPL_VAR NAME="barcode" --></td>
! 							<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 							<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 						</tr>
! 					<!-- /TMPL_IF -->
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 		<!-- TMPL_ELSE -->
! 			<h2>You have no items on issue.</h2>
! 		<!-- /TMPL_IF -->
! 	</div>
  
! 	<!-- TMPL_IF NAME="reserves_count" -->
! 	<div class="bloc60">
! 		<h2>You have <b><!-- TMPL_VAR NAME="reserves_count" --></b> items currently reserved.</h2>
! 		<table cellspacing="0" align="center">
  			<tr>
  				<th>Title</th>
  				<th>Author</th>
! 				<th>Reserve date</th>
  			</tr>
! 			<!-- TMPL_LOOP NAME="RESERVES" -->
! 				<tr valign="top">
! 				<td><!-- TMPL_VAR NAME="btitle" --></td>
! 				<td><!-- TMPL_VAR NAME="author" --></td>
! 				<td><!-- TMPL_VAR NAME="reservedate" --></td>
! 				</tr>
  			<!-- /TMPL_LOOP -->
  		</table>
! 		<br />
! 	</div>
  	<!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
  

Index: opac-userupdate.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-userupdate.tmpl	12 Nov 2004 16:28:10 -0000	1.5
--- opac-userupdate.tmpl	20 Jun 2005 14:25:01 -0000	1.6
***************
*** 8,19 ****
  <!-- TMPL_LOOP name="BORROWER_INFO" -->
  <form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
! 	<p><label>Surname</label><input type="text"  size="25" value="<!-- TMPL_VAR name='surname' -->"  name="surname" /></p>
! 	<p><label>Title</label><input type="text"  size="25" value="<!-- TMPL_VAR name='title' -->"  name="title" /></p>
! 	<p><label>First name</label><input type="text"  size="25" value="<!-- TMPL_VAR name='firstname' -->"  name="firstname" /></p>
! 	<p><label>Street address</label><input type="text"  size="25" value="<!-- TMPL_VAR name='streetaddress' -->"  name="streetaddress" /></p>
! 	<p><label>City</label><input type="text"  size="25" value="<!-- TMPL_VAR name='city' -->"  name="city" /></p>
! 	<p><label>Home phone</label><input type="text"  size="25" value="<!-- TMPL_VAR name='phone' -->"  name="phone" /></p>
! 	<p><label>Work/Fax phone</label><input type="text"  size="25" value="<!-- TMPL_VAR name='faxnumber' -->"  name="faxnumber" /></p>
! 	<p><label>Email</label><input type="text"  size="25" value="<!-- TMPL_VAR name='emailaddress' -->"  name="emailaddress" /></p>
  	<p><input type="submit" value="Submit" class="button" /></p>
  </form>
--- 8,20 ----
  <!-- TMPL_LOOP name="BORROWER_INFO" -->
  <form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
! 	<p><label>Surname</label><input type="text"  size="35" value="<!-- TMPL_VAR name='surname' -->"  name="surname" /></p>
! 	<p><label>First name</label><input type="text"  size="35" value="<!-- TMPL_VAR name='firstname' -->"  name="firstname" /></p>
! 	<p><label>Home address</label><input type="text"  size="35" value="<!-- TMPL_VAR name='physstreet' -->"  name="physstreet" /></p>
! 	<p><label>Work address</label><input type="text"  size="35" value="<!-- TMPL_VAR name='streetaddress' -->"  name="streetaddress" /></p>
! 	<p><label>City</label><input type="text"  size="35" value="<!-- TMPL_VAR name='city' -->"  name="city" /></p>
! 	<p><label>Home phone</label><input type="text"  size="35" value="<!-- TMPL_VAR name='phone' -->"  name="phone" /></p>
! 	<p><label>Work/Fax phone</label><input type="text"  size="35" value="<!-- TMPL_VAR name='faxnumber' -->"  name="faxnumber" /></p>
! 	<p><label>Email</label><input type="text"  size="35" value="<!-- TMPL_VAR name='emailaddress' -->"  name="emailaddress" /></p>
! 	<p><label>Notes</label><input type="text"  size="35" value="<!-- TMPL_VAR name='title' -->"  name="title" /></p>
  	<p><input type="submit" value="Submit" class="button" /></p>
  </form>





More information about the Koha-cvs mailing list